PrivateCoffee/element-web
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3

Merge pull request #569 from matrix-org/rav/reinstate_devices_list

Browse source 
Reinstate missing sections from the UserSettings
This commit is contained in:
Richard van der Hoff 2016-11-23 11:27:59 +00:00 committed by GitHub
commit 7650e3de6e
1 changed files with 0 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/components/structures/UserSettings.js
View file

@ -338,10 +338,6 @@ module.exports = React.createClass({
},
_renderCryptoInfo: function() {
if (!UserSettingsStore.isFeatureEnabled("e2e_encryption")) {
return null;
}
var client = MatrixClientPeg.get();
var deviceId = client.deviceId;
var identityKey = client.getDeviceEd25519Key() || "<not supported>";
@ -362,9 +358,6 @@ module.exports = React.createClass({
},
_renderDevicesPanel: function() {
if (!UserSettingsStore.isFeatureEnabled("e2e_encryption")) {
return null;
}
var DevicesPanel = sdk.getComponent('settings.DevicesPanel');
return (
<div>