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

Merge pull request #5207 from matrix-org/travis/ui-func/e2e-icons

Browse Source 
Remove defunct "always show encryption icons" setting
This commit is contained in:
Travis Ralston
2020-09-15 08:52:19 -06:00
committed by GitHub
parent 9a3c30b1f1 0cac6874d4
commit d11ce5fade
5 changed files with 1 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/components/views/rooms/EventTile.js
View File

@@ -1027,11 +1027,7 @@ class E2ePadlock extends React.Component {
tooltip = <Tooltip className="mx_EventTile_e2eIcon_tooltip" label={this.props.title} dir="auto" />;
}
let classes = `mx_EventTile_e2eIcon mx_EventTile_e2eIcon_${this.props.icon}`;
if (!SettingsStore.getValue("alwaysShowEncryptionIcons")) {
classes += ' mx_EventTile_e2eIcon_hidden';
}
const classes = `mx_EventTile_e2eIcon mx_EventTile_e2eIcon_${this.props.icon}`;
return (
<div
className={classes}

1
src/components/views/settings/tabs/user/PreferencesUserSettingsTab.js
View File

@@ -52,7 +52,6 @@ export default class PreferencesUserSettingsTab extends React.Component {
];
static ADVANCED_SETTINGS = [
'alwaysShowEncryptionIcons',
'Pill.shouldShowPillAvatar',
'TagPanel.enableTagPanel',
'promptBeforeInviteUnknownUsers',