Merge pull request #53629 from FitseTLT/fix-navigate-back-with-backTo…

…-for-verify-page

src/pages/settings/Wallet/VerifyAccountPage.tsx

@@ -31,6 +31,7 @@ function VerifyAccountPage({route}: VerifyAccountPageProps) {
     const [isValidateCodeActionModalVisible, setIsValidateCodeActionModalVisible] = useState(true);
 
     const navigateForwardTo = route.params?.forwardTo;
+    const backTo = route.params?.backTo;
 
     useBeforeRemove(() => setIsValidateCodeActionModalVisible(false));
 
@@ -50,8 +51,8 @@ function VerifyAccountPage({route}: VerifyAccountPageProps) {
     const closeModal = useCallback(() => {
         // Disable modal visibility so the navigation is animated
         setIsValidateCodeActionModalVisible(false);
-        Navigation.goBack();
-    }, []);
+        Navigation.goBack(backTo);
+    }, [backTo]);
 
     // Handle navigation once the user is validated
     useEffect(() => {
@@ -64,9 +65,9 @@ function VerifyAccountPage({route}: VerifyAccountPageProps) {
         if (navigateForwardTo) {
             Navigation.navigate(navigateForwardTo, CONST.NAVIGATION.TYPE.UP);
         } else {
-            Navigation.goBack();
+            Navigation.goBack(backTo);
         }
-    }, [isUserValidated, navigateForwardTo]);
+    }, [isUserValidated, navigateForwardTo, backTo]);
 
     // Once user is validated or the modal is dismissed, we don't want to show empty content.
     // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
@@ -78,7 +79,7 @@ function VerifyAccountPage({route}: VerifyAccountPageProps) {
             >
                 <HeaderWithBackButton
                     title={translate('contacts.validateAccount')}
-                    onBackButtonPress={() => Navigation.goBack()}
+                    onBackButtonPress={() => Navigation.goBack(backTo)}
                 />
                 <FullScreenLoadingIndicator style={[styles.flex1, styles.pRelative]} />
             </ScreenWrapper>