From 9cb5e54aeb71a0d7173402693a0c01fe9f46dacd Mon Sep 17 00:00:00 2001
From: Jon Staab <jstaab@protonmail.com>
Date: Mon, 6 Jul 2026 13:08:30 -0700
Subject: [PATCH] Avoid showing auth error before join dialog

---
 src/routes/spaces/[relay]/+layout.svelte | 24 +++++++++++++-----------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/src/routes/spaces/[relay]/+layout.svelte b/src/routes/spaces/[relay]/+layout.svelte
index 119d6fe7..d0f11f6c 100644
--- a/src/routes/spaces/[relay]/+layout.svelte
+++ b/src/routes/spaces/[relay]/+layout.svelte
@@ -41,18 +41,20 @@
   // Direct links skip Discover — prompt to join when relay is not in the user's space list.
   $effect(() => {
     if ($modal) return
-    if ($authError) return showAuthError()
-    if ($relaysPendingTrust.includes(url)) return showPendingTrust()
-    if ($userSpaceUrls.includes(url)) return
-    if (joinPrompted.has(url)) return
 
-    if (spacesLoaded) {
-      joinPrompted.add(url)
-      pushModal(SpaceJoin, {url})
-    } else {
-      loadUserGroupList([url]).then(() => {
-        spacesLoaded = true
-      })
+    if (!$userSpaceUrls.includes(url) && !joinPrompted.has(url)) {
+      if (spacesLoaded) {
+        joinPrompted.add(url)
+        pushModal(SpaceJoin, {url})
+      } else {
+        loadUserGroupList([url]).then(() => {
+          spacesLoaded = true
+        })
+      }
+    } else if ($authError) {
+      showAuthError()
+    } else if ($relaysPendingTrust.includes(url)) {
+      showPendingTrust()
     }
   })
 </script>