Thisyahlen/exittradershub (#7490)

* fix: exit traders hub * fix: exit traders hub * fix: exit v2 * fix: exit remove async v3 * fix: remove await * fix: account switcher now showing currencies --------- Co-authored-by: vinu-deriv <100689171+vinu-deriv@users.noreply.github.com>
binary-com · Feb 3, 2023 · b03b9cf · b03b9cf · vercel · Feb 3, 2023
1 parent eb178dd
commit b03b9cf
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 13 deletions.
diff --git a/packages/core/src/App/Containers/AccountSwitcher/account-switcher.jsx b/packages/core/src/App/Containers/AccountSwitcher/account-switcher.jsx
@@ -89,7 +89,7 @@ const AccountSwitcher = props => {
         if (cfd_demo_currency !== account_total_balance_currency) {
             getCurrentExchangeRate(cfd_demo_currency, setExchangedRateCfdDemo);
         }
-        if (props.is_low_risk) {
+        if (props.is_low_risk || props.is_high_risk || props.is_eu) {
             const real_accounts = getSortedAccountList(props.account_list, props.accounts).filter(
                 account => !account.is_virtual && account.loginid.startsWith('CR')
             );

diff --git a/packages/core/src/App/Containers/Layout/header/default-header.jsx b/packages/core/src/App/Containers/Layout/header/default-header.jsx
@@ -51,6 +51,7 @@ const DefaultHeader = ({
     toggleAccountsDialog,
     toggleNotifications,
     is_landing_company_loaded,
+    is_switching,
 }) => {
     const addUpdateNotification = () => addNotificationMessage(client_notifications.new_version_available);
     const removeUpdateNotification = React.useCallback(
@@ -154,7 +155,7 @@ const DefaultHeader = ({
                         'header__menu-right--hidden': isMobile() && is_logging_in,
                     })}
                 >
-                    {is_logging_in && (
+                    {(is_logging_in || is_switching) && (
                         <div
                             id='dt_core_header_acc-info-preloader'
                             className={classNames('acc-info__preloader', {
@@ -237,6 +238,7 @@ DefaultHeader.propTypes = {
     menu_items: PropTypes.array,
     setIsPreAppStore: PropTypes.func,
     is_landing_company_loaded: PropTypes.bool,
+    is_switching: PropTypes.bool,
 };
 
 export default connect(({ client, common, ui, menu, modules, notifications }) => ({
@@ -274,4 +276,5 @@ export default connect(({ client, common, ui, menu, modules, notifications }) =>
     is_trading_assessment_for_existing_user_enabled: ui.is_trading_assessment_for_existing_user_enabled,
     is_landing_company_loaded: client.is_landing_company_loaded,
     setIsPreAppStore: client.setIsPreAppStore,
+    is_switching: client.is_switching,
 }))(withRouter(DefaultHeader));
diff --git a/packages/core/src/App/Containers/Layout/header/dtrader-header.jsx b/packages/core/src/App/Containers/Layout/header/dtrader-header.jsx
@@ -53,6 +53,7 @@ const DTraderHeader = ({
     removeNotificationMessage,
     toggleAccountsDialog,
     toggleNotifications,
+    is_switching,
 }) => {
     const addUpdateNotification = () => addNotificationMessage(client_notifications.new_version_available);
     const removeUpdateNotification = React.useCallback(
@@ -124,7 +125,7 @@ const DTraderHeader = ({
                             <Divider />
                         </div>
                     </DesktopWrapper>
-                    {is_logging_in && (
+                    {(is_logging_in || is_switching) && (
                         <div
                             id='dt_core_header_acc-info-preloader'
                             className={classNames('acc-info__preloader__dtrader', {
@@ -201,6 +202,7 @@ DTraderHeader.propTypes = {
     history: PropTypes.object,
     menu_items: PropTypes.array,
     is_pre_appstore: PropTypes.bool,
+    is_switching: PropTypes.bool,
 };
 
 export default connect(({ client, common, ui, menu, modules, notifications }) => ({
@@ -237,4 +239,5 @@ export default connect(({ client, common, ui, menu, modules, notifications }) =>
     toggleAccountsDialog: ui.toggleAccountsDialog,
     toggleNotifications: notifications.toggleNotificationsModal,
     is_pre_appstore: client.is_pre_appstore,
+    is_switching: client.is_switching,
 }))(withRouter(DTraderHeader));
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
@@ -15,6 +15,7 @@ const ExitTradersHubModal = ({
     switchAccount,
     account_list,
     active_accounts,
+    setIsLoggingIn,
 }) => {
     const history = useHistory();
 
@@ -42,17 +43,20 @@ const ExitTradersHubModal = ({
     };
 
     const onClickExitButton = async () => {
+        setIsPreAppStore(false);
+        setIsLoggingIn(true);
         const cr_account = active_accounts.some(acc => acc.landing_company_shortcode === 'svg');
         toggleExitTradersHubModal();
+
         if (content_flag === ContentFlag.LOW_RISK_CR_EU) {
             if (!cr_account) {
                 await switchAccount(account_list.find(acc => acc.loginid.startsWith('VRTC'))?.loginid);
             }
             //if eu is currently selected , switch to non-eu on exiting tradershub
             await switchAccount(account_list.find(acc => acc.loginid.startsWith('CR'))?.loginid);
         }
-        setIsPreAppStore(false);
         history.push(routes.root);
+        setIsLoggingIn(false);
     };
 
     return (
@@ -98,4 +102,5 @@ export default connect(({ ui, client, traders_hub }) => ({
     switchAccount: client.switchAccount,
     account_list: client.account_list,
     active_accounts: client.active_accounts,
+    setIsLoggingIn: client.setIsLoggingIn,
 }))(ExitTradersHubModal);
diff --git a/packages/core/src/Stores/client-store.js b/packages/core/src/Stores/client-store.js
@@ -2561,15 +2561,16 @@ export default class ClientStore extends BaseStore {
 
     setIsPreAppStore(is_pre_appstore) {
         const trading_hub = is_pre_appstore ? 1 : 0;
-        WS.setSettings({
-            set_settings: 1,
-            trading_hub,
-        }).then(response => {
-            if (!response.error) {
-                this.account_settings = { ...this.account_settings, trading_hub };
-                localStorage.setItem('is_pre_appstore', is_pre_appstore);
-            }
-        });
+        try {
+            WS.setSettings({
+                set_settings: 1,
+                trading_hub,
+            });
+        } catch (error) {
+            return;
+        }
+        this.account_settings = { ...this.account_settings, trading_hub };
+        localStorage.setItem('is_pre_appstore', is_pre_appstore);
     }
 }
 /* eslint-enable */