matrix/matrix-react-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-react-sdk.git synced 2025-11-10 09:22:25 +03:00
Code Activity

Merge pull request #5860 from samhh/always-render-ignored-users

Browse Source 
Render ignored users setting regardless of if there are any
This commit is contained in:
Travis Ralston
2021-04-28 09:51:57 -06:00
committed by GitHub
parent 14f1388522 14b8b0f8da
commit 3890bec8ad
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/components/views/settings/tabs/user/SecurityUserSettingsTab.js
View File

@@ -255,10 +255,9 @@ export default class SecurityUserSettingsTab extends React.Component {
_renderIgnoredUsers() { _renderIgnoredUsers() {
const {waitingUnignored, ignoredUserIds} = this.state; const {waitingUnignored, ignoredUserIds} = this.state;
if (!ignoredUserIds || ignoredUserIds.length === 0) return null; const userIds = !ignoredUserIds?.length
? _t('You have no ignored users.')
const userIds = ignoredUserIds : ignoredUserIds.map((u) => <IgnoredUser
.map((u) => <IgnoredUser
userId={u} userId={u}
onUnignored={this._onUserUnignored} onUnignored={this._onUserUnignored}
key={u} key={u}

1
src/i18n/strings/en_EN.json
View File

@@ -1307,6 +1307,7 @@
"Cryptography": "Cryptography", "Cryptography": "Cryptography",
"Session ID:": "Session ID:", "Session ID:": "Session ID:",
"Session key:": "Session key:", "Session key:": "Session key:",
"You have no ignored users.": "You have no ignored users.",
"Bulk options": "Bulk options", "Bulk options": "Bulk options",
"Accept all %(invitedRooms)s invites": "Accept all %(invitedRooms)s invites", "Accept all %(invitedRooms)s invites": "Accept all %(invitedRooms)s invites",
"Reject all %(invitedRooms)s invites": "Reject all %(invitedRooms)s invites", "Reject all %(invitedRooms)s invites": "Reject all %(invitedRooms)s invites",