From 2964a9be8b056624c5838685b7e46b4115085552 Mon Sep 17 00:00:00 2001
From: Agata Kosior <agata.kosior57@gmail.com>
Date: Tue, 17 Feb 2026 09:12:01 +0100
Subject: [PATCH 1/3] fix: redirect back to wallet after account successfully
 added

---
 .../InternationalDepositAccountContent.tsx                      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/settings/Wallet/InternationalDepositAccount/InternationalDepositAccountContent.tsx b/src/pages/settings/Wallet/InternationalDepositAccount/InternationalDepositAccountContent.tsx
index b1b634fc321dc..7234cc81e0576 100644
--- a/src/pages/settings/Wallet/InternationalDepositAccount/InternationalDepositAccountContent.tsx
+++ b/src/pages/settings/Wallet/InternationalDepositAccount/InternationalDepositAccountContent.tsx
@@ -82,7 +82,7 @@ function InternationalDepositAccountContent({
     const topmostFullScreenRoute = useRootNavigationState((state) => state?.routes.findLast((route) => isFullScreenName(route.name)));
 
     const goBack = useCallback(() => {
-        if (backTo) {
+        if (backTo && !backTo.includes(ROUTES.SETTINGS_BANK_ACCOUNT_PURPOSE)) {
             Navigation.goBack(backTo);
             return;
         }

From ae61b17e27cb4e905fc32e3ce1acc13a129b275f Mon Sep 17 00:00:00 2001
From: Agata Kosior <agata.kosior57@gmail.com>
Date: Wed, 18 Feb 2026 08:51:06 +0100
Subject: [PATCH 2/3] fix: navigation fix

---
 .../InternationalDepositAccountContent.tsx    | 41 ++++++++++---------
 1 file changed, 22 insertions(+), 19 deletions(-)

diff --git a/src/pages/settings/Wallet/InternationalDepositAccount/InternationalDepositAccountContent.tsx b/src/pages/settings/Wallet/InternationalDepositAccount/InternationalDepositAccountContent.tsx
index 7234cc81e0576..2e2363612d62e 100644
--- a/src/pages/settings/Wallet/InternationalDepositAccount/InternationalDepositAccountContent.tsx
+++ b/src/pages/settings/Wallet/InternationalDepositAccount/InternationalDepositAccountContent.tsx
@@ -81,28 +81,31 @@ function InternationalDepositAccountContent({
 
     const topmostFullScreenRoute = useRootNavigationState((state) => state?.routes.findLast((route) => isFullScreenName(route.name)));
 
-    const goBack = useCallback(() => {
-        if (backTo && !backTo.includes(ROUTES.SETTINGS_BANK_ACCOUNT_PURPOSE)) {
-            Navigation.goBack(backTo);
-            return;
-        }
-        switch (topmostFullScreenRoute?.name) {
-            case NAVIGATORS.SETTINGS_SPLIT_NAVIGATOR:
-                Navigation.goBack(ROUTES.SETTINGS_WALLET);
-                break;
-            case NAVIGATORS.REPORTS_SPLIT_NAVIGATOR:
-                Navigation.closeRHPFlow();
-                break;
-            default:
-                Navigation.goBack();
-                break;
-        }
-    }, [backTo, topmostFullScreenRoute?.name]);
+    const goBack = useCallback(
+        (shouldIgnoreBackToParam?: boolean) => {
+            if (backTo && !shouldIgnoreBackToParam) {
+                Navigation.goBack(backTo);
+                return;
+            }
+            switch (topmostFullScreenRoute?.name) {
+                case NAVIGATORS.SETTINGS_SPLIT_NAVIGATOR:
+                    Navigation.goBack(ROUTES.SETTINGS_WALLET);
+                    break;
+                case NAVIGATORS.REPORTS_SPLIT_NAVIGATOR:
+                    Navigation.closeRHPFlow();
+                    break;
+                default:
+                    Navigation.goBack();
+                    break;
+            }
+        },
+        [backTo, topmostFullScreenRoute?.name],
+    );
 
     const handleFinishStep = useCallback(() => {
         clearDraftValues(ONYXKEYS.FORMS.INTERNATIONAL_BANK_ACCOUNT_FORM);
-        goBack();
-    }, [goBack]);
+        goBack(backTo?.includes(ROUTES.SETTINGS_BANK_ACCOUNT_PURPOSE));
+    }, [goBack, backTo]);
 
     const {componentToRender: SubStep, isEditing, nextScreen, prevScreen, screenIndex, moveTo, resetScreenIndex} =
         // eslint-disable-next-line @typescript-eslint/no-deprecated

From 120c0b3a1b0f7386f9cc670c22107891bb5f8878 Mon Sep 17 00:00:00 2001
From: Agata Kosior <agata.kosior57@gmail.com>
Date: Wed, 18 Feb 2026 08:52:55 +0100
Subject: [PATCH 3/3] fix: minor fix

---
 .../InternationalDepositAccountContent.tsx                      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/settings/Wallet/InternationalDepositAccount/InternationalDepositAccountContent.tsx b/src/pages/settings/Wallet/InternationalDepositAccount/InternationalDepositAccountContent.tsx
index 2e2363612d62e..2b3f297b4061b 100644
--- a/src/pages/settings/Wallet/InternationalDepositAccount/InternationalDepositAccountContent.tsx
+++ b/src/pages/settings/Wallet/InternationalDepositAccount/InternationalDepositAccountContent.tsx
@@ -82,7 +82,7 @@ function InternationalDepositAccountContent({
     const topmostFullScreenRoute = useRootNavigationState((state) => state?.routes.findLast((route) => isFullScreenName(route.name)));
 
     const goBack = useCallback(
-        (shouldIgnoreBackToParam?: boolean) => {
+        (shouldIgnoreBackToParam = false) => {
             if (backTo && !shouldIgnoreBackToParam) {
                 Navigation.goBack(backTo);
                 return;