Skip to content

Commit ff14e6d

Browse files
authored
fix(app): stop the join forms from asking for an invite link a tailnet directory can't make (#674)
1 parent c8177ef commit ff14e6d

2 files changed

Lines changed: 7 additions & 6 deletions

File tree

‎apps/app/src/directory-settings.tsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -302,8 +302,8 @@ function TeamDirectory(
302302
autoFocus
303303
type="url"
304304
spellCheck={false}
305-
aria-label="Invite link or directory URL"
306-
placeholder="Invite link or https://ace-directory.example.workers.dev"
305+
aria-label="Directory URL or invite link"
306+
placeholder="Directory URL or invite link"
307307
value={url}
308308
disabled={!!action.busy}
309309
onChange={(event) => {

‎apps/app/src/team-setup.tsx‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,8 @@ export function TeamSetup({ github, invite, inviting, onClose }: {
133133
onSelect={() => setStarting(false)}
134134
title="Join your team"
135135
>
136-
Someone already set Ace up. Use the invite link they sent you.
136+
Someone already set Ace up. Ask them to let you in, or use the directory URL they
137+
sent you.
137138
</Choice>
138139
</div>
139140
<Footer
@@ -150,7 +151,7 @@ export function TeamSetup({ github, invite, inviting, onClose }: {
150151
title="Join your team"
151152
description={invite
152153
? "Check the directory before you join: it lists your channels for everyone who has this link."
153-
: "Paste the invite link your teammate sent you, or enter the directory URL and team secret."}
154+
: "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."}
154155
/>
155156
{!invite && <Nearby onJoined={onClose} />}
156157
<Join initial={invite} onJoined={onClose} back={() => setStep("fork")} />
@@ -570,8 +571,8 @@ function Join({ initial, deployed, onJoined, back }: {
570571
<Input
571572
{...RAW}
572573
type="url"
573-
aria-label="Invite link or directory URL"
574-
placeholder="Invite link or directory URL"
574+
aria-label="Directory URL or invite link"
575+
placeholder="Directory URL or invite link"
575576
value={url}
576577
disabled={busy}
577578
onChange={(event) => {

0 commit comments

Comments
 (0)