From 3a08b9f1f2f3d2b230f01cf3d120469f3edfa360 Mon Sep 17 00:00:00 2001
From: Vit Horacek <36083550+mountiny@users.noreply.github.com>
Date: Fri, 21 Feb 2025 20:58:08 +0100
Subject: [PATCH] Merge pull request #57252 from
 software-mansion-labs/fix/navigation-back-to-verify

[CP Staging] Fix that Swiping back on success page redirects back to verify

(cherry picked from commit 4143aeaf84065b40c5598572b223ed943fefa54e)

(CP triggered by francoisl)
---
 src/pages/settings/Security/TwoFactorAuth/DisablePage.tsx | 2 +-
 src/pages/settings/Security/TwoFactorAuth/VerifyPage.tsx  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/pages/settings/Security/TwoFactorAuth/DisablePage.tsx b/src/pages/settings/Security/TwoFactorAuth/DisablePage.tsx
index 7ff3d7893965..857902c7d6f8 100644
--- a/src/pages/settings/Security/TwoFactorAuth/DisablePage.tsx
+++ b/src/pages/settings/Security/TwoFactorAuth/DisablePage.tsx
@@ -27,7 +27,7 @@ function DisablePage() {
             return;
         }
 
-        Navigation.navigate(ROUTES.SETTINGS_2FA_DISABLED);
+        Navigation.navigate(ROUTES.SETTINGS_2FA_DISABLED, {forceReplace: true});
     }, [account?.requiresTwoFactorAuth]);
 
     return (
diff --git a/src/pages/settings/Security/TwoFactorAuth/VerifyPage.tsx b/src/pages/settings/Security/TwoFactorAuth/VerifyPage.tsx
index 9b2e818b4d7d..a737699a8d5c 100644
--- a/src/pages/settings/Security/TwoFactorAuth/VerifyPage.tsx
+++ b/src/pages/settings/Security/TwoFactorAuth/VerifyPage.tsx
@@ -48,7 +48,7 @@ function VerifyPage({route}: VerifyPageProps) {
         if (!account?.requiresTwoFactorAuth || !account.codesAreCopied) {
             return;
         }
-        Navigation.navigate(ROUTES.SETTINGS_2FA_SUCCESS.getRoute(route.params?.backTo, route.params?.forwardTo));
+        Navigation.navigate(ROUTES.SETTINGS_2FA_SUCCESS.getRoute(route.params?.backTo, route.params?.forwardTo), {forceReplace: true});
     }, [account?.codesAreCopied, account?.requiresTwoFactorAuth, route.params?.backTo, route.params?.forwardTo]);
 
     /**