Merge pull request #2599 from matrix-org/dbkr/unlabs_keybackup_sas

Remove key backup & sas from labs
2019-02-08 17:41:54 +00:00 · 2019-02-08 17:41:54 +00:00 · 09bf8099e0
commit 09bf8099e0
parent a00c803f8d d74d5f1e27
6 changed files with 55 additions and 103 deletions
--- a/src/components/structures/RoomView.js
+++ b/src/components/structures/RoomView.js
@ -1635,7 +1635,6 @@ module.exports = React.createClass({
        );

        const showRoomRecoveryReminder = (
-            SettingsStore.isFeatureEnabled("feature_keybackup") &&
            SettingsStore.getValue("showRoomRecoveryReminder") &&
            MatrixClientPeg.get().isRoomEncrypted(this.state.room.roomId) &&
            !MatrixClientPeg.get().getKeyBackupEnabled()