diff --git a/Riot/Modules/Contacts/Details/ContactDetailsViewController.m b/Riot/Modules/Contacts/Details/ContactDetailsViewController.m index bc1815a41..ac0661eda 100644 --- a/Riot/Modules/Contacts/Details/ContactDetailsViewController.m +++ b/Riot/Modules/Contacts/Details/ContactDetailsViewController.m @@ -671,7 +671,7 @@ switch (action) { case ContactDetailsActionIgnore: - title = [VectorL10n roomParticipantsActionIgnore]; + title = [VectorL10n ignoreUser]; break; case ContactDetailsActionUnignore: title = [VectorL10n roomParticipantsActionUnignore]; diff --git a/Riot/Modules/Room/Members/Detail/RoomMemberDetailsViewController.m b/Riot/Modules/Room/Members/Detail/RoomMemberDetailsViewController.m index 5fd62ecad..68011b5c1 100644 --- a/Riot/Modules/Room/Members/Detail/RoomMemberDetailsViewController.m +++ b/Riot/Modules/Room/Members/Detail/RoomMemberDetailsViewController.m @@ -629,7 +629,7 @@ } // Check whether the option Ignore may be presented - if (RiotSettings.shared.roomMemberScreenShowIgnore && self.mxRoomMember.membership == MXMembershipJoin) + if (RiotSettings.shared.roomMemberScreenShowIgnore) { // is he already ignored ? if (![self.mainSession isUserIgnored:self.mxRoomMember.userId]) @@ -778,7 +778,7 @@ title = [VectorL10n roomParticipantsActionUnban]; break; case MXKRoomMemberDetailsActionIgnore: - title = [VectorL10n roomParticipantsActionIgnore]; + title = [VectorL10n ignoreUser]; break; case MXKRoomMemberDetailsActionUnignore: title = [VectorL10n roomParticipantsActionUnignore]; diff --git a/changelog.d/5866.change b/changelog.d/5866.change new file mode 100644 index 000000000..776ccc919 --- /dev/null +++ b/changelog.d/5866.change @@ -0,0 +1 @@ +Room: Allow ignoring invited users that have not joined a room yet