From 98911e136087ce67b4367b04e04295cafdfad17a Mon Sep 17 00:00:00 2001 From: Vit Horacek <36083550+mountiny@users.noreply.github.com> Date: Fri, 21 Feb 2025 18:07:31 +0100 Subject: [PATCH] Merge pull request #57246 from software-mansion-labs/fix/refresh-verify-step [CP Staging] Fix goBack functionality on the 'Verify' step of two-factor verification. (cherry picked from commit 87be07d6a91e7f4536dca49ef481268f2f869e66) (CP triggered by francoisl) --- .../ModalStackNavigators/useModalStackScreenOptions.ts | 1 + src/pages/settings/Security/TwoFactorAuth/VerifyPage.tsx | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/libs/Navigation/AppNavigator/ModalStackNavigators/useModalStackScreenOptions.ts b/src/libs/Navigation/AppNavigator/ModalStackNavigators/useModalStackScreenOptions.ts index 3dc189cb8dcd..57809588b2cd 100644 --- a/src/libs/Navigation/AppNavigator/ModalStackNavigators/useModalStackScreenOptions.ts +++ b/src/libs/Navigation/AppNavigator/ModalStackNavigators/useModalStackScreenOptions.ts @@ -24,6 +24,7 @@ function useModalStackScreenOptions(getScreenOptions?: GetModalStackScreenOption (): PlatformStackNavigationOptions => ({ ...hideKeyboardOnSwipe, headerShown: false, + animationTypeForReplace: 'pop', native: { contentStyle: styles.navigationScreenCardStyle, }, diff --git a/src/pages/settings/Security/TwoFactorAuth/VerifyPage.tsx b/src/pages/settings/Security/TwoFactorAuth/VerifyPage.tsx index a3f461bd36ef..9b2e818b4d7d 100644 --- a/src/pages/settings/Security/TwoFactorAuth/VerifyPage.tsx +++ b/src/pages/settings/Security/TwoFactorAuth/VerifyPage.tsx @@ -79,7 +79,7 @@ function VerifyPage({route}: VerifyPageProps) { text: translate('twoFactorAuth.stepVerify'), total: 3, }} - onBackButtonPress={Navigation.goBack} + onBackButtonPress={() => Navigation.goBack(ROUTES.SETTINGS_2FA_ROOT.getRoute(route.params?.backTo, route.params?.forwardTo))} >