navigate to forward to

rushatgabhane · Jun 20, 2024 · 5799a37 · 5799a37
1 parent c844340
commit 5799a37
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 4 deletions.
diff --git a/src/pages/settings/Security/TwoFactorAuth/Steps/SuccessStep.tsx b/src/pages/settings/Security/TwoFactorAuth/Steps/SuccessStep.tsx
@@ -2,14 +2,14 @@ import React from 'react';
 import ConfirmationPage from '@components/ConfirmationPage';
 import LottieAnimations from '@components/LottieAnimations';
 import useLocalize from '@hooks/useLocalize';
-import type {BackToParams} from '@libs/Navigation/types';
+import type {BackToAndForwardToParms} from '@libs/Navigation/types';
 import Navigation from '@navigation/Navigation';
 import StepWrapper from '@pages/settings/Security/TwoFactorAuth/StepWrapper/StepWrapper';
 import useTwoFactorAuthContext from '@pages/settings/Security/TwoFactorAuth/TwoFactorAuthContext/useTwoFactorAuth';
 import * as TwoFactorAuthActions from '@userActions/TwoFactorAuthActions';
 import CONST from '@src/CONST';
 
-function SuccessStep({backTo}: BackToParams) {
+function SuccessStep({backTo, forwardTo}: BackToAndForwardToParms) {
     const {setStep} = useTwoFactorAuthContext();
 
     const {translate} = useLocalize();
@@ -31,6 +31,10 @@ function SuccessStep({backTo}: BackToParams) {
                 onButtonPress={() => {
                     TwoFactorAuthActions.clearTwoFactorAuthData();
                     setStep(CONST.TWO_FACTOR_AUTH_STEPS.ENABLED);
+                    if (forwardTo) {
+                        Navigation.navigate(forwardTo);
+                        return;
+                    }
                     if (backTo) {
                         Navigation.navigate(backTo);
                     }

diff --git a/src/pages/settings/Security/TwoFactorAuth/TwoFactorAuthSteps.tsx b/src/pages/settings/Security/TwoFactorAuth/TwoFactorAuthSteps.tsx
@@ -22,7 +22,9 @@ type TwoFactorAuthStepProps = BaseTwoFactorAuthFormOnyxProps;
 
 function TwoFactorAuthSteps({account}: TwoFactorAuthStepProps) {
     const route = useRoute<RouteProp<SettingsNavigatorParamList, typeof SCREENS.SETTINGS.TWO_FACTOR_AUTH>>();
-    const backTo = route.params?.backTo ?? '';
+    const backTo = route.params?.backTo;
+    const forwardTo = route.params?.forwardTo;
+
     const [currentStep, setCurrentStep] = useState<TwoFactorAuthStep>(CONST.TWO_FACTOR_AUTH_STEPS.CODES);
 
     const {setAnimationDirection} = useAnimatedStepContext();
@@ -59,7 +61,12 @@ function TwoFactorAuthSteps({account}: TwoFactorAuthStepProps) {
             case CONST.TWO_FACTOR_AUTH_STEPS.VERIFY:
                 return <VerifyStep />;
             case CONST.TWO_FACTOR_AUTH_STEPS.SUCCESS:
-                return <SuccessStep backTo={backTo} />;
+                return (
+                    <SuccessStep
+                        backTo={backTo}
+                        forwardTo={forwardTo}
+                    />
+                );
             case CONST.TWO_FACTOR_AUTH_STEPS.ENABLED:
                 return <EnabledStep />;
             case CONST.TWO_FACTOR_AUTH_STEPS.DISABLED: