From 7b9c78b843c33ba631bb5bd1b71f2acd08500a73 Mon Sep 17 00:00:00 2001 From: Pascal Precht <445106+0x-r4bbit@users.noreply.github.com> Date: Fri, 23 Jun 2023 09:19:26 +0200 Subject: [PATCH] fix: don't allow admins to kick or ban admins This hides the action items to kick or ban users if they happen to be admins. There's also a change in status-go that prevents admins to kick or ban other admins that has to land first here: https://github.com/status-im/status-go/pull/3666 Closes #10936 --- .../Chat/panels/communities/CommunityMembersTabPanel.qml | 2 +- vendor/status-go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ui/app/AppLayouts/Chat/panels/communities/CommunityMembersTabPanel.qml b/ui/app/AppLayouts/Chat/panels/communities/CommunityMembersTabPanel.qml index b1949e98ec..a958ff4241 100644 --- a/ui/app/AppLayouts/Chat/panels/communities/CommunityMembersTabPanel.qml +++ b/ui/app/AppLayouts/Chat/panels/communities/CommunityMembersTabPanel.qml @@ -70,7 +70,7 @@ Item { readonly property bool itsMe: model.pubKey.toLowerCase() === userProfile.pubKey.toLowerCase() readonly property bool isHovered: memberItem.sensor.containsMouse - readonly property bool canBeBanned: !memberItem.itsMe && model.memberRole !== Constants.memberRole.owner + readonly property bool canBeBanned: !memberItem.itsMe && (model.memberRole !== Constants.memberRole.owner && model.memberRole !== Constants.memberRole.admin) statusListItemComponentsSlot.spacing: 16 statusListItemTitleArea.anchors.rightMargin: 0 diff --git a/vendor/status-go b/vendor/status-go index da2f155f2d..a8678575a7 160000 --- a/vendor/status-go +++ b/vendor/status-go @@ -1 +1 @@ -Subproject commit da2f155f2df52d689d400bffc11e67b463ddcac9 +Subproject commit a8678575a72070edb815a2b799afdd8f400d5155