feat(LoginForm): add setError prop to handle error state and improve …

…resend code functionality
dhis2 · Feb 27, 2025 · d679c5f · d679c5f
1 parent 44bb0b9
commit d679c5f
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 5 deletions.
diff --git a/src/pages/login/InnerLoginForm.js b/src/pages/login/InnerLoginForm.js
@@ -17,24 +17,27 @@ export const InnerLoginForm = ({
     setFormUserName,
     setIsResetButtonPressed,
 }) => {
-    const [isResendDisabled, setIsResendDisabled] = useState(true)
+    const [isResendDisabled, setIsResendDisabled] = useState(false)
 
     useEffect(() => {
+        setIsResendDisabled(true)
         const timer = setTimeout(() => {
             setIsResendDisabled(false)
         }, 30000)
         return () => clearTimeout(timer)
     }, [])
 
-    const resendCode = () => {
+    const resendCode = async() => {
+        setIsResetButtonPressed(true)
         setIsResendDisabled(true)
         form.change('twoFA', undefined)
-        setIsResetButtonPressed(true)
-        handleSubmit()
+
+        await handleSubmit()
         setTimeout(() => {
             setIsResendDisabled(false)
         }, 30000)
     }
+
     const verify = () => {
         setIsResetButtonPressed(false)
         handleSubmit()
@@ -118,9 +121,14 @@ export const InnerLoginForm = ({
                         secondary
                         disabled={isResendDisabled || loading}
                         onClick={resendCode}
+                        loading={loading}
                     >
                         {isResendDisabled ? (
-                            <Tooltip content={'You must wait 30 seconds before requesting a new code'}>
+                            <Tooltip
+                                content={
+                                    'You must wait 30 seconds before requesting a new code'
+                                }
+                            >
                                 {i18n.t('Resend Code', { lngs })}
                             </Tooltip>
                         ) : (

diff --git a/src/pages/login/LoginForm.js b/src/pages/login/LoginForm.js
@@ -17,6 +17,7 @@ export const LoginForm = ({
     passwordResetEnabled,
     unknownStatus,
     error,
+    setError,
     loading,
     setFormUserName,
     lngs,