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

Room padlock decorations only if cross-signing is enabled
matrix-org · Jan 13, 2020 · 19777cf · 19777cf
2 parents 389e119 + d53016e
commit 19777cf
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/src/components/views/rooms/RoomTile.js b/src/components/views/rooms/RoomTile.js
@@ -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 }