wait for service worker activation before accessing pushManager

Co-Authored-By: Claude Opus 4.6 <[email protected]>

1 files changed, 9 insertions, 0 deletions

diff --git a/src/routes/(app)/settings/account/+page.svelte b/src/routes/(app)/settings/account/+page.svelte
index 86d6c7f4..61450b18 100644
--- a/src/routes/(app)/settings/account/+page.svelte
+++ b/src/routes/(app)/settings/account/+page.svelte
@@ -35,6 +35,15 @@
       if (!navigator?.serviceWorker) { pmReady = true; return; }
       let reg = await navigator.serviceWorker.getRegistration();
       if (!reg) reg = await navigator.serviceWorker.register("/service-worker.js");
+      if (reg && !reg.active) {
+        await new Promise<void>((resolve) => {
+          const sw = reg.installing || reg.waiting;
+          if (!sw) { resolve(); return; }
+          sw.addEventListener("statechange", () => {
+            if (sw.state === "activated") resolve();
+          });
+        });
+      }
       pm = reg?.pushManager;
       if (!pm) { pmReady = true; return; }