From 16fb52b40b8c571a667a9bf7c331bea21dd8b556 Mon Sep 17 00:00:00 2001
From: Samuel Newman <mozzius@protonmail.com>
Date: Mon, 8 Jun 2026 15:33:06 +0300
Subject: [PATCH] hoist remove prompt out of conditional

confirming the prompt optimistically drops the row, which would unmount
the prompt mid-close and race the dismiss animation on native. only the
button needs gating behind showRemoveButton.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
---
 .../Messages/ConversationSettings/Member.tsx  | 33 ++++++++++---------
 1 file changed, 17 insertions(+), 16 deletions(-)

diff --git a/src/screens/Messages/ConversationSettings/Member.tsx b/src/screens/Messages/ConversationSettings/Member.tsx
index 6897dafc58..20cc0fee52 100644
--- a/src/screens/Messages/ConversationSettings/Member.tsx
+++ b/src/screens/Messages/ConversationSettings/Member.tsx
@@ -153,22 +153,15 @@ export function Member({
           </ProfileCard.Outer>
         </ProfileCard.Link>
         {showRemoveButton ? (
-          <>
-            <Button
-              label={l`Remove ${displayName} from this group chat`}
-              size="tiny"
-              color="negative_subtle"
-              onPress={() => removeMemberPrompt.open()}>
-              <ButtonText>
-                <Trans>Remove</Trans>
-              </ButtonText>
-            </Button>
-            <RemoveMemberPrompt
-              control={removeMemberPrompt}
-              displayName={displayName}
-              onConfirm={() => removeMembers({members: [profile.did]})}
-            />
-          </>
+          <Button
+            label={l`Remove ${displayName} from this group chat`}
+            size="tiny"
+            color="negative_subtle"
+            onPress={() => removeMemberPrompt.open()}>
+            <ButtonText>
+              <Trans>Remove</Trans>
+            </ButtonText>
+          </Button>
         ) : isSelf || isFollowing || isBlockedOrBlocking(profile) ? null : (
           <SimpleInlineLinkText
             label={l`Follow ${displayName}`}
@@ -179,6 +172,14 @@ export function Member({
         )}
         {statusBadge}
       </View>
+      {/* Mounted outside the showRemoveButton conditional: confirming the
+          prompt optimistically drops this row, so gating the prompt on the
+          button would unmount it mid-close and race the dismiss animation. */}
+      <RemoveMemberPrompt
+        control={removeMemberPrompt}
+        displayName={displayName}
+        onConfirm={() => removeMembers({members: [profile.did]})}
+      />
     </SubtleHoverWrapper>
   )
 }