diff --git a/web/modals/threads/members/members-modal.react.js b/web/modals/threads/members/members-modal.react.js --- a/web/modals/threads/members/members-modal.react.js +++ b/web/modals/threads/members/members-modal.react.js @@ -6,12 +6,12 @@ import { threadInfoSelector } from 'lib/selectors/thread-selectors.js'; import { userStoreSearchIndex } from 'lib/selectors/user-selectors.js'; import { - memberHasAdminPowers, - memberIsAdmin, + roleIsAdminRole, threadHasPermission, } from 'lib/shared/thread-utils.js'; import { threadPermissions } from 'lib/types/thread-permission-types.js'; import { type RelativeMemberInfo } from 'lib/types/thread-types.js'; +import { useRolesFromCommunityThreadInfo } from 'lib/utils/role-utils.js'; import { AddMembersModal } from './add-members-modal.react.js'; import ThreadMembersList from './members-list.react.js'; @@ -47,13 +47,14 @@ ), [searchText.length, threadMembersNotFiltered, userIDs], ); + + const roles = useRolesFromCommunityThreadInfo(threadInfo, allMembers); const adminMembers = React.useMemo( () => - allMembers.filter( - (member: RelativeMemberInfo) => - memberIsAdmin(member, threadInfo) || memberHasAdminPowers(member), + allMembers.filter((member: RelativeMemberInfo) => + roleIsAdminRole(roles.get(member.id)), ), - [allMembers, threadInfo], + [allMembers, roles], ); const allUsersTab = React.useMemo(