Feat new flow mf account

.eslintrc.js

@@ -61,6 +61,10 @@ module.exports = {
                     '**/*.test.js*',
                     '**/*.spec.js',
                     '**/*.spec.jsx',
+                    '**/*.spec.ts',
+                    '**/*.test.ts',
+                    '**/*.spec.tsx',
+                    '**/*.test.tsx',
                 ],
             },
         ],

packages/account/package.json

@@ -51,6 +51,8 @@
         "@babel/preset-react": "^7.16.7",
         "@jest/globals": "^26.5.3",
         "@testing-library/react": "^12.0.0",
+        "@types/react": "^18.0.7",
+        "@types/react-dom": "^18.0.0",
         "babel-loader": "^8.1.0",
         "clean-webpack-plugin": "^3.0.0",
         "css-loader": "^5.0.1",
@@ -75,6 +77,7 @@
         "sass-loader": "^12.6.0",
         "sass-resources-loader": "^2.1.1",
         "terser-webpack-plugin": "^5.1.1",
+        "typescript": "^4.6.3",
         "webpack": "^5.46.0"
     }
 }

packages/account/src/Components/self-exclusion/__tests__/self-exclusion-article.spec.js

@@ -21,9 +21,9 @@ describe('<SelfExclusionArticle />', () => {
     let mock_self_exclusion_context = {};
 
     const eu_item =
-        /These trading limits and self-exclusion help you control the amount of money and time you spend on Deriv.com and exercise/i;
+        /these trading limits and self-exclusion help you control the amount of money and time you spend on deriv.com and exercise/i;
     const non_eu_item =
-        /These self-exclusion limits help you control the amount of money and time you spend trading on DTrader, DBot, and SmartTrader. The limits you set here will help you exercise/i;
+        /these self-exclusion limits help you control the amount of money and time you spend trading on dtrader, dbot, smarttrader and binary bot on deriv. the limits you set here will help you exercise/i;
 
     beforeEach(() => {
         mock_platform_context = {

packages/account/src/Components/self-exclusion/self-exclusion-article-content.jsx

@@ -9,6 +9,7 @@ import SelfExclusionContext from './self-exclusion-context';
 export const selfExclusionArticleItems = ({ is_eu, is_uk, is_deriv_crypto, is_app_settings }) => {
     const platform_name_trader = getPlatformSettings('trader').name;
     const platform_name_dbot = getPlatformSettings('dbot').name;
+    const platform_name_bbot = getPlatformSettings('bbot').name;
     const platform_name_smarttrader = getPlatformSettings('smarttrader').name;
 
     const getEuItems = () => {
@@ -87,7 +88,7 @@ export const selfExclusionArticleItems = ({ is_eu, is_uk, is_deriv_crypto, is_ap
         {
             component: (
                 <Localize
-                    i18n_default_text='These self-exclusion limits help you control the amount of money and time you spend trading on {{platform_name_trader}}, {{platform_name_dbot}}, and {{platform_name_smarttrader}}. The limits you set here will help you exercise <0>responsible trading</0>.'
+                    i18n_default_text='These self-exclusion limits help you control the amount of money and time you spend trading on {{platform_name_trader}}, {{platform_name_dbot}}, {{platform_name_smarttrader}} and {{platform_name_bbot}} on Deriv. The limits you set here will help you exercise <0>responsible trading</0>.'
                     components={[
                         <a
                             key={0}
@@ -97,7 +98,7 @@ export const selfExclusionArticleItems = ({ is_eu, is_uk, is_deriv_crypto, is_ap
                             href={getStaticUrl('/responsible', { is_deriv_crypto })}
                         />,
                     ]}
-                    values={{ platform_name_trader, platform_name_dbot, platform_name_smarttrader }}
+                    values={{ platform_name_trader, platform_name_dbot, platform_name_smarttrader, platform_name_bbot }}
                 />
             ),
         },
@@ -109,8 +110,8 @@ export const selfExclusionArticleItems = ({ is_eu, is_uk, is_deriv_crypto, is_ap
         {
             component: (
                 <Localize
-                    i18n_default_text='When you set your limits, they will be aggregated across all your account types in {{platform_name_trader}}, {{platform_name_dbot}}, and {{platform_name_smarttrader}}. For example, the losses made on all three platforms will add up and be counted towards the loss limit you set.'
-                    values={{ platform_name_trader, platform_name_dbot, platform_name_smarttrader }}
+                    i18n_default_text='When you set your limits, they will be aggregated across all your account types in {{platform_name_trader}}, {{platform_name_dbot}}, {{platform_name_smarttrader}} and {{platform_name_bbot}} on Deriv. For example, the losses made on all four platforms will add up and be counted towards the loss limit you set.'
+                    values={{ platform_name_trader, platform_name_dbot, platform_name_smarttrader, platform_name_bbot }}
                 />
             ),
         },

packages/account/src/Components/self-exclusion/self-exclusion-article.jsx

@@ -25,12 +25,13 @@ const SelfExclusionArticle = () => {
                               />
                           ) : (
                               <Localize
-                                  i18n_default_text='These self-exclusion limits help you control the amount of money and time you spend trading on {{platform_name_trader}}, {{platform_name_dbot}}, and {{platform_name_smarttrader}}. The limits you set here will help you exercise <0>responsible trading</0>.'
+                                  i18n_default_text='These self-exclusion limits help you control the amount of money and time you spend trading on {{platform_name_trader}}, {{platform_name_dbot}}, {{platform_name_smarttrader}} and {{platform_name_bbot}} on Deriv. The limits you set here will help you exercise <0>responsible trading</0>.'
                                   components={[<StaticUrl key={0} className='link' href='/responsible' />]}
                                   values={{
                                       platform_name_trader: getPlatformSettings('trader').name,
                                       platform_name_dbot: getPlatformSettings('dbot').name,
                                       platform_name_smarttrader: getPlatformSettings('smarttrader').name,
+                                      platform_name_bbot: getPlatformSettings('bbot').name,
                                   }}
                               />
                           ),

packages/account/src/Sections/Assessment/FinancialAssessment/financial-assessment.jsx

@@ -180,7 +180,7 @@ const FinancialAssessment = ({
     is_financial_account,
     is_mf,
     is_trading_experience_incomplete,
-    is_financial_information_not_complete,
+    is_financial_information_incomplete,
     is_virtual,
     platform,
     removeNotificationByKey,
@@ -364,7 +364,7 @@ const FinancialAssessment = ({
                         <LeaveConfirm onDirty={isMobile() ? showForm : null} />
                         {is_form_visible && (
                             <form className='account-form account-form__financial-assessment' onSubmit={handleSubmit}>
-                                {is_mf && is_financial_information_not_complete && !is_submit_success && (
+                                {is_mf && is_financial_information_incomplete && !is_submit_success && (
                                     <div className='financial-banner'>
                                         <Icon icon='IcAlertWarning' />
                                         {isMobile() ? (
@@ -991,7 +991,7 @@ FinancialAssessment.propTypes = {
     is_financial_account: PropTypes.bool,
     is_mf: PropTypes.bool,
     is_trading_experience_incomplete: PropTypes.bool,
-    is_financial_information_not_complete: PropTypes.bool,
+    is_financial_information_incomplete: PropTypes.bool,
     is_virtual: PropTypes.bool,
     platform: PropTypes.string,
     removeNotificationByKey: PropTypes.func,
@@ -1003,7 +1003,7 @@ export default connect(({ client, common, notifications }) => ({
     is_authentication_needed: client.is_authentication_needed,
     is_financial_account: client.is_financial_account,
     is_mf: client.landing_company_shortcode === 'maltainvest',
-    is_financial_information_not_complete: client.is_financial_information_not_complete,
+    is_financial_information_incomplete: client.is_financial_information_incomplete,
     is_trading_experience_incomplete: client.is_trading_experience_incomplete,
     is_virtual: client.is_virtual,
     platform: common.platform,

packages/account/src/Sections/Verification/ProofOfIdentity/proof-of-identity-container.jsx

@@ -25,6 +25,8 @@ const ProofOfIdentityContainer = ({
     is_from_external,
     is_switching,
     is_virtual,
+    is_high_risk,
+    is_withdrawal_lock,
     onStateChange,
     refreshNotifications,
     routeBackInApp,
@@ -85,6 +87,10 @@ const ProofOfIdentityContainer = ({
         needs_poa,
         onfido,
     } = verification_status;
+    const last_attempt_status = identity_last_attempt?.status;
+    const is_last_attempt_idv = identity_last_attempt?.service === 'idv';
+    const is_last_attempt_onfido = identity_last_attempt?.service === 'onfido';
+    const should_ignore_idv = is_high_risk && is_withdrawal_lock;
 
     if (!should_allow_authentication && !is_age_verified) {
         return <NotRequired />;
@@ -96,7 +102,13 @@ const ProofOfIdentityContainer = ({
         </Button>
     );
 
-    if (identity_status === identity_status_codes.none || has_require_submission || allow_poi_resubmission) {
+    if (
+        identity_status === identity_status_codes.none ||
+        has_require_submission ||
+        allow_poi_resubmission ||
+        (should_ignore_idv && is_last_attempt_idv && manual?.status !== 'verified' && manual?.status !== 'pending') ||
+        (should_ignore_idv && is_last_attempt_onfido && last_attempt_status === 'rejected')
+    ) {
         return (
             <POISubmission
                 allow_poi_resubmission={allow_poi_resubmission}
@@ -105,7 +117,7 @@ const ProofOfIdentityContainer = ({
                 identity_last_attempt={identity_last_attempt}
                 idv={idv}
                 is_from_external={!!is_from_external}
-                is_idv_disallowed={is_idv_disallowed}
+                is_idv_disallowed={is_idv_disallowed || should_ignore_idv}
                 manual={manual}
                 needs_poa={needs_poa}
                 onfido={onfido}

packages/account/src/Sections/Verification/ProofOfIdentity/proof-of-identity.jsx

@@ -11,6 +11,8 @@ const ProofOfIdentity = ({
     is_from_external,
     is_switching,
     is_virtual,
+    is_high_risk,
+    is_withdrawal_lock,
     onStateChange,
     refreshNotifications,
     routeBackInApp,
@@ -29,6 +31,8 @@ const ProofOfIdentity = ({
                             is_from_external={is_from_external}
                             is_switching={is_switching}
                             is_virtual={is_virtual}
+                            is_high_risk={is_high_risk}
+                            is_withdrawal_lock={is_withdrawal_lock}
                             onStateChange={onStateChange}
                             refreshNotifications={refreshNotifications}
                             routeBackInApp={routeBackInApp}
@@ -48,6 +52,8 @@ export default connect(({ client, common, notifications }) => ({
     fetchResidenceList: client.fetchResidenceList,
     is_switching: client.is_switching,
     is_virtual: client.is_virtual,
+    is_high_risk: client.is_high_risk,
+    is_withdrawal_lock: client.is_withdrawal_lock,
     refreshNotifications: notifications.refreshNotifications,
     routeBackInApp: common.routeBackInApp,
     should_allow_authentication: client.should_allow_authentication,

packages/account/tsconfig.json

@@ -2,7 +2,6 @@
     "extends": "../../tsconfig.json",
     "compilerOptions": {
         "outDir": "./dist",
-        "rootDir": "./src",
         "baseUrl": "./",
         "paths": {
             "Components/*": ["src/Components/*"],
@@ -15,8 +14,9 @@
             "Modules/*": ["src/Modules/*"],
             "Sections/*": ["src/Sections/*"],
             "Stores/*": ["src/Stores/*"],
-            "Styles/*": ["src/Styles/*"]
+            "Styles/*": ["src/Styles/*"],
+            "@deriv/*": ["../*/src"]
         }
     },
-    "include": ["./src/**/*.ts", "./src/**/*.tsx", "globals.d.ts"] // *** The files TypeScript should type check ***
+    "include": ["src"]
 }

packages/appstore/package.json

@@ -40,6 +40,7 @@
         "mobx-react-lite": "^2.2.2",
         "object.fromentries": "^2.0.0",
         "prop-types": "^15.7.2",
+        "react": "^16.14.0",
         "react-router": "^5.2.0",
         "react-router-dom": "^5.2.0"
     },
@@ -50,6 +51,8 @@
         "@types/classnames": "^2.2.11",
         "@types/object.fromentries": "^2.0.0",
         "@types/react-router-dom": "^5.1.6",
+        "@types/react": "^18.0.7",
+        "@types/react-dom": "^18.0.0",
         "babel-core": "^6.26.3",
         "babel-loader": "^8.1.0",
         "chai": "^4.2.0",
@@ -70,6 +73,7 @@
         "source-map-loader": "^1.1.2",
         "style-loader": "^1.2.1",
         "terser-webpack-plugin": "^5.1.1",
+        "typescript": "^4.6.3",
         "webpack": "^5.46.0",
         "webpack-bundle-analyzer": "^4.3.0",
         "webpack-cli": "^4.7.2"

packages/appstore/tsconfig.json

@@ -2,7 +2,6 @@
     "extends": "../../tsconfig.json",
     "compilerOptions": {
         "outDir": "./dist",
-        "rootDir": "./src",
         "baseUrl": "./",
         "paths": {
             "Components/*": ["src/components/*"],
@@ -11,8 +10,9 @@
             "Stores/*": ["src/stores/*"],
             "Stores": ["src/stores/index"],
             "Types": ["src/types"],
-            "Utils": ["src/utils"]
+            "Utils": ["src/utils"],
+            "@deriv/*": ["../*/src"]
         }
     },
-    "include": ["./src/**/*.ts", "./src/**/*.tsx"]
+    "include": ["src"]
 }

packages/bot-skeleton/package.json

@@ -24,8 +24,11 @@
     "devDependencies": {
         "@babel/eslint-parser": "^7.17.0",
         "@babel/preset-react": "^7.16.7",
+        "@types/react": "^18.0.7",
+        "@types/react-dom": "^18.0.0",
         "chai": "^4.2.0",
         "deep-diff": "^1.0.2",
+        "typescript": "^4.6.3",
         "eslint-config-airbnb-base": "^14.2.1",
         "eslint-config-binary": "^1.0.2",
         "eslint-config-prettier": "^7.2.0",

packages/bot-web-ui/package.json

@@ -37,6 +37,8 @@
     "devDependencies": {
         "@babel/eslint-parser": "^7.17.0",
         "@babel/preset-react": "^7.16.7",
+        "@types/react": "^18.0.7",
+        "@types/react-dom": "^18.0.0",
         "babel-loader": "^8.1.0",
         "chai": "^4.2.0",
         "clean-webpack-plugin": "^3.0.0",
@@ -60,6 +62,7 @@
         "sass-resources-loader": "^2.1.1",
         "stylelint-webpack-plugin": "^2.1.1",
         "svg-sprite-loader": "^5.2.1",
+        "typescript": "^4.6.3",
         "webpack": "^5.46.0",
         "webpack-cli": "^4.7.2"
     },

packages/cashier/package.json

@@ -71,6 +71,8 @@
         "@babel/preset-env": "^7.12.11",
         "@babel/preset-react": "^7.16.7",
         "@testing-library/react": "^12.0.0",
+        "@types/react": "^18.0.7",
+        "@types/react-dom": "^18.0.0",
         "babel-loader": "^8.1.0",
         "clean-webpack-plugin": "^3.0.0",
         "copy-webpack-plugin": "^9.0.1",
@@ -86,6 +88,7 @@
         "resolve-url-loader": "^3.1.2",
         "sass-loader": "^12.6.0",
         "sass-resources-loader": "^2.1.1",
+        "typescript": "^4.6.3",
         "webpack": "^5.46.0",
         "webpack-cli": "^4.7.2",
         "webpack-manifest-plugin": "^4.0.2",

packages/cashier/src/components/cashier-container/virtual/virtual.tsx

@@ -6,7 +6,7 @@ import { Text } from '@deriv/components';
 import { isMobile } from '@deriv/shared';
 import { Localize } from '@deriv/translations';
 import { connect } from 'Stores/connect';
-import { RootStore } from 'Types';
+import { TRootStore } from 'Types';
 import './virtual.scss';
 
 type TVirtualProps = RouteComponentProps & {
@@ -51,7 +51,7 @@ const Virtual = ({ is_dark_mode_on, toggleAccountsDialog }: TVirtualProps) => {
     );
 };
 
-export default connect(({ ui }: RootStore) => ({
+export default connect(({ ui }: TRootStore) => ({
     is_dark_mode_on: ui.is_dark_mode_on,
     toggleAccountsDialog: ui.toggleAccountsDialog,
 }))(withRouter(Virtual));

packages/cashier/src/components/cashier-locked/__tests__/cashier-locked.spec.tsx

@@ -397,4 +397,21 @@ describe('<CashierLocked />', () => {
             )
         ).toBeInTheDocument();
     });
+
+    it('should show the proper message if the client has PACommisionWithdrawalLimit', () => {
+        render(
+            <CashierLocked
+                account_status={{
+                    cashier_validation: ['PACommisionWithdrawalLimit'],
+                }}
+                is_withdrawal_locked
+            />
+        );
+
+        expect(
+            screen.getByText(
+                "It seems that you've no commissions to withdraw at the moment. You can make withdrawals once you receive your commissions."
+            )
+        ).toBeInTheDocument();
+    });
 });

packages/cashier/src/components/cashier-locked/cashier-locked.tsx

@@ -4,7 +4,7 @@ import { Icon, Text } from '@deriv/components';
 import { localize, Localize } from '@deriv/translations';
 import { formatDate } from '@deriv/shared';
 import { connect } from 'Stores/connect';
-import { RootStore } from 'Types';
+import { TRootStore } from 'Types';
 
 type TAccount = NonNullable<Authorize['account_list']>[0];
 
@@ -50,6 +50,8 @@ const CashierLocked = ({
     const ask_self_exclusion_max_turnover_set = cashier_validation?.includes('ASK_SELF_EXCLUSION_MAX_TURNOVER_SET');
     const ask_fix_details = cashier_validation?.includes('ASK_FIX_DETAILS');
     const ask_uk_funds_protection = cashier_validation?.includes('ASK_UK_FUNDS_PROTECTION');
+    const pa_commision_withdrawal_limit = cashier_validation?.includes('PACommisionWithdrawalLimit');
+
     let icon = 'IcCashierLocked';
     let title = localize('Cashier is locked');
     let message = localize(
@@ -269,6 +271,12 @@ const CashierLocked = ({
         icon = 'IcCashierWithdrawalLock';
         title = localize('Withdrawals are locked');
         message = localize('You can only make deposits. Please contact us via live chat for more information.');
+    } else if (is_withdrawal_locked && pa_commision_withdrawal_limit) {
+        icon = 'IcCashierWithdrawalLock';
+        title = localize('Cashier is locked for withdrawals');
+        message = localize(
+            "It seems that you've no commissions to withdraw at the moment. You can make withdrawals once you receive your commissions."
+        );
     }
 
     return (
@@ -284,7 +292,7 @@ const CashierLocked = ({
     );
 };
 
-export default connect(({ client, modules }: RootStore) => ({
+export default connect(({ client, modules }: TRootStore) => ({
     account_status: client.account_status,
     accounts: client.accounts,
     current_currency_type: client.current_currency_type,