Merge pull request binary-com#132 from mahdiyeh-deriv/Mahdiyeh/85846/…

…fix_switcher_account_loading Mahdiyeh/ fix: reloading of account_switcher
jim-deriv · Jan 13, 2023 · dcee1b3 · dcee1b3
2 parents ca3d18f + 6e5c465
commit dcee1b3
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/packages/core/src/Stores/traders-hub-store.js b/packages/core/src/Stores/traders-hub-store.js
@@ -169,16 +169,20 @@ export default class TradersHubStore extends BaseStore {
     }
 
     async setSwitchEU() {
-        const { account_list, switchAccount, loginid } = this.root_store.client;
+        const { account_list, switchAccount, loginid, setIsLoggingIn } = this.root_store.client;
 
         const mf_account = account_list.find(acc => acc.loginid.startsWith('MF'))?.loginid;
         const cr_account = account_list.find(acc => acc.loginid.startsWith('CR'))?.loginid;
 
         if (this.selected_region === 'EU' && !loginid.startsWith('MF')) {
             // if active_loginid is already EU = do nothing
-            await switchAccount(mf_account);
+            await switchAccount(mf_account).then(() => {
+                setIsLoggingIn(false);
+            });
         } else if (this.selected_region === 'Non-EU' && !loginid.startsWith('CR')) {
-            await switchAccount(cr_account);
+            await switchAccount(cr_account).then(() => {
+                setIsLoggingIn(false);
+            });
         }
     }