From 4ae53cb25f110d9b0f1ad403f66411428b646987 Mon Sep 17 00:00:00 2001 From: Sanjaiyan Parthipan Date: Mon, 16 Nov 2026 23:30:51 +0530 Subject: [PATCH 1/4] fix: Remove unnecessary setSubmitting and setLoading calls in forms --- src/view/moles/AddAccountForm.tsx | 1 - src/view/moles/ProfileForm.tsx | 1 - 2 files changed, 2 deletions(-) diff --git a/src/view/moles/AddAccountForm.tsx b/src/view/moles/AddAccountForm.tsx index d55bcac..6cabe4c 100644 --- a/src/view/moles/AddAccountForm.tsx +++ b/src/view/moles/AddAccountForm.tsx @@ -164,7 +164,6 @@ const AddAccountForm = ({ (error as Error).message || "Registration failed. Please try again.", ); } - setSubmitting(false); }; const isBusy = loading || isSubmitting; diff --git a/src/view/moles/ProfileForm.tsx b/src/view/moles/ProfileForm.tsx index 41f07f6..44bb058 100644 --- a/src/view/moles/ProfileForm.tsx +++ b/src/view/moles/ProfileForm.tsx @@ -196,7 +196,6 @@ function ProfileForm({ user, onSubmit }) { } catch (err: any) { setError(err.message || "Failed to update profile"); } - setLoading(false); }; return ( From b947ad0629abac95f5201a58b897395721076502 Mon Sep 17 00:00:00 2001 From: Sanjaiyan Parthipan Date: Mon, 16 Nov 2026 23:51:47 +0530 Subject: [PATCH 2/4] refactor: Update forms to handle loading state with isSubmitting from react-hook-form --- src/view/moles/LoginForm.tsx | 8 ++- src/view/moles/PasswordResetForm.tsx | 102 +++++++++++++++------------ src/view/moles/RegistrationForm.tsx | 8 ++- 3 files changed, 67 insertions(+), 51 deletions(-) diff --git a/src/view/moles/LoginForm.tsx b/src/view/moles/LoginForm.tsx index 1b1e760..662311e 100644 --- a/src/view/moles/LoginForm.tsx +++ b/src/view/moles/LoginForm.tsx @@ -29,7 +29,7 @@ const LoginForm = ({ onSubmit, loading = false }) => { const { register, handleSubmit, - formState: { errors }, + formState: { errors, isSubmitting }, control, } = useForm({ resolver: zodResolver(loginSchema), @@ -44,6 +44,8 @@ const LoginForm = ({ onSubmit, loading = false }) => { } }; + const isLoading = loading || isSubmitting; + return ( { fullWidth variant="contained" color="primary" - disabled={loading} - startIcon={loading ? : null} + disabled={isLoading} + startIcon={isLoading ? : null} sx={{ mt: 3, mb: 2 }} > Sign In diff --git a/src/view/moles/PasswordResetForm.tsx b/src/view/moles/PasswordResetForm.tsx index d4c1ebd..773db85 100644 --- a/src/view/moles/PasswordResetForm.tsx +++ b/src/view/moles/PasswordResetForm.tsx @@ -1,55 +1,57 @@ import { Box, Button, CircularProgress, TextField } from "@mui/material"; import { useState } from "react"; +import { Controller, useForm } from "react-hook-form"; import ErrorMessage from "../atoms/ErrorMessage"; const PasswordResetForm = ({ onSubmit, loading = false }) => { - const [email, setEmail] = useState(""); - const [error, setError] = useState(""); - const [formError, setFormError] = useState(""); const [successMessage, setSuccessMessage] = useState(""); - const validateEmail = () => { - if (!email) { - setError("Email is required"); - return false; - } - if (!/\S+@\S+\.\S+/.test(email)) { - setError("Email is invalid"); - return false; - } - setError(""); - return true; - }; + const { + control, + handleSubmit, + setError, + clearErrors, + reset, + formState: { errors, isSubmitting }, + } = useForm({ + defaultValues: { + email: "", + }, + }); - const handleSubmit = async (e) => { - e.preventDefault(); - setFormError(""); - setSuccessMessage(""); + const isLoading = loading || isSubmitting; + const formError = errors.root?.serverError?.message; - if (!validateEmail()) { - return; - } + const handleFormSubmit = async ({ email }) => { + setSuccessMessage(""); try { await onSubmit({ email }); + reset(); setSuccessMessage( "Password reset instructions have been sent to your email address.", ); - setEmail(""); } catch (error) { - setFormError( - error.message || "Failed to send reset email. Please try again.", - ); + setError("root.serverError", { + type: "server", + message: + error?.message || "Failed to send reset email. Please try again.", + }); } }; return ( - + setSuccessMessage(""))} + sx={{ mt: 1, width: "100%" }} + > {formError && ( setFormError("")} + onDismiss={() => clearErrors("root.serverError")} /> )} @@ -64,34 +66,44 @@ const PasswordResetForm = ({ onSubmit, loading = false }) => { )} - { - setEmail(e.target.value); - if (error) setError(""); + ( + + )} /> + x ); }; diff --git a/src/view/moles/RegistrationForm.tsx b/src/view/moles/RegistrationForm.tsx index 6a00c20..18cf7b1 100644 --- a/src/view/moles/RegistrationForm.tsx +++ b/src/view/moles/RegistrationForm.tsx @@ -98,7 +98,7 @@ const RegistrationForm = ({ onSubmit, loading = false }) => { handleSubmit, setValue, control, - formState: { errors }, + formState: { errors, isSubmitting }, } = useForm({ resolver: zodResolver(registrationSchema), defaultValues: { @@ -131,6 +131,8 @@ const RegistrationForm = ({ onSubmit, loading = false }) => { } }; + const isLoading = loading || isSubmitting; + return ( { x + ); };