From e43dbc955d7668fba4d2cc9064f5173ac3d1fd46 Mon Sep 17 00:00:00 2001
From: Samuel Newman <mozzius@protonmail.com>
Date: Thu, 4 Jun 2026 23:27:42 +0300
Subject: [PATCH] move dialog to inside conditional

---
 .../Messages/ConversationSettings/Member.tsx  | 30 ++++++++++---------
 1 file changed, 16 insertions(+), 14 deletions(-)

diff --git a/src/screens/Messages/ConversationSettings/Member.tsx b/src/screens/Messages/ConversationSettings/Member.tsx
index 3599edaff7..6897dafc58 100644
--- a/src/screens/Messages/ConversationSettings/Member.tsx
+++ b/src/screens/Messages/ConversationSettings/Member.tsx
@@ -153,15 +153,22 @@ 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>
+          <>
+            <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]})}
+            />
+          </>
         ) : isSelf || isFollowing || isBlockedOrBlocking(profile) ? null : (
           <SimpleInlineLinkText
             label={l`Follow ${displayName}`}
@@ -172,11 +179,6 @@ export function Member({
         )}
         {statusBadge}
       </View>
-      <RemoveMemberPrompt
-        control={removeMemberPrompt}
-        displayName={displayName}
-        onConfirm={() => removeMembers({members: [profile.did]})}
-      />
     </SubtleHoverWrapper>
   )
 }