From 55e805548101e34b1a8e873a0309ca7082adf423 Mon Sep 17 00:00:00 2001
From: iamnbutler <iamnbutler@github.com>
Date: Thu, 22 Oct 2026 18:23:51 -0400
Subject: [PATCH] fix(app): stop the join forms from asking for an invite link
 a tailnet directory can't make

---
 apps/app/src/directory-settings.tsx | 4 ++--
 apps/app/src/team-setup.tsx         | 9 +++++----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/apps/app/src/directory-settings.tsx b/apps/app/src/directory-settings.tsx
index 1ee35203..9c0f4920 100644
--- a/apps/app/src/directory-settings.tsx
+++ b/apps/app/src/directory-settings.tsx
@@ -302,8 +302,8 @@ function TeamDirectory(
 									autoFocus
 									type="url"
 									spellCheck={false}
-									aria-label="Invite link or directory URL"
-									placeholder="Invite link or https://ace-directory.example.workers.dev"
+									aria-label="Directory URL or invite link"
+									placeholder="Directory URL or invite link"
 									value={url}
 									disabled={!!action.busy}
 									onChange={(event) => {
diff --git a/apps/app/src/team-setup.tsx b/apps/app/src/team-setup.tsx
index 77fbd8fd..13b87632 100644
--- a/apps/app/src/team-setup.tsx
+++ b/apps/app/src/team-setup.tsx
@@ -133,7 +133,8 @@ export function TeamSetup({ github, invite, inviting, onClose }: {
 								onSelect={() => setStarting(false)}
 								title="Join your team"
 							>
-								Someone already set Ace up. Use the invite link they sent you.
+								Someone already set Ace up. Ask them to let you in, or use the directory URL they
+								sent you.
 							</Choice>
 						</div>
 						<Footer
@@ -150,7 +151,7 @@ export function TeamSetup({ github, invite, inviting, onClose }: {
 							title="Join your team"
 							description={invite
 								? "Check the directory before you join: it lists your channels for everyone who has this link."
-								: "Paste the invite link your teammate sent you, or enter the directory URL and team secret."}
+								: "Ask a teammate on your tailnet to let you in, or enter their directory URL. A deployed directory also needs the team secret, which its invite link carries."}
 						/>
 						{!invite && <Nearby onJoined={onClose} />}
 						<Join initial={invite} onJoined={onClose} back={() => setStep("fork")} />
@@ -570,8 +571,8 @@ function Join({ initial, deployed, onJoined, back }: {
 				<Input
 					{...RAW}
 					type="url"
-					aria-label="Invite link or directory URL"
-					placeholder="Invite link or directory URL"
+					aria-label="Directory URL or invite link"
+					placeholder="Directory URL or invite link"
 					value={url}
 					disabled={busy}
 					onChange={(event) => {