diff --git a/src/views/groups/views/members/GroupMembersView.tsx b/src/views/groups/views/members/GroupMembersView.tsx index cbf08364..0ab607e9 100644 --- a/src/views/groups/views/members/GroupMembersView.tsx +++ b/src/views/groups/views/members/GroupMembersView.tsx @@ -115,7 +115,7 @@ export const GroupMembersView: FC = props => } searchMembers(pageData.pageIndex); - }, [ pageData ]); + }, [ pageData, searchMembers ]); const acceptMembership = useCallback((member) => { @@ -124,7 +124,7 @@ export const GroupMembersView: FC = props => SendMessageHook(new GroupMembershipAcceptComposer(pageData.groupId, member.id)); searchMembers(pageData.pageIndex); } - }, [ pageData ]); + }, [ pageData, searchMembers ]); const removeMemberOrDeclineMembership = useCallback((member) => { @@ -138,66 +138,68 @@ export const GroupMembersView: FC = props => setRemovingMemberName(member.name); SendMessageHook(new GroupConfirmRemoveMemberComposer(pageData.groupId, member.id)); } - }, [ pageData ]); + }, [ pageData, searchMembers ]); - if(!pageData) return null; + if(!groupId) return null; return ( - - -
-
- + + { pageData && <> + +
+
+ +
+
+ setSearchQuery(e.target.value) } onBlur={ () => searchMembers(pageData.pageIndex) } onKeyDown={ onKeyDown } /> + +
-
- setSearchQuery(e.target.value) } onBlur={ () => searchMembers(pageData.pageIndex) } onKeyDown={ onKeyDown } /> - -
-
-
- { pageData.result.map((member, index) => - { - return ( -
-
-
{ GetUserProfile(member.id) } }> - -
-
-
{ GetUserProfile(member.id) } }>{ member.name }
- { member.rank !== GroupRank.REQUESTED &&
{ LocalizeText('group.members.since', ['date'], [member.joinedAt]) }
} -
-
-
- toggleAdmin(member) } /> +
+ { pageData.result.map((member, index) => + { + return ( +
+
+
{ GetUserProfile(member.id) } }> + +
+
+
{ GetUserProfile(member.id) } }>{ member.name }
+ { member.rank !== GroupRank.REQUESTED &&
{ LocalizeText('group.members.since', ['date'], [member.joinedAt]) }
} +
+
+
+ toggleAdmin(member) } /> +
+ { member.rank === GroupRank.REQUESTED &&
+ acceptMembership(member) } /> +
} + { member.rank !== GroupRank.OWNER && pageData.admin && member.id !== GetSessionDataManager().userId &&
+ removeMemberOrDeclineMembership(member) } /> +
}
- { member.rank === GroupRank.REQUESTED &&
- acceptMembership(member) } /> -
} - { member.rank !== GroupRank.OWNER && pageData.admin && member.id !== GetSessionDataManager().userId &&
- removeMemberOrDeclineMembership(member) } /> -
}
-
- ); - }) } -
-
-
- + ); + }) }
-
{ LocalizeText('group.members.pageinfo', ['amount', 'page', 'totalPages'], [pageData.totalMembersCount.toString(), (pageData.pageIndex + 1).toString(), totalPages.toString()]) }
-
- +
+
+ +
+
{ LocalizeText('group.members.pageinfo', ['amount', 'page', 'totalPages'], [pageData.totalMembersCount.toString(), (pageData.pageIndex + 1).toString(), totalPages.toString()]) }
+
+ +
-
- + + } ); };