[TRAH] Sergei / TRAH - 3858 / Blank screen shown for accounts with no…

… currency (deriv-com#16472) * feat: add check for currency * fix: add check for optional function from props
heorhi-deriv · Sep 16, 2024 · 099d968 · 099d968
1 parent 451bc1b
commit 099d968
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/packages/account/src/Components/currency-selector/currency-selector.tsx b/packages/account/src/Components/currency-selector/currency-selector.tsx
@@ -25,7 +25,7 @@ type TCurrencySelectorExtend = {
     has_wallet_account: boolean;
     is_virtual: boolean;
     onCancel: (current_step: number, goToPreviousStep: () => void) => void;
-    onSave: (current_step: number, values: TCurrencySelectorFormProps) => void;
+    onSave?: (current_step: number, values: TCurrencySelectorFormProps) => void;
     onSubmit: (
         current_step: number | null,
         values: TCurrencySelectorFormProps,
@@ -105,13 +105,13 @@ const CurrencySelector = observer(
 
         const handleCancel = (values: TCurrencySelectorFormProps) => {
             const current_step = getCurrentStep() - 1;
-            onSave(current_step, values);
+            onSave?.(current_step, values);
             onCancel(current_step, goToPreviousStep);
         };
 
         const handleValidate = (values: TCurrencySelectorFormProps) => {
             const current_step = (getCurrentStep?.() || 1) - 1;
-            onSave(current_step, values);
+            onSave?.(current_step, values);
 
             const { errors } = splitValidationResultTypes(validate(values));
             return errors;

diff --git a/packages/core/src/Services/socket-general.js b/packages/core/src/Services/socket-general.js
@@ -271,7 +271,8 @@ const BinarySocketGeneral = (() => {
 
     const subscribeBalances = () => {
         WS.subscribeBalanceAll(ResponseHandlers.balanceOtherAccounts);
-        WS.subscribeBalanceActiveAccount(ResponseHandlers.balanceActiveAccount, client_store.loginid);
+        if (client_store.currency)
+            WS.subscribeBalanceActiveAccount(ResponseHandlers.balanceActiveAccount, client_store.loginid);
     };
 
     const authorizeAccount = response => {