From 3990d7bdcf4c808f7af7148fbb36b25f6965b5e6 Mon Sep 17 00:00:00 2001 From: vicrodh <103399283+vicrodh@users.noreply.github.com> Date: Sat, 7 Feb 2026 12:48:34 -0600 Subject: [PATCH] fix(updates): gate launch modals on session readiness decideLaunchModals() was racing activate_user_session() because setLoggedIn() triggers the $effect before the backend store opens. Preferences defaulted to showWhatsNewOnLaunch=true, ignoring the user's saved setting. Add sessionReady flag set after activate_user_session completes. The $effect now waits for session + home view before running. Also reset all update state on logout for clean re-login cycle. cc --- src/lib/services/updatesService.ts | 6 ++++++ src/lib/stores/updatesStore.ts | 7 +++++++ src/routes/+page.svelte | 13 ++++++++++++- 3 files changed, 25 insertions(+), 1 deletion(-) diff --git a/src/lib/services/updatesService.ts b/src/lib/services/updatesService.ts index fe2756530..c3cba014b 100644 --- a/src/lib/services/updatesService.ts +++ b/src/lib/services/updatesService.ts @@ -28,6 +28,12 @@ const DEV_FAKE_BODY_KEY = 'qbz-updates-dev-fake-body'; let sessionId = ''; let launchFlowStarted = false; +/** Reset launch flow state on logout so re-login can re-evaluate. */ +export function resetLaunchFlow(): void { + launchFlowStarted = false; + sessionId = ''; +} + function ensureSessionId(): string { if (sessionId) return sessionId; if (typeof window === 'undefined') { diff --git a/src/lib/stores/updatesStore.ts b/src/lib/stores/updatesStore.ts index 15919812d..de20804ea 100644 --- a/src/lib/stores/updatesStore.ts +++ b/src/lib/stores/updatesStore.ts @@ -51,6 +51,13 @@ export function getPreferences(): UpdatePreferences { return preferences; } +/** Reset store state on logout so re-login loads fresh preferences. */ +export function resetUpdatesStore(): void { + preferences = { checkOnLaunch: true, showWhatsNewOnLaunch: true }; + prefsLoaded = false; + notify(); +} + export function getCurrentVersion(): string { return currentVersion; } diff --git a/src/routes/+page.svelte b/src/routes/+page.svelte index e58566c67..4d71cee45 100644 --- a/src/routes/+page.svelte +++ b/src/routes/+page.svelte @@ -323,13 +323,14 @@ import KeyboardShortcutsModal from '$lib/components/KeyboardShortcutsModal.svelte'; import KeybindingsSettings from '$lib/components/KeybindingsSettings.svelte'; import type { ReleaseInfo } from '$lib/stores/updatesStore'; - import { refreshUpdatePreferences } from '$lib/stores/updatesStore'; + import { refreshUpdatePreferences, resetUpdatesStore } from '$lib/stores/updatesStore'; import { decideLaunchModals, disableUpdateChecks, ignoreReleaseVersion, markFlatpakWelcomeShown, openReleasePageAndAcknowledge, + resetLaunchFlow, } from '$lib/services/updatesService'; // Offline state @@ -367,6 +368,7 @@ let isWhatsNewModalOpen = $state(false); let isFlatpakWelcomeOpen = $state(false); let updatesLaunchTriggered = $state(false); + let sessionReady = $state(false); // Sequential modal queue: Flatpak → What's new → Update available let pendingWhatsNewRelease = $state(null); @@ -479,6 +481,7 @@ $effect(() => { if (updatesLaunchTriggered) return; if (activeView !== 'home') return; + if (!sessionReady) return; // Wait for activate_user_session to complete updatesLaunchTriggered = true; void runLaunchUpdateFlow(); }); @@ -2199,6 +2202,10 @@ } } + // Signal that per-user backend stores are ready — the launch update + // flow $effect gates on this to avoid reading default preferences + sessionReady = true; + // Restore Last.fm session now that backend session is active restoreLastfmSession(); @@ -2343,6 +2350,10 @@ // Clear session state await clearSession(); setLoggedOut(); + sessionReady = false; + updatesLaunchTriggered = false; + resetLaunchFlow(); + resetUpdatesStore(); currentTrack = null; isPlaying = false; showToast($t('toast.logoutSuccess'), 'info');