From c5d116b33435108f3c67f3cabd0f87a0f3791830 Mon Sep 17 00:00:00 2001
From: Usman Baig <mubaig@pm.me>
Date: Thu, 22 Jan 2026 18:40:56 +0100
Subject: [PATCH] refactor(loading): enhance LoadingOverlay integration in
 HomePage and AuthCallback for consistent loading experience

---
 app/auth/callback/page.tsx | 4 ++--
 app/page.tsx               | 4 ++--
 lib/auth/context.tsx       | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/auth/callback/page.tsx b/app/auth/callback/page.tsx
index fe8dbc4..f8c3fc0 100644
--- a/app/auth/callback/page.tsx
+++ b/app/auth/callback/page.tsx
@@ -110,12 +110,12 @@ function AuthCallbackContent() {
   }
 
   // * Use standard Pulse loading screen to make transition to Home seamless
-  return null
+  return <LoadingOverlay portal={false} />
 }
 
 export default function AuthCallback() {
   return (
-    <Suspense fallback={null}>
+    <Suspense fallback={<LoadingOverlay portal={false} />}>
       <AuthCallbackContent />
     </Suspense>
   )
diff --git a/app/page.tsx b/app/page.tsx
index e2be69a..3d58d0a 100644
--- a/app/page.tsx
+++ b/app/page.tsx
@@ -12,7 +12,7 @@ export default function HomePage() {
   const { user, loading } = useAuth()
 
   if (loading) {
-    return null
+    return <LoadingOverlay logoSrc="/ciphera_icon_no_margins.png" title="Pulse" portal={false} />
   }
 
   if (!user) {
@@ -91,7 +91,7 @@ export default function HomePage() {
 
   // * Wait for organization context before rendering SiteList to avoid "Organization Required" flash
   if (user && !user.org_id) {
-    return null
+    return <LoadingOverlay logoSrc="/ciphera_icon_no_margins.png" title="Pulse" portal={false} />
   }
 
   return (
diff --git a/lib/auth/context.tsx b/lib/auth/context.tsx
index 49426bf..3837d7c 100644
--- a/lib/auth/context.tsx
+++ b/lib/auth/context.tsx
@@ -154,7 +154,7 @@ export function AuthProvider({ children }: { children: React.ReactNode }) {
 
   return (
     <AuthContext.Provider value={{ user, loading, login, logout, refresh, refreshSession }}>
-      {(loading || isLoggingOut) && <LoadingOverlay logoSrc="/ciphera_icon_no_margins.png" title="Pulse" />}
+      {isLoggingOut && <LoadingOverlay logoSrc="/ciphera_icon_no_margins.png" title="Pulse" />}
       {children}
     </AuthContext.Provider>
   )