From c0f47de0656dfb00981f3955e619600d407b855d Mon Sep 17 00:00:00 2001 From: FitseTLT Date: Thu, 5 Dec 2024 00:17:24 +0300 Subject: [PATCH] pass backTo for goBack --- src/pages/settings/Wallet/VerifyAccountPage.tsx | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/pages/settings/Wallet/VerifyAccountPage.tsx b/src/pages/settings/Wallet/VerifyAccountPage.tsx index 00da9e948b88..f9fc3ff27ba6 100644 --- a/src/pages/settings/Wallet/VerifyAccountPage.tsx +++ b/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) { > Navigation.goBack()} + onBackButtonPress={() => Navigation.goBack(backTo)} />