OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #3838 from matrix-org/dbkr/padlocks_behind_labs_flag 

Room padlock decorations only if cross-signing is enabled
pull/21833/head
David Baker 2020-01-13 19:27:50 +00:00 committed by GitHub
parent 389e1194ff d53016e8fc
commit 19777cfafc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/components/views/rooms/RoomTile.js
View File

@ -426,6 +426,11 @@ module.exports = createReactClass({
);
}
let privateIcon = null;
if (SettingsStore.isFeatureEnabled("feature_cross_signing")) {
privateIcon = <div className="mx_RoomTile_PrivateIcon" />;
}
return <React.Fragment>
<AccessibleButton
tabIndex="0"
@ -444,7 +449,7 @@ module.exports = createReactClass({
{ dmIndicator }
</div>
</div>
<div className="mx_RoomTile_PrivateIcon" />
{ privateIcon }
<div className="mx_RoomTile_nameContainer">
<div className="mx_RoomTile_labelContainer">
{ label }