From d53016e8fc7695b4e86887c1c0790598eea498a6 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Mon, 13 Jan 2020 17:53:49 +0000
Subject: [PATCH] Room padlock decorations only if cross-signing is enabled

Put the padlock decorations behind the labs flag as without the
context of the shields on the room icons they can be a bit misleading
and make people think it means 'encrypted'.
---
 src/components/views/rooms/RoomTile.js | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/components/views/rooms/RoomTile.js b/src/components/views/rooms/RoomTile.js
index ae8cfae67a..4dbcc7ca03 100644
--- 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 }