Skip to content

Commit 0cf41cf

Browse files
authored
Revert "fix: Regular members listed as owners in channel members list" (#38798)
1 parent 1f81108 commit 0cf41cf

2 files changed

Lines changed: 7 additions & 14 deletions

File tree

.changeset/roles-display-fix.md

Lines changed: 0 additions & 5 deletions
This file was deleted.

apps/meteor/client/views/room/contextualBar/RoomMembers/RoomMembers.tsx

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -89,11 +89,11 @@ const RoomMembers = ({
8989

9090
const useRealName = useSetting('UI_Use_Real_Name', false);
9191

92-
const { counts, titles, sortedMembers } = useMemo(() => {
93-
const owners: RoomMemberUser[] = [];
94-
const leaders: RoomMemberUser[] = [];
95-
const moderators: RoomMemberUser[] = [];
96-
const normalMembers: RoomMemberUser[] = [];
92+
const { counts, titles } = useMemo(() => {
93+
const owners: RoomMember[] = [];
94+
const leaders: RoomMember[] = [];
95+
const moderators: RoomMember[] = [];
96+
const normalMembers: RoomMember[] = [];
9797

9898
members.forEach((member) => {
9999
if (member.roles?.includes('owner')) {
@@ -130,9 +130,7 @@ const RoomMembers = ({
130130
titles.push(<MembersListDivider title='Members' count={normalMembers.length} />);
131131
}
132132

133-
const sortedMembers = [...owners, ...leaders, ...moderators, ...normalMembers];
134-
135-
return { counts, titles, sortedMembers };
133+
return { counts, titles };
136134
}, [members]);
137135

138136
return (
@@ -190,7 +188,7 @@ const RoomMembers = ({
190188
// eslint-disable-next-line react/no-multi-comp
191189
components={{ Footer: () => <InfiniteListAnchor loadMore={loadMoreMembers} /> }}
192190
itemContent={(index): ReactElement => (
193-
<RowComponent useRealName={useRealName} data={itemData} user={sortedMembers[index]} index={index} reload={reload} />
191+
<RowComponent useRealName={useRealName} data={itemData} user={members[index]} index={index} reload={reload} />
194192
)}
195193
/>
196194
</VirtualizedScrollbars>

0 commit comments

Comments
 (0)