Merge branch 'master' into kate/ts_migration_trader_package

maryia-deriv · Jun 28, 2023 · ccd55ef · ccd55ef
2 parents 204ec93 + f88bb22
commit ccd55ef
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 62 deletions.
diff --git a/packages/appstore/src/components/cfds-listing/index.tsx b/packages/appstore/src/components/cfds-listing/index.tsx
@@ -283,7 +283,7 @@ const CFDsListing = () => {
             )}
 
             {/* TODO: remove is_real flag to unblock the flow for derivez real account creation */}
-            {is_landing_company_loaded && !is_real
+            {/* {is_landing_company_loaded && !is_real
                 ? available_derivez_accounts?.map((account: AvailableAccount) => {
                       const existing_accounts = getExistingAccounts(account.platform, account.market_type);
                       const has_existing_accounts = existing_accounts.length > 0;
@@ -342,7 +342,7 @@ const CFDsListing = () => {
                           />
                       );
                   })
-                : !is_real && <PlatformLoader />}
+                : !is_real && <PlatformLoader />} */}
         </ListingContainer>
     );
 };

diff --git a/packages/appstore/src/components/onboarding-new/__tests__/static-dashboard.spec.tsx b/packages/appstore/src/components/onboarding-new/__tests__/static-dashboard.spec.tsx
diff --git a/packages/appstore/src/components/onboarding-new/static-dashboard.tsx b/packages/appstore/src/components/onboarding-new/static-dashboard.tsx
@@ -564,7 +564,7 @@ const StaticDashboard = ({
                                     is_financial_last_step={is_financial_last_step}
                                     is_eu_user={is_eu_user}
                                 />
-                                <StaticCFDAccountManager
+                                {/* <StaticCFDAccountManager
                                     type='Financial'
                                     platform='derivez'
                                     appname={localize('Deriv EZ')}
@@ -580,7 +580,7 @@ const StaticDashboard = ({
                                     is_blurry={is_blurry}
                                     is_onboarding_animated={is_onboarding_animated}
                                     is_eu_user={is_eu_user}
-                                />
+                                /> */}
                             </div>
                         )}
                     </div>

diff --git a/packages/cfd/src/Stores/Modules/CFD/cfd-store.js b/packages/cfd/src/Stores/Modules/CFD/cfd-store.js
@@ -701,8 +701,8 @@ export default class CFDStore extends BaseStore {
 
     setDerivezToken(response, server) {
         if (!response.error) {
-            const { derivez } = response.service_token;
-            this.derivez_tokens[server] = derivez.token;
+            const { pandats } = response.service_token;
+            this.derivez_tokens[server] = pandats.token;
         }
     }
 

diff --git a/packages/stores/src/mockStore.ts b/packages/stores/src/mockStore.ts
@@ -123,6 +123,7 @@ const mock = (): TStores & { is_mock: boolean } => {
             is_deposit_lock: false,
             is_dxtrade_allowed: false,
             is_eu: false,
+            is_eu_country: false,
             is_financial_account: false,
             is_financial_information_incomplete: false,
             is_low_risk: false,

diff --git a/packages/stores/types.ts b/packages/stores/types.ts
@@ -131,6 +131,7 @@ type TNotification =
 
 type TClientStore = {
     accounts: { [k: string]: TActiveAccount };
+    is_eu_country: boolean;
     active_accounts: TActiveAccount[];
     active_account_landing_company: string;
     trading_platform_available_accounts: TTradingPlatformAvailableAccount[];