Merge pull request #304 from rupato-deriv/Rupato/Fix--for-disabled-ac…

…counts Rupato/fix for disabled accounts
deriv-com · Mar 6, 2025 · 976da1a · 976da1a
2 parents 1c27abc + 5eb0bd5
commit 976da1a
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 9 deletions.
diff --git a/src/components/layout/index.tsx b/src/components/layout/index.tsx
@@ -39,7 +39,9 @@ const Layout = () => {
 
     const validateApiAccounts = ({ data }: any) => {
         if (data.msg_type === 'authorize') {
-            api_accounts.push(data.authorize.account_list || []);
+            const enabled_accounts = (data?.authorize?.account_list || []).filter((acc: any) => !acc.is_disabled);
+            api_accounts.push(enabled_accounts || []);
+
             const allCurrencies = new Set(Object.values(checkClientAccount).map(acc => acc.currency));
             let currency = 'USD';
             const hasMissingCurrency = api_accounts?.flat().some(data => {
@@ -54,8 +56,22 @@ const Layout = () => {
             if (hasMissingCurrency) {
                 setClientHasCurrency(false);
             } else {
+                const enabled_account_currency =
+                    enabled_accounts?.find(acc => acc.currency === currency)?.currency || 'USD';
+
+                let session_storage_currency = sessionStorage.getItem('query_param_currency');
+
+                if (session_storage_currency) {
+                    session_storage_currency = `account=${session_storage_currency}`;
+                } else {
+                    session_storage_currency = `account=${enabled_account_currency}`;
+                }
+
+                window.history.pushState({}, '', `${window.location.pathname}?${session_storage_currency}`);
+
                 sessionStorage.removeItem('query_param_currency');
                 setClientHasCurrency(true);
+                console.log('All accounts present');
             }
 
             if (subscription) {
@@ -77,7 +93,6 @@ const Layout = () => {
             !clientHasCurrency
         ) {
             const query_param_currency = sessionStorage.getItem('query_param_currency') || currency || 'USD';
-            console.log('query_param_currency', query_param_currency);
             sessionStorage.setItem('query_param_currency', currency);
             requestOidcAuthentication({
                 redirectCallbackUri: `${window.location.origin}/callback`,

diff --git a/src/external/bot-skeleton/services/api/api-base.ts b/src/external/bot-skeleton/services/api/api-base.ts
@@ -171,7 +171,8 @@ class APIBase {
                     this.active_symbols_promise = this.getActiveSymbols();
                 }
                 this.account_info = authorize;
-                setAccountList(authorize.account_list);
+                const filtered_accounts = (authorize?.account_list || []).filter(acc => !acc?.is_disabled);
+                setAccountList(filtered_accounts);
                 setAuthData(authorize);
                 setIsAuthorized(true);
                 this.is_authorized = true;

diff --git a/src/pages/callback/callback-page.tsx b/src/pages/callback/callback-page.tsx
@@ -64,12 +64,6 @@ const CallbackPage = () => {
                     : null;
                 const selected_currency =
                     (is_valid_currency ? state?.account?.currency || currency : currency) || firstAccountCurrency;
-                console.log('selected_currency', {
-                    firstAccountCurrency,
-                    stateAccountCurrency: state?.account?.currency,
-                    currency,
-                    selected_currency,
-                });
                 window.location.assign(`/?account=${selected_currency}`);
             }}
             renderReturnButton={() => {