Skip to content

fix(app): stop the join forms from asking for an invite link a tailnet directory can't make #674

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
iamnbutler merged 1 commit into from
Oct 22, 2026
Merged

fix(app): stop the join forms from asking for an invite link a tailnet directory can't make #674

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions apps/app/src/directory-settings.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) => {
Expand Down
9 changes: 5 additions & 4 deletions apps/app/src/team-setup.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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")} />
Expand Down Expand Up @@ -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) => {
Expand Down