fix: qa feedback - fixed background for group member list in create group overlay

pull/2522/head
William Grant 3 years ago
parent 69d5e2ea41
commit 2a0396d522

@ -15,11 +15,16 @@ import useKey from 'react-use/lib/useKey';
import { useSet } from '../../hooks/useSet'; import { useSet } from '../../hooks/useSet';
import { getConversationController } from '../../session/conversations'; import { getConversationController } from '../../session/conversations';
import { initiateClosedGroupUpdate } from '../../session/group/closed-group'; import { initiateClosedGroupUpdate } from '../../session/group/closed-group';
import styled from 'styled-components';
type Props = { type Props = {
conversationId: string; conversationId: string;
}; };
const StyledClassicMemberList = styled.div`
max-height: 240px;
`;
/** /**
* Admins are always put first in the list of group members. * Admins are always put first in the list of group members.
* Also, admins have a little crown on their avatar. * Also, admins have a little crown on their avatar.
@ -54,6 +59,7 @@ const ClassicMemberList = (props: {
onUnselect={onUnselect} onUnselect={onUnselect}
key={member} key={member}
isAdmin={isAdmin} isAdmin={isAdmin}
disableBg={true}
/> />
); );
})} })}
@ -229,14 +235,14 @@ export const UpdateGroupMembersDialog = (props: Props) => {
return ( return (
<SessionWrapperModal title={titleText} onClose={closeDialog}> <SessionWrapperModal title={titleText} onClose={closeDialog}>
<div className="group-member-list__selection"> <StyledClassicMemberList className="group-member-list__selection">
<ClassicMemberList <ClassicMemberList
convoId={conversationId} convoId={conversationId}
onSelect={onAdd} onSelect={onAdd}
onUnselect={onRemove} onUnselect={onRemove}
selectedMembers={membersToKeepWithUpdate} selectedMembers={membersToKeepWithUpdate}
/> />
</div> </StyledClassicMemberList>
<ZombiesList convoId={conversationId} /> <ZombiesList convoId={conversationId} />
{showNoMembersMessage && <p>{window.i18n('noMembersInThisGroup')}</p>} {showNoMembersMessage && <p>{window.i18n('noMembersInThisGroup')}</p>}

@ -34,6 +34,16 @@ const StyledGroupMemberListContainer = styled.div`
overflow-y: auto; overflow-y: auto;
border-top: 1px solid var(--border-color); border-top: 1px solid var(--border-color);
border-bottom: 1px solid var(--border-color); border-bottom: 1px solid var(--border-color);
&::-webkit-scrollbar-track {
background-color: var(--background-secondary-color);
}
`;
const StyledGroupMemberList = styled.div`
button {
background-color: var(--background-secondary-color);
}
`; `;
const NoContacts = () => { const NoContacts = () => {
@ -119,7 +129,7 @@ export const OverlayClosedGroup = () => {
{noContactsForClosedGroup ? ( {noContactsForClosedGroup ? (
<NoContacts /> <NoContacts />
) : ( ) : (
<div className="group-member-list__selection"> <StyledGroupMemberList className="group-member-list__selection">
{contactsToRender.map((memberPubkey: string) => ( {contactsToRender.map((memberPubkey: string) => (
<MemberListItem <MemberListItem
pubkey={memberPubkey} pubkey={memberPubkey}
@ -127,9 +137,10 @@ export const OverlayClosedGroup = () => {
key={memberPubkey} key={memberPubkey}
onSelect={addToSelected} onSelect={addToSelected}
onUnselect={removeFromSelected} onUnselect={removeFromSelected}
disableBg={true}
/> />
))} ))}
</div> </StyledGroupMemberList>
)} )}
</StyledGroupMemberListContainer> </StyledGroupMemberListContainer>

Loading…
Cancel
Save