chore: reset state in form

GaloyMoney · Nov 10, 2023 · 2ef06b3 · 2ef06b3
1 parent b16773d
commit 2ef06b3
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 16 deletions.
diff --git a/apps/consent/app/components/phone-auth/phone-auth-form.tsx b/apps/consent/app/components/phone-auth/phone-auth-form.tsx
@@ -41,21 +41,6 @@ interface AuthFormProps {
   countryCodes: any
 }
 
-const initialState: GetCaptchaChallengeResponse = {
-  error: false,
-  message: null,
-  responsePayload: {
-    id: null,
-    challenge: null,
-    formData: {
-      login_challenge: null,
-      phone: null,
-      remember: false,
-      channel: null,
-    },
-  },
-}
-
 const PhoneAuthForm: React.FC<AuthFormProps> = ({
   login_challenge,
   countryCodes,
@@ -64,12 +49,18 @@ const PhoneAuthForm: React.FC<AuthFormProps> = ({
   const [phoneNumber, setPhoneNumber] = useState<string>("")
   const [state, formAction] = useFormState<GetCaptchaChallengeResponse, FormData>(
     getCaptchaChallenge,
-    initialState,
+    {
+      error: false,
+      message: null,
+      responsePayload: null,
+    },
   )
 
   if (state.error) {
     toast.error(state.message)
     state.error = false
+    state.message = null
+    state.responsePayload = null
   }
 
   const handlePhoneNumberChange = (value?: E164Number | undefined) => {
@@ -111,6 +102,9 @@ const PhoneAuthForm: React.FC<AuthFormProps> = ({
       toast.error("Invalid Captcha Request")
     }
 
+    state.error = false
+    state.message = null
+    state.responsePayload = null
     return null
   }
 

diff --git a/apps/consent/app/login/email-login-form.tsx b/apps/consent/app/login/email-login-form.tsx
@@ -31,6 +31,8 @@ const EmailLoginForm = ({ login_challenge }: LoginProps) => {
   if (state.error) {
     toast.error(state.message)
     state.error = false
+    state.message = null
+    state.responsePayload = null
   }
 
   return (

diff --git a/apps/consent/app/login/verification/form.tsx b/apps/consent/app/login/verification/form.tsx
@@ -46,12 +46,16 @@ const VerificationForm: React.FC<VerificationFormProps> = ({
 
   if (stateVerificationCode.error) {
     toast.error(stateVerificationCode.message)
+    stateVerificationCode.error = false
     stateVerificationCode.message = null
+    stateVerificationCode.responsePayload = null
   }
 
   if (stateTwoFA.error) {
     toast.error(stateTwoFA.message)
+    stateTwoFA.error = false
     stateTwoFA.message = null
+    stateTwoFA.responsePayload = null
   }
 
   return (