diff --git a/packages/web/src/components/CommentBox.tsx b/packages/web/src/components/CommentBox.tsx index 2ff4a597..5700c5b4 100644 --- a/packages/web/src/components/CommentBox.tsx +++ b/packages/web/src/components/CommentBox.tsx @@ -233,7 +233,7 @@ export function CommentBox({ username }: CommentBoxProps) { {/* Comments list */}
{!comments ? ( -
Loading...
+
) : comments.length === 0 ? (
No messages yet. Be the first to say hi! @@ -275,7 +275,7 @@ export function CommentBox({ username }: CommentBoxProps) { {/* Input area */}
{sessionLoading ? ( -
Loading...
+
) : isAuthenticated ? (
{/* Image preview */} @@ -442,11 +442,7 @@ function CommentImage({ image }: { image: FileStream }) { }, [image]) if (!url) { - return ( -
- Loading... -
- ) + return
} return ( diff --git a/packages/web/src/components/flowglad/regularPlanButton.tsx b/packages/web/src/components/flowglad/regularPlanButton.tsx index 49db65be..f9ab79ae 100644 --- a/packages/web/src/components/flowglad/regularPlanButton.tsx +++ b/packages/web/src/components/flowglad/regularPlanButton.tsx @@ -4,11 +4,7 @@ export function RegularPlanButton() { const { createCheckoutSession, loaded, errors } = useBilling() if (!loaded || !createCheckoutSession) { - return ( - - ) + return
- {loading && ( - - Loading… - - )}
- ) + return
} if (error || !snapshot) { diff --git a/packages/web/src/routes/canvas.index.tsx b/packages/web/src/routes/canvas.index.tsx index b9af8f15..1f4499b8 100644 --- a/packages/web/src/routes/canvas.index.tsx +++ b/packages/web/src/routes/canvas.index.tsx @@ -87,11 +87,6 @@ function CanvasProjectsPage() {

- {loading ? ( - - Loading… - - ) : null}
- ) + return
} const canvasItems: GlideCanvasItem[] = canvasList?.$isLoaded ? [...canvasList] : [] diff --git a/packages/web/src/routes/index.tsx b/packages/web/src/routes/index.tsx index 502c0f54..730f8038 100644 --- a/packages/web/src/routes/index.tsx +++ b/packages/web/src/routes/index.tsx @@ -95,11 +95,7 @@ function Dashboard() { } if (!me.$isLoaded || !root?.$isLoaded) { - return ( -
-

Loading...

-
- ) + return
} return ( @@ -290,11 +286,7 @@ function HomePage() { const { data: session, isPending } = authClient.useSession() if (isPending) { - return ( -
-

Loading...

-
- ) + return
} if (session?.user) { diff --git a/packages/web/src/routes/sessions.tsx b/packages/web/src/routes/sessions.tsx index f38ec4e2..79d255c8 100644 --- a/packages/web/src/routes/sessions.tsx +++ b/packages/web/src/routes/sessions.tsx @@ -57,11 +57,7 @@ function SessionsPage() { const [importJson, setImportJson] = useState("") if (authPending) { - return ( -
-

Loading...

-
- ) + return
} if (!session?.user) { @@ -83,11 +79,7 @@ function SessionsPage() { const root = me.$isLoaded ? me.root : null if (!me.$isLoaded || !root?.$isLoaded) { - return ( -
-

Loading Jazz...

-
- ) + return
} // Initialize browserSessions if not present diff --git a/packages/web/src/routes/streams.tsx b/packages/web/src/routes/streams.tsx index 9e1efbd3..a81716c4 100644 --- a/packages/web/src/routes/streams.tsx +++ b/packages/web/src/routes/streams.tsx @@ -153,11 +153,7 @@ function StreamsPage() { } if (!me.$isLoaded || !root?.$isLoaded) { - return ( -
-

Loading Jazz...

-
- ) + return
} const recordings: StreamRecording[] = recordingsList?.$isLoaded diff --git a/packages/web/src/routes/urls.tsx b/packages/web/src/routes/urls.tsx index 839445fa..422667e4 100644 --- a/packages/web/src/routes/urls.tsx +++ b/packages/web/src/routes/urls.tsx @@ -19,11 +19,7 @@ function UrlsPage() { const [isAdding, setIsAdding] = useState(false) if (authPending) { - return ( -
-

Loading...

-
- ) + return
} if (!session?.user) { @@ -46,11 +42,7 @@ function UrlsPage() { const urlList = root?.$isLoaded ? root.savedUrls : null if (!me.$isLoaded || !root?.$isLoaded) { - return ( -
-

Loading Jazz...

-
- ) + return
} const savedUrls: SavedUrl[] = urlList?.$isLoaded ? [...urlList] : []