From a84fe13a8c419f3d2d6ff3b577b431629b8e3e07 Mon Sep 17 00:00:00 2001
From: Wes <wesbillman@users.noreply.github.com>
Date: Thu, 16 Jul 2026 11:02:38 -0600
Subject: [PATCH] fix(desktop): restore default community join option (#1969)

Signed-off-by: Wes <wesbillman@users.noreply.github.com>
Co-authored-by: Pinky <44b8e82baa6e0e254e0208d68f335c283c94e7b78dd1fa10d5a49d3f13dd0435@sprout-oss.stage.blox.sqprod.co>
---
 .../features/communities/ui/WelcomeSetup.tsx  | 16 +++++++++++
 desktop/tests/e2e/onboarding.spec.ts          | 28 +++++++++++++++++++
 2 files changed, 44 insertions(+)

diff --git a/desktop/src/features/communities/ui/WelcomeSetup.tsx b/desktop/src/features/communities/ui/WelcomeSetup.tsx
index c3df86c72a..6e8a52c09e 100644
--- a/desktop/src/features/communities/ui/WelcomeSetup.tsx
+++ b/desktop/src/features/communities/ui/WelcomeSetup.tsx
@@ -64,6 +64,13 @@ export function WelcomeSetup({
     setPage(nextPage);
   }, []);
 
+  const handleDefaultCommunity = React.useCallback(() => {
+    communityOnboarding.start({
+      source: "first-community",
+      relayUrl: defaultRelayUrl,
+    });
+  }, [communityOnboarding, defaultRelayUrl]);
+
   const handleInviteRedeem = React.useCallback(
     (relayWsUrl: string, code: string) => {
       communityOnboarding.start({
@@ -107,6 +114,15 @@ export function WelcomeSetup({
               Choose how you want to get started.
             </p>
             <div className="mt-8 flex w-full flex-col gap-3">
+              {isLocalDevRelayUrl(defaultRelayUrl) ? null : (
+                <Button
+                  className="h-10 w-full"
+                  onClick={handleDefaultCommunity}
+                  type="button"
+                >
+                  Join default community
+                </Button>
+              )}
               <Button
                 className="h-10 w-full"
                 onClick={() => showPage("join")}
diff --git a/desktop/tests/e2e/onboarding.spec.ts b/desktop/tests/e2e/onboarding.spec.ts
index 0e7ab1f5c1..d786aef14e 100644
--- a/desktop/tests/e2e/onboarding.spec.ts
+++ b/desktop/tests/e2e/onboarding.spec.ts
@@ -580,6 +580,9 @@ test("first-community choices expose npub and invite input", async ({
   });
   await page.goto("/");
 
+  await expect(
+    page.getByRole("button", { name: "Join default community" }),
+  ).toBeVisible();
   await expect(
     page.getByRole("button", { name: "Join a community" }),
   ).toBeVisible();
@@ -620,6 +623,31 @@ test("first-community choices expose npub and invite input", async ({
   await expect(page.getByTestId("invite-redeem-input")).toBeVisible();
 });
 
+test("first-community hides the default option for localhost", async ({
+  page,
+}) => {
+  await seedActiveIdentity(page, BLANK_TYLER_IDENTITY);
+  await page.addInitScript((pubkey) => {
+    window.localStorage.setItem(
+      `buzz-machine-onboarding-complete.v2:${pubkey}`,
+      "true",
+    );
+  }, BLANK_TYLER_IDENTITY.pubkey);
+  await installMockBridge(page, undefined, {
+    relayWsUrl: "ws://localhost:3000",
+    skipOnboardingSeed: true,
+    skipCommunitySeed: true,
+  });
+  await page.goto("/");
+
+  await expect(
+    page.getByRole("button", { name: "Join default community" }),
+  ).toHaveCount(0);
+  await expect(
+    page.getByRole("button", { name: "Join a community" }),
+  ).toBeVisible();
+});
+
 test("identity fallback text does not count as a real onboarding name", async ({
   page,
 }) => {