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

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
commit d11ce5fade
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 1 additions and 22 deletions

View file

@ -275,11 +275,6 @@ export const SETTINGS: {[setting: string]: ISetting} = {
displayName: _td('Autoplay GIFs and videos'),
default: false,
},
"alwaysShowEncryptionIcons": {
supportedLevels: LEVELS_ACCOUNT_SETTINGS,
displayName: _td('Always show encryption icons'),
default: true,
},
"showRoomRecoveryReminder": {
supportedLevels: LEVELS_ACCOUNT_SETTINGS,
displayName: _td('Show a reminder to enable Secure Message Recovery in encrypted rooms'),