Skip to content

Commit c4c301e

Browse files

File tree

3 files changed

+33
-31
lines changed

3 files changed

+33
-31
lines changed

src/modules/ChannelSettings/components/ChannelSettingsUI/channel-settings-ui.scss

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -57,9 +57,6 @@
5757
padding: 12px 22px 10px 56px;
5858
@include themed() {
5959
border-top: 1px solid t(on-bg-4);
60-
&:last-child {
61-
border-bottom: 1px solid t(on-bg-4);
62-
}
6360
}
6461
&:focus {
6562
outline: none;
@@ -71,7 +68,8 @@
7168

7269
.sendbird-channel-settings__panel-item__leave-channel {
7370
@include themed() {
74-
border-top: 0;
71+
border-top: 1px solid t(on-bg-4);
72+
border-bottom: 1px solid t(on-bg-4);
7573
}
7674
}
7775

src/modules/ChannelSettings/components/ModerationPanel/MemberList.tsx

Lines changed: 30 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ export const MemberList = ({
3434
const { state: { channel, forceUpdateUI } } = useChannelSettings();
3535
const { stringSet } = useContext(LocalizationContext);
3636

37+
const isOperator = channel.myRole === Role.OPERATOR;
3738
const refreshList = useCallback(() => {
3839
if (!channel) {
3940
setMembers([]);
@@ -60,35 +61,37 @@ export const MemberList = ({
6061
channel,
6162
size: 'small',
6263
avatarSize: '24px',
63-
renderListItemMenu: (props) => (
64-
<UserListItemMenu {...props}
65-
onToggleOperatorState={({ newStatus: isOperator }) => {
66-
const newMembers = [...members];
67-
for (const newMember of newMembers) {
68-
if (newMember.userId === member.userId) {
69-
newMember.role = isOperator ? Role.OPERATOR : Role.NONE;
70-
break;
64+
renderListItemMenu: isOperator
65+
? (props) => (
66+
<UserListItemMenu {...props}
67+
onToggleOperatorState={({ newStatus: isOperator }) => {
68+
const newMembers = [...members];
69+
for (const newMember of newMembers) {
70+
if (newMember.userId === member.userId) {
71+
newMember.role = isOperator ? Role.OPERATOR : Role.NONE;
72+
break;
73+
}
7174
}
72-
}
73-
setMembers(newMembers);
74-
}}
75-
onToggleMuteState={({ newStatus: isMuted }) => {
76-
const newMembers = [...members];
77-
for (const newMember of newMembers) {
78-
if (newMember.userId === member.userId) {
79-
newMember.isMuted = isMuted;
80-
break;
75+
setMembers(newMembers);
76+
}}
77+
onToggleMuteState={({ newStatus: isMuted }) => {
78+
const newMembers = [...members];
79+
for (const newMember of newMembers) {
80+
if (newMember.userId === member.userId) {
81+
newMember.isMuted = isMuted;
82+
break;
83+
}
8184
}
82-
}
83-
setMembers(newMembers);
84-
}}
85-
onToggleBanState={() => {
86-
setMembers(members.filter(({ userId }) => {
87-
return userId !== member.userId;
88-
}));
89-
}}
90-
/>
91-
),
85+
setMembers(newMembers);
86+
}}
87+
onToggleBanState={() => {
88+
setMembers(members.filter(({ userId }) => {
89+
return userId !== member.userId;
90+
}));
91+
}}
92+
/>
93+
)
94+
: () => <></>,
9295
})
9396
}
9497
</React.Fragment>

src/ui/MessageInput/index.scss

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
font-style: normal;
1616
line-height: 1.43;
1717
max-height: 92px;
18+
min-height: 58px;
1819
overflow-y: scroll;
1920
letter-spacing: normal;
2021
padding: 18px 64px 18px 16px;

0 commit comments

Comments
 (0)