Merge branch 'd53884-5' of github.com:jacobkim9881/Expensify-App into…

… m53884
Expensify · Feb 12, 2025 · 3a7ebdf · 3a7ebdf
2 parents bc398e4 + aac99d3
commit 3a7ebdf
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 17 deletions.
diff --git a/src/components/ValidateCodeActionForm/index.tsx b/src/components/ValidateCodeActionForm/index.tsx
@@ -9,7 +9,6 @@ import ONYXKEYS from '@src/ONYXKEYS';
 import type {ValidateCodeActionFormProps} from './type';
 
 function ValidateCodeActionForm({
-    isValidated,
     descriptionPrimary,
     descriptionSecondary,
     validatePendingAction,
@@ -36,22 +35,19 @@ function ValidateCodeActionForm({
     );
 
     useEffect(() => {
-        if (hasMagicCodeBeenSent) {
-            // eslint-disable-next-line rulesdir/prefer-early-return
-            return () => {
-                // We need to run clearError in cleanup function to use as onClose function.
-                // As 'useEffect cleanup function' runs when even the component is unmounted, we need to put clearError() in the if condition.
-                // So clearError() will not run when the form is unmounted.
-                if (isClosedRef.current && !isValidated) {
-                    clearError();
-                }
-            };
-        }
         if (!isInitialized.current) {
             isInitialized.current = true;
             sendValidateCode();
         }
-    }, [isValidated, sendValidateCode, hasMagicCodeBeenSent, clearError]);
+        return () => {
+            // We need to run clearError in cleanup function to use as onClose function.
+            // As 'useEffect cleanup function' runs whenever a dependency is called, we need to put clearError() in the if condition.
+            // So clearError() will not run when the form is unmounted.
+            if (isClosedRef.current) {
+                clearError();
+            }
+        };
+    }, [sendValidateCode, clearError]);
 
     return (
         <View style={[themeStyles.ph5, themeStyles.mt3, themeStyles.mb5, themeStyles.flex1]}>

diff --git a/src/components/ValidateCodeActionForm/type.ts b/src/components/ValidateCodeActionForm/type.ts
@@ -3,9 +3,6 @@ import type {ValidateCodeFormHandle} from '@components/ValidateCodeActionModal/V
 import type {Errors, PendingAction} from '@src/types/onyx/OnyxCommon';
 
 type ValidateCodeActionFormProps = {
-    /** Wheter code is validated */
-    isValidated: boolean;
-
     /** Primary description of the modal */
     descriptionPrimary: string;
 

diff --git a/src/pages/settings/Profile/Contacts/ContactMethodDetailsPage.tsx b/src/pages/settings/Profile/Contacts/ContactMethodDetailsPage.tsx
@@ -329,7 +329,6 @@ function ContactMethodDetailsPage({route}: ContactMethodDetailsPageProps) {
                 {isValidateCodeFormVisible && !loginData.validatedDate && !!loginData && (
                     <ValidateCodeActionForm
                         hasMagicCodeBeenSent={hasMagicCodeBeenSent}
-                        isValidated={!!loginData.validatedDate}
                         validatePendingAction={loginData.pendingFields?.validateCodeSent}
                         handleSubmitForm={(validateCode) => validateSecondaryLogin(loginList, contactMethod, validateCode)}
                         validateError={!isEmptyObject(validateLoginError) ? validateLoginError : getLatestErrorField(loginData, 'validateCodeSent')}