Thisyahlen/87555/switching to mf account upon login if no cr account …

…for low risk (binary-com#7519) * fix: exit traders hub * fix: When login back to the account with has EU only the data for MF is showing * fix: exit from non-eu from traders hub, multipliers is still the active account
sanjam-deriv · Mar 13, 2023 · c8dc93f · c8dc93f
1 parent 2ac4796
commit c8dc93f
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/packages/core/src/App/Containers/Modals/exit-traders-hub-modal/exit-traders-hub-modal.jsx b/packages/core/src/App/Containers/Modals/exit-traders-hub-modal/exit-traders-hub-modal.jsx
@@ -48,7 +48,7 @@ const ExitTradersHubModal = ({
         const cr_account = active_accounts.some(acc => acc.landing_company_shortcode === 'svg');
         toggleExitTradersHubModal();
 
-        if (content_flag === ContentFlag.LOW_RISK_CR_EU) {
+        if (content_flag === ContentFlag.LOW_RISK_CR_EU || content_flag === ContentFlag.LOW_RISK_CR_NON_EU) {
             if (!cr_account) {
                 await switchAccount(account_list.find(acc => acc.loginid.startsWith('VRTC'))?.loginid);
             }

diff --git a/packages/core/src/Stores/client-store.js b/packages/core/src/Stores/client-store.js
@@ -1615,6 +1615,11 @@ export default class ClientStore extends BaseStore {
             if (!this.is_virtual) {
                 this.setPrevRealAccountLoginid(this.loginid);
             }
+            const no_cr_account = this.active_accounts.some(acc => acc.landing_company_shortcode === 'svg');
+
+            if (!no_cr_account && this.is_low_risk) {
+                this.switchAccount(this.virtual_account_loginid);
+            }
         }
 
         this.selectCurrency('');