Merge pull request #34703 from tienifr/fix/33637

fix: Error message appear on original tab when navigate from Magic code expired page

src/pages/signin/ValidateCodeForm/BaseValidateCodeForm.js

@@ -90,6 +90,7 @@ function BaseValidateCodeForm(props) {
     const [twoFactorAuthCode, setTwoFactorAuthCode] = useState('');
     const [timeRemaining, setTimeRemaining] = useState(30);
     const [recoveryCode, setRecoveryCode] = useState('');
+    const [needToClearError, setNeedToClearError] = useState(props.account.errors);
 
     const prevRequiresTwoFactorAuth = usePrevious(props.account.requiresTwoFactorAuth);
     const prevValidateCode = usePrevious(props.credentials.validateCode);
@@ -98,7 +99,7 @@ function BaseValidateCodeForm(props) {
     const input2FARef = useRef();
     const timerRef = useRef();
 
-    const hasError = Boolean(props.account) && !_.isEmpty(props.account.errors);
+    const hasError = Boolean(props.account) && !_.isEmpty(props.account.errors) && !needToClearError;
     const isLoadingResendValidationForm = props.account.loadingForm === CONST.FORMS.RESEND_VALIDATE_CODE_FORM;
     const shouldDisableResendValidateCode = props.network.isOffline || props.account.isLoading;
     const isValidateCodeFormSubmitting =
@@ -212,6 +213,18 @@ function BaseValidateCodeForm(props) {
         Session.clearSignInData();
     };
 
+    useEffect(() => {
+        if (!needToClearError) {
+            return;
+        }
+
+        if (props.account.errors) {
+            Session.clearAccountMessages();
+            return;
+        }
+        setNeedToClearError(false);
+    }, [props.account.errors, needToClearError]);
+
     /**
      * Switches between 2fa and recovery code, clears inputs and errors
      */