From bc8882debc59915f659382745889665789e410b4 Mon Sep 17 00:00:00 2001
From: Aum Bhatt <125039206+aum-deriv@users.noreply.github.com>
Date: Mon, 21 Aug 2023 12:49:18 +0400
Subject: [PATCH] =?UTF-8?q?fix:=20=F0=9F=90=9B=20=20Farzin/Aum/WEBREL-1102?=
 =?UTF-8?q?/pa-withdrawal-redirection-fix=20(#9759)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* fix: fixed pa_withdrawal page issue

* Merge branch 'master' into pr/aum-deriv/9759

---------

Co-authored-by: Farzin Mirzaie <farzin@deriv.com>
---
 .../payment-agent-container.tsx                       |  9 ---------
 packages/cashier/src/stores/general-store.ts          |  4 ++++
 packages/cashier/src/stores/payment-agent-store.ts    | 11 ++++++-----
 3 files changed, 10 insertions(+), 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
index 8550a56252d0..fd237edfa459 100644
--- 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
index ae34d8b732db..323ba213f9b0 100644
--- 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
index 6029d3e3747f..be0dda6360a5 100644
--- 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);