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

don't show devices section when not encrypted, as it just shows spinner

Browse source
This commit is contained in:
Bruno Windels 2019-11-15 15:19:16 +01:00
parent 92237f1045
commit 53019c5e91
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/components/views/right_panel/UserInfo.js
View file

@ -1248,11 +1248,13 @@ const UserInfo = withLegacyMatrixClient(({matrixClient: cli, user, groupId, room
text = _t("Messages in this room are end-to-end encrypted."); text = _t("Messages in this room are end-to-end encrypted.");
} }
const devicesSection = ( const devicesSection = isRoomEncrypted ?
(<DevicesSection loading={devices === undefined} devices={devices} userId={user.userId} />) : null;
const securitySection = (
<div className="mx_UserInfo_container"> <div className="mx_UserInfo_container">
<h3>{ _t("Security") }</h3> <h3>{ _t("Security") }</h3>
<p>{ text }</p> <p>{ text }</p>
<DevicesSection loading={devices === undefined} devices={devices} userId={user.userId} /> { devicesSection }
</div> </div>
); );
@ -1289,7 +1291,7 @@ const UserInfo = withLegacyMatrixClient(({matrixClient: cli, user, groupId, room
</div> } </div> }
<AutoHideScrollbar className="mx_UserInfo_scrollContainer"> <AutoHideScrollbar className="mx_UserInfo_scrollContainer">
{ devicesSection } { securitySection }
<UserOptionsSection <UserOptionsSection
devices={devices} devices={devices}
canInvite={roomPermissions.canInvite} canInvite={roomPermissions.canInvite}