simplify navigation logic

Expensify · Nov 14, 2024 · 67be3a1 · 67be3a1
1 parent 6f4b6dc
commit 67be3a1
Showing 1 changed file with 8 additions and 23 deletions.
diff --git a/src/pages/settings/Wallet/VerifyAccountPage.tsx b/src/pages/settings/Wallet/VerifyAccountPage.tsx
@@ -1,5 +1,5 @@
 import type {StackScreenProps} from '@react-navigation/stack';
-import React, {useCallback, useEffect, useState} from 'react';
+import React, {useCallback, useEffect} from 'react';
 import {useOnyx} from 'react-native-onyx';
 import ValidateCodeActionModal from '@components/ValidateCodeActionModal';
 import useLocalize from '@hooks/useLocalize';
@@ -8,7 +8,6 @@ import Navigation from '@libs/Navigation/Navigation';
 import type {SettingsNavigatorParamList} from '@libs/Navigation/types';
 import * as User from '@userActions/User';
 import ONYXKEYS from '@src/ONYXKEYS';
-import ROUTES from '@src/ROUTES';
 import type SCREENS from '@src/SCREENS';
 
 type VerifyAccountPageProps = StackScreenProps<SettingsNavigatorParamList, typeof SCREENS.SETTINGS.PROFILE.NEW_CONTACT_METHOD>;
@@ -21,7 +20,6 @@ function VerifyAccountPage({route}: VerifyAccountPageProps) {
     const loginData = loginList?.[contactMethod];
     const validateLoginError = ErrorUtils.getEarliestErrorField(loginData, 'validateLogin');
     const [isUserValidated] = useOnyx(ONYXKEYS.USER, {selector: (user) => !!user?.validated});
-    const [isValidateModalVisible, setIsValidateModalVisible] = useState(true);
 
     const navigateBackTo = route?.params?.backTo;
 
@@ -38,44 +36,31 @@ function VerifyAccountPage({route}: VerifyAccountPageProps) {
         User.clearContactMethodErrors(contactMethod, 'validateLogin');
     }, [contactMethod]);
 
+    // Handle navigation once the user is validated
     useEffect(() => {
         if (!isUserValidated) {
             return;
         }
 
-        setIsValidateModalVisible(false);
-
-        if (!navigateBackTo) {
-            return;
-        }
-
-        Navigation.navigate(navigateBackTo);
-    }, [isUserValidated, navigateBackTo]);
-
-    useEffect(() => {
-        if (isValidateModalVisible) {
-            return;
-        }
-
-        if (!isUserValidated && navigateBackTo) {
-            Navigation.navigate(ROUTES.SETTINGS_WALLET);
-        } else if (!navigateBackTo) {
+        if (navigateBackTo) {
+            Navigation.navigate(navigateBackTo);
+        } else {
             Navigation.goBack();
         }
-    }, [isValidateModalVisible, isUserValidated, navigateBackTo]);
+    }, [isUserValidated, navigateBackTo]);
 
     return (
         <ValidateCodeActionModal
             sendValidateCode={() => User.requestValidateCodeAction()}
             handleSubmitForm={handleSubmitForm}
             validateError={validateLoginError}
             hasMagicCodeBeenSent={!!loginData?.validateCodeSent}
-            isVisible={isValidateModalVisible}
+            isVisible={!isUserValidated}
             title={translate('contacts.validateAccount')}
             descriptionPrimary={translate('contacts.featureRequiresValidate')}
             descriptionSecondary={translate('contacts.enterMagicCode', {contactMethod})}
-            onClose={() => setIsValidateModalVisible(false)}
             clearError={clearError}
+            onClose={() => {}}
         />
     );
 }