fix: 🐛 Farzin/Aum/WEBREL-1102/pa-withdrawal-redirection-fix (binary-c…

…om#9759) * fix: fixed pa_withdrawal page issue * Merge branch 'master' into pr/aum-deriv/9759 --------- Co-authored-by: Farzin Mirzaie <farzin@deriv.com>
nada-deriv · Aug 21, 2023 · bc8882d · bc8882d
1 parent 09733d0
commit bc8882d
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 14 deletions.
diff --git a/packages/cashier/src/pages/payment-agent/payment-agent-container/payment-agent-container.tsx b/packages/cashier/src/pages/payment-agent/payment-agent-container/payment-agent-container.tsx
@@ -42,19 +42,10 @@ const PaymentAgentContainer = observer(({ is_deposit }: TPaymentAgentContainer)
         is_withdraw_successful,
         onChangePaymentMethod,
         filtered_list: payment_agent_list,
-        resetPaymentAgent,
         selected_bank,
         supported_banks,
     } = payment_agent_store;
 
-    React.useEffect(() => {
-        return () => {
-            if (!is_deposit) {
-                resetPaymentAgent();
-            }
-        };
-    }, [is_deposit, resetPaymentAgent]);
-
     React.useEffect(() => {
         return () => {
             onChangePaymentMethod({ target: { value: '0' } });

diff --git a/packages/cashier/src/stores/general-store.ts b/packages/cashier/src/stores/general-store.ts
@@ -195,6 +195,10 @@ export default class GeneralStore extends BaseStore {
     }
 
     setActiveTab(container: typeof this.active_container): void {
+        if (this.active_container === 'payment_agent' && container !== 'payment_agent') {
+            this.root_store.modules.cashier.payment_agent.resetPaymentAgent();
+        }
+
         this.active_container = container;
     }
 

diff --git a/packages/cashier/src/stores/payment-agent-store.ts b/packages/cashier/src/stores/payment-agent-store.ts
@@ -95,6 +95,10 @@ export default class PaymentAgentStore {
     }
 
     setActiveTab(index: number) {
+        if (this.active_tab_index === 1 && index === 0) {
+            this.resetPaymentAgent();
+        }
+
         this.setActiveTabIndex(index);
     }
 
@@ -362,11 +366,8 @@ export default class PaymentAgentStore {
     }
 
     resetPaymentAgent = () => {
-        const { client, modules } = this.root_store;
-        const { active_container } = modules.cashier.general_store;
-        const container = Constants.map_action[active_container as 'withdraw' | 'payment_agent'];
-
-        client.setVerificationCode('', container);
+        const { client } = this.root_store;
+        client.setVerificationCode('', 'payment_agent_withdraw');
         this.error.setErrorMessage({ code: '', message: '' });
         this.setIsWithdraw(false);
         this.setIsWithdrawSuccessful(false);