From 91e17d12e1e50ae03031348225c2875c322b485c Mon Sep 17 00:00:00 2001 From: wikuskriek Date: Thu, 10 Aug 2023 12:30:25 +0200 Subject: [PATCH 1/2] fix: validate error clears on mount --- .../Contacts/ValidateCodeForm/BaseValidateCodeForm.js | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/pages/settings/Profile/Contacts/ValidateCodeForm/BaseValidateCodeForm.js b/src/pages/settings/Profile/Contacts/ValidateCodeForm/BaseValidateCodeForm.js index 949ef2a15a2..4f0af97555e 100644 --- a/src/pages/settings/Profile/Contacts/ValidateCodeForm/BaseValidateCodeForm.js +++ b/src/pages/settings/Profile/Contacts/ValidateCodeForm/BaseValidateCodeForm.js @@ -88,6 +88,12 @@ function BaseValidateCodeForm(props) { useEffect(() => { Session.clearAccountMessages(); + if (!validateLoginError) { + return; + } + User.clearContactMethodErrors(props.contactMethod, 'validateLogin'); + + // eslint-disable-next-line react-hooks/exhaustive-deps }, []); useEffect(() => { From 3f1f7a6cfa56532290b871b2a8b30b2eaa204d00 Mon Sep 17 00:00:00 2001 From: wikuskriek Date: Thu, 17 Aug 2023 21:15:29 +0200 Subject: [PATCH 2/2] chore: add comment --- .../Profile/Contacts/ValidateCodeForm/BaseValidateCodeForm.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/settings/Profile/Contacts/ValidateCodeForm/BaseValidateCodeForm.js b/src/pages/settings/Profile/Contacts/ValidateCodeForm/BaseValidateCodeForm.js index e336c3430f6..973a0475846 100644 --- a/src/pages/settings/Profile/Contacts/ValidateCodeForm/BaseValidateCodeForm.js +++ b/src/pages/settings/Profile/Contacts/ValidateCodeForm/BaseValidateCodeForm.js @@ -92,7 +92,7 @@ function BaseValidateCodeForm(props) { return; } User.clearContactMethodErrors(props.contactMethod, 'validateLogin'); - + // contactMethod is not added as a dependency since it does not change between renders // eslint-disable-next-line react-hooks/exhaustive-deps }, []);