Skip to content

fix(invite): hold the loading state until the stored token resolves #6488

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
waleedlatif1 merged 1 commit into from
Aug 10, 2026
+3 −2
Merged

fix(invite): hold the loading state until the stored token resolves #6488

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
5 changes: 3 additions & 2 deletions apps/sim/app/invite/[id]/invite.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -286,7 +286,8 @@ export default function Invite({ registrationDisabled }: InviteProps) {
const isNewUser = searchParams.get('new') === 'true'
const errorReason = searchParams.get('error')
const urlError = errorReason ? getInviteError(errorReason) : null
const tokenFromQuery = searchParams.get('token')
/** `|| null` so an empty `?token=` falls back to storage rather than querying with ''. */
const tokenFromQuery = searchParams.get('token') || null
/**
* Derived during render so the invitation query key is correct on the first
* commit; an effect-set token refetches under a second key whenever the
Expand All @@ -308,7 +309,7 @@ export default function Invite({ registrationDisabled }: InviteProps) {
})
const invitation = invitationQuery.data?.invitation ?? null
const joinPreview = invitationQuery.data?.joinPreview ?? null
const isLoading = Boolean(session?.user) && invitationQuery.isPending
const isLoading = Boolean(session?.user) && (!isTokenResolved || invitationQuery.isPending)

const fetchError = invitationQuery.error
? getInviteError(
Expand Down
Loading