Resolve merge conflicts

2026-05-11 12:52:33 -04:00
parent 9b1a4cc0e2 0f770742ef
commit 31940eaa78
8 changed files with 227 additions and 130 deletions
--- a/frontend/src/App.jsx
+++ b/frontend/src/App.jsx
@@ -11,7 +11,9 @@ import AlertHistory from "./pages/alertHistory/AlertHistory";
 import Account from "./pages/user_account/Account";

 export default function App() {
-  const { currentUser, isSubscribed } = useAuth();
+  const { currentUser, isSubscribed, loading } = useAuth();
+
+  if (loading) return null;

  if (!currentUser) {
    return (