mirror of
https://github.com/Novaloop-AG/element-x-ios.git
synced 2026-11-04 19:44:05 +00:00
Fix various bugs in the moderation feature. (#2608)
* Fix search field string. * Show your own user as an Admin when changing roles. * Also show invited users when changing roles. * Don't allow admin's to kick/ban other admins or themselves. * Fix a bug when left members were counted as admins/moderators. * Show when a member is pending. * Add sections to the change role screen.
This commit is contained in:
@@ -28,10 +28,20 @@ struct RoomChangeRolesScreenRow: View {
|
||||
let action: () -> Void
|
||||
|
||||
var body: some View {
|
||||
ListRow(label: .avatar(title: member.name ?? member.id,
|
||||
ListRow(label: .avatar(title: memberName,
|
||||
description: member.name == nil ? nil : member.id,
|
||||
icon: avatar),
|
||||
kind: isEnabled ? .multiSelection(isSelected: isSelected, action: action) : .label)
|
||||
kind: .multiSelection(isSelected: isSelected, action: action))
|
||||
}
|
||||
|
||||
var memberName: String {
|
||||
let name = member.name ?? member.id
|
||||
|
||||
return if member.isInvited {
|
||||
L10n.screenRoomChangeRoleInvitedMemberName(name)
|
||||
} else {
|
||||
name
|
||||
}
|
||||
}
|
||||
|
||||
var avatar: LoadableAvatarImage {
|
||||
@@ -58,6 +68,11 @@ struct RoomChangeRolesScreenRow_Previews: PreviewProvider, TestablePreview {
|
||||
isSelected: false,
|
||||
action: action)
|
||||
|
||||
RoomChangeRolesScreenRow(member: .init(withProxy: RoomMemberProxyMock.mockInvited),
|
||||
imageProvider: MockMediaProvider(),
|
||||
isSelected: false,
|
||||
action: action)
|
||||
|
||||
RoomChangeRolesScreenRow(member: .init(withProxy: RoomMemberProxyMock.mockCharlie),
|
||||
imageProvider: MockMediaProvider(),
|
||||
isSelected: true,
|
||||
|
||||
Reference in New Issue
Block a user