From 2ecf46d1cf4fc6426898ebeae933ab0348b67c9d Mon Sep 17 00:00:00 2001
From: MarioVicente <mario.vicente@icloud.com>
Date: Tue, 7 Oct 2025 08:12:15 -0600
Subject: [PATCH] Fixing merge conflict in App.jsx

---
 src/App.jsx | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/App.jsx b/src/App.jsx
index 6013dbc..696af97 100644
--- a/src/App.jsx
+++ b/src/App.jsx
@@ -14,7 +14,17 @@ const FinanceTracker = () => {
 
   // --- Sesión Entra ID (SWA) ---
   const [user, setUser] = useState(null);
-  useEffect(() => { getUser().then(setUser); }, []);
+  const [loadingUser, setLoadingUser] = useState(true);
+  useEffect(() => {
+  (async () => {
+    try { setUser(await getUser()); }
+    finally { setLoadingUser(false); }
+  })();
+  }, []);
+
+  if (loadingUser) {
+  return <div className="p-6">Cargando sesión…</div>;
+  }
 
   // Si no hay usuario aún, puedes mostrar un loader o un botón de login.
   // Con tu staticwebapp.config.json ya configurado, SWA redirige 401→/login,