Merge pull request #57246 from software-mansion-labs/fix/refresh-veri…

…fy-step [CP Staging] Fix goBack functionality on the 'Verify' step of two-factor verification. (cherry picked from commit 87be07d) (CP triggered by francoisl)
Expensify · Feb 21, 2025 · 98911e1 · 98911e1
1 parent 9c38f9f
commit 98911e1
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git 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
@@ -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))}
         >
             <ScrollView
                 keyboardShouldPersistTaps="handled"