Skip to content

Commit 3835c40

Browse files
committed
fix: prevent infinite loading when entering onboarding without login
- Split merged loading condition into separate hydration and login checks - Ensure non-logged-in users see LoginScreen instead of infinite loading - Improve loading state logic clarity and maintainability
1 parent 2870bbd commit 3835c40

File tree

1 file changed

+7
-2
lines changed

1 file changed

+7
-2
lines changed

app/onboarding/page.tsx

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -96,8 +96,13 @@ export default function OnboardingPage() {
9696
}
9797
};
9898

99-
// hydration이 완료되지 않았거나 로그인된 상태에서 처리 중이면 스피너 표시
100-
if (!hasHydrated || (hasHydrated && isLoggedIn && (isLoading || (!goals && !error) || (goals && goals.length > 0)))) {
99+
// hydration이 완료되지 않았으면 스피너 표시
100+
if (!hasHydrated) {
101+
return <Loading className="min-h-screen bg-background-normal" />;
102+
}
103+
104+
// 로그인된 상태에서 처리 중이면 스피너 표시
105+
if (hasHydrated && isLoggedIn && (isLoading || (!goals && !error) || (goals && goals.length > 0))) {
101106
return <Loading className="min-h-screen bg-background-normal" />;
102107
}
103108

0 commit comments

Comments
 (0)