feat: remove splash screen for unauthenticated users

Sahil-Connect · Dec 17, 2024 · 922f481 · 922f481
1 parent e6d72bd
commit 922f481
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/apps/admin/src/Layout/layout.tsx b/apps/admin/src/Layout/layout.tsx
@@ -102,7 +102,7 @@ export default function Layout({ children, ...props }: LayoutProps) {
     router.replace(router.asPath);
   };
 
-  if (!session) {
+  if (!session && !isAuthRoute) {
     return <SplashScreen />;
   }
 
@@ -114,7 +114,7 @@ export default function Layout({ children, ...props }: LayoutProps) {
           header="Admin"
           onSignOut={onSignOut}
           user={{
-            ...session.user,
+            ...session?.user,
             ...currentUser
           }}
         />

diff --git a/apps/agent/src/Layout/layout.tsx b/apps/agent/src/Layout/layout.tsx
@@ -91,7 +91,7 @@ export default function Layout({ children, ...props }: LayoutProps) {
   };
 
 
-  if (!session) {
+  if (!session && !isAuthRoute) {
     return <SplashScreen />;
   }
   return (
@@ -102,7 +102,7 @@ export default function Layout({ children, ...props }: LayoutProps) {
         header="Agent"
         onSignOut={onSignOut}
         user={{
-          ...session.user,
+          ...session?.user,
           ...currentUser
         }}
       />

diff --git a/apps/client/src/Layout/layout.tsx b/apps/client/src/Layout/layout.tsx
@@ -105,7 +105,7 @@ export default function Layout({ children, ...props }: LayoutProps) {
   };
 
 
-  if (!session) {
+  if (!session && !isAuthRoute) {
     return <SplashScreen />;
   }
   return (
@@ -116,7 +116,7 @@ export default function Layout({ children, ...props }: LayoutProps) {
         header="Client"
         onSignOut={onSignOut}
         user={{
-          ...session.user,
+          ...session?.user,
           ...currentUser
         }}
       />

diff --git a/apps/courier/src/Layout/layout.tsx b/apps/courier/src/Layout/layout.tsx
@@ -106,7 +106,7 @@ export default function Layout({ children, ...props }: LayoutProps) {
   };
 
 
-  if (!session) {
+  if (!session && !isAuthRoute) {
     return <SplashScreen />;
   }
   return (
@@ -117,7 +117,7 @@ export default function Layout({ children, ...props }: LayoutProps) {
         header="Courier"
         onSignOut={onSignOut}
         user={{
-          ...session.user,
+          ...session?.user,
           ...currentUser
         }}
       />