From 6c53dbe2b078731efe712f187c38f877dd79707d Mon Sep 17 00:00:00 2001
From: Peter Steinberger <steipete@gmail.com>
Date: Wed, 5 Aug 2026 07:35:31 -0700
Subject: [PATCH] fix(ui): observe the active service worker after asset
 refresh (#119622)

---
 ui/src/e2e/service-worker-update.e2e.test.ts | 16 +---------------
 1 file changed, 1 insertion(+), 15 deletions(-)

diff --git a/ui/src/e2e/service-worker-update.e2e.test.ts b/ui/src/e2e/service-worker-update.e2e.test.ts
index d98999581010..9bd923a1a9ff 100644
--- a/ui/src/e2e/service-worker-update.e2e.test.ts
+++ b/ui/src/e2e/service-worker-update.e2e.test.ts
@@ -115,27 +115,13 @@ async function fetchControlledAsset(
   assetPath: string,
 ): Promise<{ controllerState: string | null; sha256: string }> {
   return page.evaluate(async (relativePath) => {
-    const controller = navigator.serviceWorker.controller;
-    if (controller && controller.state !== "activated") {
-      await new Promise<void>((resolve) => {
-        controller.addEventListener(
-          "statechange",
-          () => {
-            if (controller.state === "activated") {
-              resolve();
-            }
-          },
-          { once: true },
-        );
-      });
-    }
     const response = await fetch(new URL(relativePath, window.location.href));
     if (!response.ok) {
       throw new Error(`Build asset request failed with HTTP ${response.status}`);
     }
     const digest = await crypto.subtle.digest("SHA-256", await response.arrayBuffer());
     return {
-      controllerState: controller?.state ?? null,
+      controllerState: navigator.serviceWorker.controller?.state ?? null,
       sha256: [...new Uint8Array(digest)]
         .map((byte) => byte.toString(16).padStart(2, "0"))
         .join(""),