From ee611beb5098f75265d154da14fb38866bbd2fef Mon Sep 17 00:00:00 2001 From: Blazej Kustra Date: Fri, 21 Feb 2025 17:54:44 +0100 Subject: [PATCH] Fix that Swiping back on success page redirects back to verify --- 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 afa5313ef47e..c1b90581c764 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]); /**