chore: filter list for australian clients (deriv-com#8319)

* chore: filter list for australian clients * fix: resolve comments * fix: circle ci error * fix: added mockstore types * fix: updated types * fix: show available cfds correctly on onboarding page * fix: commit suggestion
yaswanth-deriv · May 2, 2023 · 7cca6b5 · 7cca6b5
1 parent 45c3523
commit 7cca6b5
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 7 deletions.
diff --git a/packages/appstore/src/components/cfds-listing/index.tsx b/packages/appstore/src/components/cfds-listing/index.tsx
@@ -50,6 +50,7 @@ const CFDsListing = () => {
         no_CR_account,
         setSelectedAccount,
         CFDs_restricted_countries,
+        financial_restricted_countries,
     } = traders_hub;
 
     const { toggleCompareAccountsModal, setAccountType } = cfd;
@@ -204,7 +205,7 @@ const CFDsListing = () => {
             ) : (
                 <PlatformLoader />
             )}
-            {!is_eu_user && !CFDs_restricted_countries && (
+            {!is_eu_user && !CFDs_restricted_countries && !financial_restricted_countries && (
                 <div className='cfd-full-row'>
                     <hr className='divider' />
                 </div>

diff --git a/packages/appstore/src/components/onboarding-new/static-dashboard.tsx b/packages/appstore/src/components/onboarding-new/static-dashboard.tsx
@@ -64,7 +64,7 @@ const StaticDashboard = ({
     loginid,
 }: TStaticDashboard) => {
     const { client, traders_hub } = useStores();
-    const { content_flag, CFDs_restricted_countries } = traders_hub;
+    const { content_flag, CFDs_restricted_countries, financial_restricted_countries } = traders_hub;
     const { is_eu_country, is_logged_in } = client;
 
     const [index, setIndex] = React.useState<number>(0);
@@ -434,7 +434,7 @@ const StaticDashboard = ({
                         </div>
 
                         <div className='static-dashboard-wrapper__body'>
-                            {!is_eu_user && (
+                            {!is_eu_user && !financial_restricted_countries && (
                                 <StaticCFDAccountManager
                                     type='synthetic'
                                     platform='mt5'
@@ -453,7 +453,7 @@ const StaticDashboard = ({
                                 />
                             )}
                             {isMobile() && !has_account && <Divider />}
-                            {is_eu_user && (
+                            {is_eu_user && !financial_restricted_countries && (
                                 <StaticCFDAccountManager
                                     type='financial'
                                     platform='mt5'
@@ -501,7 +501,7 @@ const StaticDashboard = ({
                                 />
                             )}
                         </div>
-                        {!is_eu_user && !CFDs_restricted_countries && (
+                        {!is_eu_user && !CFDs_restricted_countries && !financial_restricted_countries && (
                             <React.Fragment>
                                 <Divider />
                                 <div className='static-dashboard-wrapper__body--header'>
@@ -520,7 +520,7 @@ const StaticDashboard = ({
                                 </div>
                             </React.Fragment>
                         )}
-                        {!is_eu_user && !CFDs_restricted_countries && (
+                        {!is_eu_user && !CFDs_restricted_countries && !financial_restricted_countries && (
                             <StaticCFDAccountManager
                                 type='all'
                                 platform='dxtrade'

diff --git a/packages/core/src/Stores/traders-hub-store.js b/packages/core/src/Stores/traders-hub-store.js
@@ -91,6 +91,7 @@ export default class TradersHubStore extends BaseStore {
             toggleIsTourOpen: action.bound,
             toggleRegulatorsCompareModal: action.bound,
             showTopUpModal: action.bound,
+            financial_restricted_countries: computed,
         });
 
         reaction(
@@ -104,6 +105,7 @@ export default class TradersHubStore extends BaseStore {
                 this.root_store.modules?.cfd?.current_list,
                 this.root_store.client.landing_companies,
                 this.root_store.common.current_language,
+                this.financial_restricted_countries,
             ],
             () => {
                 this.getAvailablePlatforms();
@@ -368,6 +370,12 @@ export default class TradersHubStore extends BaseStore {
         this.setCombinedCFDMT5Accounts();
     }
 
+    get financial_restricted_countries() {
+        const { financial_company, gaming_company } = this.root_store.client.landing_companies;
+
+        return financial_company?.shortcode === 'svg' && !gaming_company;
+    }
+
     get CFDs_restricted_countries() {
         const { financial_company, gaming_company } = this.root_store.client.landing_companies;
 
@@ -382,6 +390,13 @@ export default class TradersHubStore extends BaseStore {
             return;
         }
 
+        if (this.financial_restricted_countries) {
+            this.available_mt5_accounts = this.available_cfd_accounts.filter(
+                account => account.market_type === 'financial' && account.platform === CFD_PLATFORMS.MT5
+            );
+            return;
+        }
+
         if (this.CFDs_restricted_countries) {
             this.available_mt5_accounts = this.available_cfd_accounts.filter(
                 account => account.market_type !== 'financial' && account.platform === CFD_PLATFORMS.MT5
@@ -395,7 +410,7 @@ export default class TradersHubStore extends BaseStore {
     }
 
     getAvailableDxtradeAccounts() {
-        if (this.CFDs_restricted_countries) {
+        if (this.CFDs_restricted_countries || this.financial_restricted_countries) {
             this.available_dxtrade_accounts = [];
             return;
         }

diff --git a/packages/stores/src/mockStore.ts b/packages/stores/src/mockStore.ts
@@ -267,6 +267,7 @@ const mock = (): TStores => {
             is_real: false,
             selectRegion: jest.fn(),
             is_low_risk_cr_eu_real: false,
+            financial_restricted_countries: false,
             selected_account_type: 'real',
             no_CR_account: false,
             no_MF_account: false,

diff --git a/packages/stores/types.ts b/packages/stores/types.ts
@@ -287,6 +287,7 @@ type TTradersHubStore = {
     setTogglePlatformType: (platform_type: string) => void;
     is_real: boolean;
     selectRegion: (region: string) => void;
+    financial_restricted_countries: boolean;
     selected_account_type: string;
     no_CR_account: boolean;
     no_MF_account: boolean;