feat(Login): update localization strings and improve error handling f…

…or two-factor authentication
dhis2 · Feb 28, 2025 · 4f28c6c · 4f28c6c
1 parent d679c5f
commit 4f28c6c
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 9 deletions.
diff --git a/i18n/en.pot b/i18n/en.pot
@@ -5,8 +5,8 @@ msgstr ""
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
-"POT-Creation-Date: 2025-02-26T10:01:36.204Z\n"
-"PO-Revision-Date: 2025-02-26T10:01:36.204Z\n"
+"POT-Creation-Date: 2025-02-28T12:18:41.444Z\n"
+"PO-Revision-Date: 2025-02-28T12:18:41.444Z\n"
 
 msgid "Please confirm that you are not a robot by checking the checkbox."
 msgstr "Please confirm that you are not a robot by checking the checkbox."
@@ -179,6 +179,9 @@ msgstr "Something went wrong"
 msgid "Incorrect username or password"
 msgstr "Incorrect username or password"
 
+msgid "Authentication code is required"
+msgstr "Authentication code is required"
+
 msgid "Incorrect authentication code"
 msgstr "Incorrect authentication code"
 
@@ -201,11 +204,11 @@ msgid "Enter the code from your two-factor authentication app to log in."
 msgstr "Enter the code from your two-factor authentication app to log in."
 
 msgid ""
-"We have sent you an email with your authentication code, enter it below to "
-"log in"
+"We have sent you an email with your authentication code. Enter it below to "
+"log in."
 msgstr ""
-"We have sent you an email with your authentication code, enter it below to "
-"log in"
+"We have sent you an email with your authentication code. Enter it below to "
+"log in."
 
 msgid "Username or email"
 msgstr "Username or email"

diff --git a/src/pages/login/InnerLoginForm.js b/src/pages/login/InnerLoginForm.js
@@ -27,11 +27,14 @@ export const InnerLoginForm = ({
         return () => clearTimeout(timer)
     }, [])
 
-    const resendCode = async() => {
+    const resendCode = async () => {
         setIsResetButtonPressed(true)
         setIsResendDisabled(true)
         form.change('twoFA', undefined)
 
+        // Wait for the state update to complete
+        await new Promise((resolve) => setTimeout(resolve, 0))
+
         await handleSubmit()
         setTimeout(() => {
             setIsResendDisabled(false)

diff --git a/src/pages/login/LoginErrors.js b/src/pages/login/LoginErrors.js
@@ -120,7 +120,7 @@ LoginErrors.propTypes = {
     lngs: PropTypes.arrayOf(PropTypes.string),
     passwordExpired: PropTypes.bool,
     passwordResetEnabled: PropTypes.bool,
-    twoFAIncorrect: PropTypes.bool,
     twoFAError: PropTypes.bool,
+    twoFAIncorrect: PropTypes.bool,
     unknownStatus: PropTypes.bool,
 }
diff --git a/src/pages/login/LoginForm.js b/src/pages/login/LoginForm.js
@@ -17,7 +17,6 @@ export const LoginForm = ({
     passwordResetEnabled,
     unknownStatus,
     error,
-    setError,
     loading,
     setFormUserName,
     lngs,
@@ -31,6 +30,7 @@ export const LoginForm = ({
     }
 
     const handleLogin = (values) => {
+        console.log(isResetButtonPressed, 'isResetButtonPressed')
         setFormSubmitted(true)
         if (
             !checkIsLoginFormValid(values) ||