[ES-1982] Fixed the issue where the validation was failed to change t…

…he text on language change. (#456) Signed-off-by: GurukiranP <[email protected]>
mosip · Dec 10, 2024 · 10a2e84 · 10a2e84
1 parent fe161b7
commit 10a2e84
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 4 deletions.
diff --git a/signup-ui/src/pages/ResetPasswordPage/ResetPasswordPage.tsx b/signup-ui/src/pages/ResetPasswordPage/ResetPasswordPage.tsx
@@ -105,8 +105,18 @@ export const ResetPasswordPage = ({ settings }: ResetPasswordPageProps) => {
   useEffect(() => {
     const oldLanguage = previousLanguage;
     setPreviousLanguage(i18n.language);
-    if (oldLanguage !== i18n.language && document.querySelector('input[aria-invalid="true"][name^="fullname"]')) {
-      methods.trigger(); // Manually trigger validation whenever the language changes
+
+    if (oldLanguage !== i18n.language) {
+      const invalidInput = Array.from(
+        document.querySelectorAll('input[aria-invalid="true"]')
+      ).find((input) => {
+        const name = input.getAttribute("name") ?? ""; // Default to an empty string if null
+        return /fullname/i.test(name);
+      });
+
+      if (invalidInput) {
+        methods.trigger(); // Manually trigger validation whenever the language changes
+      }
     }
   }, [i18n.language]); // Trigger whenever `i18n.language` changes
 

diff --git a/signup-ui/src/pages/SignUpPage/SignUpPage.tsx b/signup-ui/src/pages/SignUpPage/SignUpPage.tsx
@@ -116,8 +116,17 @@ export const SignUpPage = ({ settings }: SignUpPageProps) => {
   useEffect(() => {
     const oldLanguage = previousLanguage;
     setPreviousLanguage(i18n.language);
-    if (oldLanguage !== i18n.language && document.querySelector('input[aria-invalid="true"][name^="fullname"]')) {
-      methods.trigger(); // Manually trigger validation whenever the language changes
+    if (oldLanguage !== i18n.language) {
+      const invalidInput = Array.from(
+        document.querySelectorAll('input[aria-invalid="true"]')
+      ).find((input) => {
+        const name = input.getAttribute('name') ?? ''; // Default to an empty string if null
+        return /fullname/i.test(name);
+      });
+
+      if (invalidInput) {
+        methods.trigger(); // Manually trigger validation whenever the language changes
+      }
     }
   }, [i18n.language]); // Trigger whenever `i18n.language` changes