From 145b72236969011f0a43309f5261aa2cd98f3d41 Mon Sep 17 00:00:00 2001
From: William Grant <willmgrant@gmail.com>
Date: Fri, 26 Jul 2024 14:25:50 +1000
Subject: [PATCH] feat: fixed member layout in update group modals

---
 stylesheets/_session.scss                         | 13 -------------
 ts/components/dialog/UpdateGroupMembersDialog.tsx |  6 +++---
 2 files changed, 3 insertions(+), 16 deletions(-)

diff --git a/stylesheets/_session.scss b/stylesheets/_session.scss
index 7f7ffbc60..4257c99b0 100644
--- a/stylesheets/_session.scss
+++ b/stylesheets/_session.scss
@@ -208,11 +208,6 @@ label {
     }
   }
 
-  .group-member-list__selection {
-    overflow-y: auto;
-    width: 100%;
-  }
-
   &__centered {
     display: flex;
     flex-direction: column;
@@ -422,14 +417,6 @@ input {
   }
 }
 
-.group-member-list {
-  &__selection {
-    height: 100%;
-    display: flex;
-    flex-direction: column;
-  }
-}
-
 .module-message__text {
   white-space: pre-wrap;
 }
diff --git a/ts/components/dialog/UpdateGroupMembersDialog.tsx b/ts/components/dialog/UpdateGroupMembersDialog.tsx
index a08342a11..c45afbaa5 100644
--- a/ts/components/dialog/UpdateGroupMembersDialog.tsx
+++ b/ts/components/dialog/UpdateGroupMembersDialog.tsx
@@ -53,11 +53,11 @@ const ClassicMemberList = (props: {
 
         return (
           <MemberListItem
+            key={`classic-member-list-${member}`}
             pubkey={member}
             isSelected={isSelected}
             onSelect={onSelect}
             onUnselect={onUnselect}
-            key={member}
             isAdmin={isAdmin}
             disableBg={true}
           />
@@ -84,11 +84,11 @@ const ZombiesList = ({ convoId }: { convoId: string }) => {
     const isSelected = weAreAdmin || false; // && !member.checkmarked;
     return (
       <MemberListItem
+        key={`zombie-list-${zombie}`}
         isSelected={isSelected}
         onSelect={onZombieClicked}
         onUnselect={onZombieClicked}
         isZombie={true}
-        key={zombie}
         pubkey={zombie}
       />
     );
@@ -233,7 +233,7 @@ export const UpdateGroupMembersDialog = (props: Props) => {
 
   return (
     <SessionWrapperModal title={titleText} onClose={closeDialog}>
-      <StyledClassicMemberList className="group-member-list__selection">
+      <StyledClassicMemberList className="contact-selection-list">
         <ClassicMemberList
           convoId={conversationId}
           onSelect={onAdd}