From 5ce098009024fe8e20de22848fb76cbcd4581cae Mon Sep 17 00:00:00 2001
From: Tiago Yamamoto <japa@rede5.com.br>
Date: Mon, 23 Feb 2026 13:13:57 -0600
Subject: [PATCH] fix: move loading check after useEffect to prevent infinite
 loading

---
 frontend/src/app/dashboard/settings/page.tsx | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/frontend/src/app/dashboard/settings/page.tsx b/frontend/src/app/dashboard/settings/page.tsx
index bcb780c..488ec30 100644
--- a/frontend/src/app/dashboard/settings/page.tsx
+++ b/frontend/src/app/dashboard/settings/page.tsx
@@ -128,12 +128,6 @@ export default function SettingsPage() {
         }
     }
 
-
-
-    if (loading) {
-        return <div className="flex justify-center p-8"><Loader2 className="animate-spin" /></div>
-    }
-
     // Predefined schemas for known services (Copied from CredentialsPage)
     const schemas: Record<string, { label: string, fields: { key: string, label: string, type?: string }[] }> = {
         stripe: {
@@ -413,6 +407,10 @@ export default function SettingsPage() {
         init()
     }, [])
 
+    if (loading) {
+        return <div className="flex justify-center p-8"><Loader2 className="animate-spin" /></div>
+    }
+
     return (
         <div className="space-y-6">
             {/* Header ... */}