george / PRODQA-1316 / Transfer from Tradershub validation (#9908)

* fix: 🚑 fix active container for TH transfer, fix insufficient balance check * test: 🐛 fix tests * fix: 🚑 fix 'Insufficient balance' condition
deriv-com · Aug 31, 2023 · a48f6cd · a48f6cd · vercel · Aug 31, 2023
1 parent 7ae26aa
commit a48f6cd
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 5 deletions.
diff --git a/.../appstore/src/components/account-transfer-modal/__tests__/account-transfer-modal.spec.tsx b/.../appstore/src/components/account-transfer-modal/__tests__/account-transfer-modal.spec.tsx
@@ -25,6 +25,7 @@ describe('AccountTransferModal', () => {
                         is_transfer_confirm: false,
                         should_switch_account: false,
                     },
+                    general_store: { setActiveTab: jest.fn() },
                 },
             },
         });
@@ -50,6 +51,7 @@ describe('AccountTransferModal', () => {
                         is_transfer_confirm: false,
                         should_switch_account: false,
                     },
+                    general_store: { setActiveTab: jest.fn() },
                 },
             },
         });
@@ -76,6 +78,7 @@ describe('AccountTransferModal', () => {
                         is_transfer_confirm: false,
                         should_switch_account: true,
                     },
+                    general_store: { setActiveTab: jest.fn() },
                 },
             },
         });

diff --git a/packages/appstore/src/components/account-transfer-modal/account-transfer-modal.tsx b/packages/appstore/src/components/account-transfer-modal/account-transfer-modal.tsx
@@ -16,6 +16,7 @@ const AccountTransferModal = observer(({ is_modal_open, toggleModal }: TAccountT
         modules: {
             cashier: {
                 account_transfer: { is_transfer_confirm, should_switch_account, setShouldSwitchAccount },
+                general_store: { setActiveTab },
             },
         },
         traders_hub: { closeModal, setSelectedAccount },
@@ -24,13 +25,18 @@ const AccountTransferModal = observer(({ is_modal_open, toggleModal }: TAccountT
     const history = useHistory();
 
     React.useEffect(() => {
+        if (is_modal_open) setActiveTab('account_transfer');
+
         return () => {
-            setShouldSwitchAccount(false);
-            setSelectedAccount({});
-            closeModal();
+            if (is_modal_open) {
+                setShouldSwitchAccount(false);
+                setSelectedAccount({});
+                setActiveTab('deposit');
+                closeModal();
+            }
         };
         // eslint-disable-next-line react-hooks/exhaustive-deps
-    }, []);
+    }, [is_modal_open]);
 
     const modal_title = !is_transfer_confirm && <Localize i18n_default_text={'Transfer funds to your accounts'} />;
 

diff --git a/packages/cashier/src/pages/account-transfer/account-transfer-form/account-transfer-form.tsx b/packages/cashier/src/pages/account-transfer/account-transfer-form/account-transfer-form.tsx
@@ -146,7 +146,7 @@ const AccountTransferForm = observer(
             });
             if (!is_ok) return message;
 
-            if (selected_from.balance && Number(selected_from.balance) < Number(amount))
+            if (typeof selected_from.balance !== 'undefined' && Number(selected_from.balance) < Number(amount))
                 return localize('Insufficient balance');
 
             return undefined;