Merge pull request #57252 from software-mansion-labs/fix/navigation-b…

…ack-to-verify [CP Staging] Fix that Swiping back on success page redirects back to verify (cherry picked from commit 4143aea) (CP triggered by francoisl)
Expensify · Feb 21, 2025 · 3a08b9f · 3a08b9f
1 parent cd81e12
commit 3a08b9f
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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]);
 
     /**