From eae1c04fbed2e49fb15eb4c67742217d6b7c3498 Mon Sep 17 00:00:00 2001 From: DS Boyce <260543580+ds-boyce@users.noreply.github.com> Date: Thu, 11 Jun 2026 09:45:08 -0700 Subject: [PATCH] Fix Rescind request button (#10869) --- src/components/intents/GroupChatJoinDialog.tsx | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/components/intents/GroupChatJoinDialog.tsx b/src/components/intents/GroupChatJoinDialog.tsx index f9d6b11047..e3c20b0e59 100644 --- a/src/components/intents/GroupChatJoinDialog.tsx +++ b/src/components/intents/GroupChatJoinDialog.tsx @@ -271,9 +271,10 @@ function GroupChatJoinDialogContent({code}: {code?: string}) { ) } - const convoId = joinLinkPreview.convo?.id + const convoId = joinLinkPreview.convoId const isFollowing = joinLinkPreview.owner.viewer?.following ?? false - const hasRequested = !convoId && joinLinkPreview.viewer?.requestedAt != null + const hasRequested = + !joinLinkPreview.convo && joinLinkPreview.viewer?.requestedAt != null let canJoin = true let ButtonIconImage = isJoinPending || isWithdrawPending ? Loader : JoinIcon @@ -417,7 +418,7 @@ function GroupChatJoinDialogContent({code}: {code?: string}) { - {convoId ? ( + {joinLinkPreview.convo ? (