From 31d9c6bd9c88978a83604858454cb7f8f8b49308 Mon Sep 17 00:00:00 2001
From: Coracle-Bot <npub1klq6260@nostr.local>
Date: Mon, 21 Sep 2026 19:48:16 +0000
Subject: [PATCH] Wait for the page to settle before prompting to join a space
 (#607)

---
 e2e/USER_STORIES.md                      |  2 ++
 e2e/specs/spaces.spec.ts                 | 42 ++++++++++++++++++++++--
 src/routes/spaces/[relay]/+layout.svelte |  6 +++-
 3 files changed, 47 insertions(+), 3 deletions(-)

diff --git a/e2e/USER_STORIES.md b/e2e/USER_STORIES.md
index c2469757..d46cc1a9 100644
--- a/e2e/USER_STORIES.md
+++ b/e2e/USER_STORIES.md
@@ -170,6 +170,8 @@ Acceptance:
 - An unparseable link leaves the join button disabled and shows no preview.
 - Navigating directly to the url of a space she hasn't joined opens the same
   join prompt automatically, and going back leaves her un-joined.
+- That prompt stays up once the space has finished opening, however slowly the
+  page it opens on arrives.
 
 ### US-011 — Request access when a space turns you away
 
diff --git a/e2e/specs/spaces.spec.ts b/e2e/specs/spaces.spec.ts
index 0552e2eb..5b086465 100644
--- a/e2e/specs/spaces.spec.ts
+++ b/e2e/specs/spaces.spec.ts
@@ -1,8 +1,8 @@
-import {DAY, HOUR, WEEK, sortBy} from "@welshman/lib"
+import {DAY, HOUR, WEEK, sleep, sortBy} from "@welshman/lib"
 import {ROOMS} from "@welshman/util"
 import type {Page} from "@playwright/test"
 import type {SeededSpace} from "../harness"
-import {expect, readCachedEvents, roomPath, spacePath, test, users} from "../harness"
+import {expect, pathPattern, readCachedEvents, roomPath, spacePath, test, users} from "../harness"
 
 // The space this user's room list names first, read from the copy on disk the app restores itself
 // from. Room lists reach indexeddb in three-second batches with nothing in the ui to say when one
@@ -161,6 +161,44 @@ test("US-010 join a space from an invite link", async ({seed, as}) => {
   await expect(page).toHaveURL(/\/spaces\/other\.test/)
 })
 
+test("US-010 a direct link's join prompt outlives the entry redirect", async ({seed, as}) => {
+  const scenario = await seed(({relay, user}) => {
+    const space = relay("space")
+    const other = relay("other")
+
+    space.room("general", {name: "General"})
+    other.room("lounge", {name: "Lounge"})
+    space.join(user.alice, "general")
+  })
+
+  const other = scenario.space("other")
+  const page = await as(users.alice, "/")
+
+  // A space's own path redirects to the page it opens on, and a modal raised while that navigation
+  // is in flight is overwritten when it lands. Holding the entry page's module back is what puts
+  // the prompt inside the redirect here; on a phone the chunk arriving late does it by itself.
+  let held = 0
+
+  await page.context().route(
+    url => url.pathname.endsWith("/about/+page.svelte"),
+    async route => {
+      held++
+
+      await sleep(15000)
+      await route.continue()
+    },
+  )
+
+  await page.goto(spacePath(other.url))
+
+  await expect(page.getByRole("button", {name: "Join Space"})).toBeEnabled({timeout: 60000})
+  await expect(page).toHaveURL(pathPattern(spacePath(other.url) + "/about"))
+  await expect(page.getByRole("button", {name: "Join Space"})).toBeVisible()
+
+  // A page that stops asking for that module is a spec that no longer covers the race.
+  expect(held).toBeGreaterThan(0)
+})
+
 test("US-011 request access when a space turns you away", async ({seed, as}) => {
   const scenario = await seed(({relay, user}) => {
     const closed = relay("closed")
diff --git a/src/routes/spaces/[relay]/+layout.svelte b/src/routes/spaces/[relay]/+layout.svelte
index 387b09dd..4aa3ed56 100644
--- a/src/routes/spaces/[relay]/+layout.svelte
+++ b/src/routes/spaces/[relay]/+layout.svelte
@@ -5,6 +5,7 @@
 
 <script lang="ts">
   import {page} from "$app/stores"
+  import {navigating} from "$app/state"
   import type {Maybe} from "@welshman/lib"
   import {once} from "@welshman/lib"
   import {normalizeRelayUrl} from "@welshman/util"
@@ -76,8 +77,11 @@
 
   // Watch for relay errors and notify the user
   // Direct links skip Discover — prompt to join when relay is not in the user's space list.
+  // A modal owns a history entry, and a navigation landing after one opens takes that entry over.
+  // The redirect from a space's own path to its entry page is one, so nothing opens until the page
+  // has settled.
   $effect(() => {
-    if (getModal()) {
+    if (getModal() || navigating.to) {
       return
     }