From 6e726601d25d1870bc8825a813fe94f97dd4cdeb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9rgio=20Rafael=20Siqueira?=
 <osergiosiqueira@gmail.com>
Date: Sun, 30 Nov 2025 20:24:26 -0300
Subject: [PATCH] fix loading

---
 .../app/routes/settings/emails/primary.tsx    | 39 ++++++++++++-------
 .../app/routes/settings/layout.tsx            |  3 +-
 2 files changed, 26 insertions(+), 16 deletions(-)

diff --git a/apps/saladeaula.digital/app/routes/settings/emails/primary.tsx b/apps/saladeaula.digital/app/routes/settings/emails/primary.tsx
index 245e318..376d0c8 100644
--- a/apps/saladeaula.digital/app/routes/settings/emails/primary.tsx
+++ b/apps/saladeaula.digital/app/routes/settings/emails/primary.tsx
@@ -22,6 +22,7 @@ import type { User } from '@repo/ui/routes/users/data'
 
 import type { Email } from './data'
 import { type Schema, formSchema } from './add'
+import { Spinner } from '@repo/ui/components/ui/spinner'
 
 export function Primary({ items = [] }: { items: Email[] }) {
   const emails = items.map((props) => {
@@ -59,7 +60,7 @@ export function Primary({ items = [] }: { items: Email[] }) {
     { manual: true }
   )
 
-  const { handleSubmit, register } = useForm({
+  const { handleSubmit, register, formState } = useForm({
     resolver: zodResolver(formSchema)
   })
 
@@ -83,19 +84,29 @@ export function Primary({ items = [] }: { items: Email[] }) {
         </CardDescription>
       </CardHeader>
       <CardContent>
-        <form onSubmit={handleSubmit(onSubmit)} className="flex gap-1.5">
-          <NativeSelect defaultValue={primary?.email} {...register('email')}>
-            {emails.map(({ email }) => {
-              return (
-                <NativeSelectOption key={email} value={email}>
-                  {email}
-                </NativeSelectOption>
-              )
-            })}
-          </NativeSelect>
-          <Button type="submit" className="overflow-hidden cursor-pointer">
-            Alterar email
-          </Button>
+        <form onSubmit={handleSubmit(onSubmit)}>
+          <fieldset disabled={formState.isSubmitting} className="flex gap-1.5">
+            <NativeSelect defaultValue={primary?.email} {...register('email')}>
+              {emails.map(({ email }) => {
+                return (
+                  <NativeSelectOption key={email} value={email}>
+                    {email}
+                  </NativeSelectOption>
+                )
+              })}
+            </NativeSelect>
+            <Button
+              type="submit"
+              className="overflow-hidden cursor-pointer relative"
+            >
+              {formState.isSubmitting && (
+                <div className="absolute inset-0 bg-lime-500 flex items-center justify-center">
+                  <Spinner />
+                </div>
+              )}
+              Alterar email
+            </Button>
+          </fieldset>
         </form>
       </CardContent>
     </Card>
diff --git a/apps/saladeaula.digital/app/routes/settings/layout.tsx b/apps/saladeaula.digital/app/routes/settings/layout.tsx
index 8d5c64a..3355100 100644
--- a/apps/saladeaula.digital/app/routes/settings/layout.tsx
+++ b/apps/saladeaula.digital/app/routes/settings/layout.tsx
@@ -38,8 +38,7 @@ export async function loader({ request, context }: Route.LoaderArgs) {
     throw new Response(null, { status: r.status })
   }
 
-  const data = await r.json()
-  return { data }
+  return { data: await r.json() }
 }
 
 export function shouldRevalidate({}: ShouldRevalidateFunctionArgs) {