Merge branch 'dev' into l10n_dev

weareinreach · May 3, 2024 · abb7e08 · abb7e08
2 parents 0e90c0c + 3779331
commit abb7e08
Showing 1 changed file with 12 additions and 1 deletion.
diff --git a/packages/ui/components/core/UserAvatar.tsx b/packages/ui/components/core/UserAvatar.tsx
@@ -65,7 +65,18 @@ export const UserAvatar = ({
 			}
 		}
 	}
-	const showLoadingState = loading || status === 'loading' || router.isFallback
+
+	const areWeStillLoading = () => {
+		if (loading || status === 'loading') {
+			return true
+		}
+		if (typeof window !== 'undefined') {
+			return router.isFallback
+		}
+		return false
+	}
+
+	const showLoadingState = areWeStillLoading()
 	if (showLoadingState) {
 		return (
 			<Group className={classes.group}>