fix: call success modal instead of logging out

shayan-deriv · Apr 26, 2023 · 750c147 · 750c147
1 parent 3e7ee6c
commit 750c147
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 6 deletions.
diff --git a/packages/cfd/src/Stores/Modules/CFD/cfd-store.js b/packages/cfd/src/Stores/Modules/CFD/cfd-store.js
@@ -258,6 +258,7 @@ export default class CFDStore extends BaseStore {
                 this.setCFDSuccessDialog(true);
                 const trading_platform_accounts_list_response = await WS.tradingPlatformAccountsList(values.platform);
                 this.root_store.client.responseTradingPlatformAccountsList(trading_platform_accounts_list_response);
+                this.setCFDNewAccount(response.trading_platform_new_account);
             } else {
                 this.setError(true, response.error);
             }

diff --git a/packages/core/src/Stores/client-store.js b/packages/core/src/Stores/client-store.js
@@ -1652,6 +1652,8 @@ export default class ClientStore extends BaseStore {
             WS.tradingPlatformAccountsList(CFD_PLATFORMS.DERIVEZ).then(this.responseTradingPlatformAccountsList);
             WS.tradingPlatformAccountsList(CFD_PLATFORMS.DERIVEZ).then(this.responseDerivezAvailableAccounts);
 
+            WS.tradingServers(CFD_PLATFORMS.DXTRADE).then(this.responseDxtradeTradingServers);
+
             this.responseStatement(
                 await BinarySocket.send({
                     statement: 1,

diff --git a/packages/core/src/Stores/traders-hub-store.js b/packages/core/src/Stores/traders-hub-store.js
@@ -527,14 +527,13 @@ export default class TradersHubStore extends BaseStore {
 
         const { openAccountNeededModal } = ui;
         const { is_eu } = client;
+
         if (is_eu && !has_maltainvest_account && standpoint?.iom) {
             openAccountNeededModal('maltainvest', localize('Deriv Multipliers'), localize('demo CFDs'));
-            return;
-        }
-        if (platform === CFD_PLATFORMS.DERIVEZ) {
-            createCFDAccount({ ...account_type, platform });
-        } else {
+
+        } else if (platform !== CFD_PLATFORMS.DERIVEZ) {
             enableCFDPasswordModal();
+        } else {
             createCFDAccount({ ...account_type, platform });
         }
     }
@@ -543,11 +542,13 @@ export default class TradersHubStore extends BaseStore {
         const { client, modules } = this.root_store;
         const { has_active_real_account } = client;
         const { createCFDAccount, enableCFDPasswordModal, toggleJurisdictionModal } = modules.cfd;
+
         if (has_active_real_account && platform === CFD_PLATFORMS.MT5) {
             toggleJurisdictionModal();
+        } else if (platform !== CFD_PLATFORMS.DERIVEZ) {
+            enableCFDPasswordModal();
         } else {
             createCFDAccount({ ...account_type, platform });
-            enableCFDPasswordModal();
         }
     }