fix: improve form submission logic and loading state handling

ogticrd · Feb 5, 2025 · b03884f · b03884f
1 parent 1acb349
commit b03884f
Showing 1 changed file with 13 additions and 6 deletions.
diff --git a/src/app/[lang]/register/form.tsx b/src/app/[lang]/register/form.tsx
@@ -97,16 +97,23 @@ export function Form({ cedula, flow, returnTo }: FormProps) {
       <form
         action={action}
         onSubmit={async (e) => {
-          setLoading(true);
-          if (!isValid) {
-            e.preventDefault();
+          e.preventDefault();
 
+          if (!isValid) {
             await trigger();
-            return false;
+            setLoading(false);
+            return;
           }
 
-          checkPwned(password).then(setIsPwned);
-          e.currentTarget.requestSubmit();
+          setLoading(true);
+          const pwned = await checkPwned(password);
+          setIsPwned(pwned);
+
+          if (!pwned) {
+            (e.target as HTMLFormElement).submit();
+          } else {
+            setLoading(false);
+          }
         }}
       >
         <input type="hidden" name="flow" value={flow} />