refactor: review comments

suisin-deriv · Jul 25, 2023 · 0dcb0c4 · 0dcb0c4
1 parent c1e1741
commit 0dcb0c4
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 13 deletions.
diff --git a/packages/core/src/App/Containers/OneTimeDepositModal/one-time-deposit-modal.tsx b/packages/core/src/App/Containers/OneTimeDepositModal/one-time-deposit-modal.tsx
@@ -11,29 +11,32 @@ import {
     Text,
 } from '@deriv/components';
 import { useDepositFiatAddress } from '@deriv/hooks';
-import { isMobile } from '@deriv/shared';
 import { observer, useStore } from '@deriv/stores';
 import { Localize, localize } from '@deriv/translations';
 import useLiveChat from 'App/Components/Elements/LiveChat/use-livechat';
 
-const OneTimeDepositModal = () => {
-    const { data: iframe_url, isSuccess } = useDepositFiatAddress();
+const OneTimeDepositModal = observer(() => {
+    const { data: iframe_url, isSuccess, isError } = useDepositFiatAddress();
     const [is_iframe_loading, setIsIframeLoading] = useState(true);
     const { client, ui } = useStore();
-    const { has_deposited_for_first_time, loginid } = client;
-    const { should_show_one_time_deposit_modal, setShouldShowOneTimeDepositModal, toggleAccountSuccessModal } = ui;
+    const { loginid } = client;
+    const {
+        is_mobile,
+        should_show_one_time_deposit_modal,
+        setShouldShowOneTimeDepositModal,
+        toggleAccountSuccessModal,
+    } = ui;
     const liveChat = useLiveChat(false, loginid);
-    const is_mobile = isMobile();
 
     React.useEffect(() => {
         setIsIframeLoading(true);
     }, [iframe_url]);
 
     React.useEffect(() => {
-        if (should_show_one_time_deposit_modal && has_deposited_for_first_time) {
+        if (isError) {
             onCloseModal();
         }
-    }, [has_deposited_for_first_time, should_show_one_time_deposit_modal]);
+    }, [isError]);
 
     const onLiveChatClick = () => {
         liveChat.widget?.call('maximize');
@@ -94,7 +97,7 @@ const OneTimeDepositModal = () => {
     );
 
     return (
-        <>
+        <React.Fragment>
             <DesktopWrapper>
                 <Modal
                     className='one-time-deposit-modal'
@@ -119,8 +122,8 @@ const OneTimeDepositModal = () => {
                     {getModalContent()}
                 </MobileFullPageModal>
             </MobileWrapper>
-        </>
+        </React.Fragment>
     );
-};
+});
 
-export default observer(OneTimeDepositModal);
+export default OneTimeDepositModal;
diff --git a/packages/core/src/Stores/client-store.js b/packages/core/src/Stores/client-store.js
@@ -830,7 +830,7 @@ export default class ClientStore extends BaseStore {
     }
 
     get has_deposited_for_first_time() {
-        return Number(this.balance) > 0;
+        return this.balance;
     }
 
     get has_mt5_account_with_rejected_poa() {