fix(studio): flash of sign in for join organization page (#41283)

The join organization page flashes the sign in screen briefly because it
does not check for loading status. Fixed so it goes directly from
loading skeleton to join confirmation view.

Resolves FE-2220
This commit is contained in:
Charis authored and GitHub committed 2025-12-11 20:14:07 +00:00
1 parent 41ed95bde4
commit 39e21ebef6
1 file changed
+5 -4
@@ -3,7 +3,7 @@ import Link from 'next/link'
import { useRouter } from 'next/router'
import { toast } from 'sonner'
import { useParams } from 'common'
import { useIsLoggedIn, useParams } from 'common'
import { useOrganizationAcceptInvitationMutation } from 'data/organization-members/organization-invitation-accept-mutation'
import { useOrganizationInvitationTokenQuery } from 'data/organization-members/organization-invitation-token-query'
import { useIsFeatureEnabled } from 'hooks/misc/useIsFeatureEnabled'
@@ -14,7 +14,8 @@ import { OrganizationInviteError } from './OrganizationInviteError'
export const OrganizationInvite = () => {
const router = useRouter()
const { profile } = useProfile()
const isLoggedIn = useIsLoggedIn()
const { profile, isLoading: isLoadingProfile } = useProfile()
const { slug, token } = useParams()
const isSignUpEnabled = useIsFeatureEnabled('dashboard_auth:sign_up')
@@ -67,7 +68,7 @@ export const OrganizationInvite = () => {
'md:w-[400px]'
)}
>
{!profile ? (
{!isLoggedIn || (!profile && !isLoadingProfile) ? (
<>
<Admonition
showIcon={false}
@@ -86,7 +87,7 @@ export const OrganizationInvite = () => {
)}
</div>
</>
) : isLoadingInvitation ? (
) : isLoadingProfile || isLoadingInvitation ? (
<div className="p-5">
<GenericSkeletonLoader />
</div>