From 75da5b7944ded503a50b099a2a467abec3c40858 Mon Sep 17 00:00:00 2001
From: Zoe <foldleft@users.noreply.github.com>
Date: Fri, 24 Jan 2020 12:59:46 +0000
Subject: [PATCH] Design pass for room icons

---
 src/components/views/rooms/RoomList.js | 2 +-
 src/components/views/rooms/RoomTile.js | 6 +++---
 src/i18n/strings/en_EN.json            | 3 +--
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/components/views/rooms/RoomList.js b/src/components/views/rooms/RoomList.js
index ee3100b535..f41400ecfc 100644
--- a/src/components/views/rooms/RoomList.js
+++ b/src/components/views/rooms/RoomList.js
@@ -719,7 +719,7 @@ export default createReactClass({
             },
             {
                 list: this.state.lists['im.vector.fake.direct'],
-                label: _t('People'),
+                label: _t('Direct Messages'),
                 tagName: "im.vector.fake.direct",
                 order: "recent",
                 incomingCall: incomingCallIfTaggedAs('im.vector.fake.direct'),
diff --git a/src/components/views/rooms/RoomTile.js b/src/components/views/rooms/RoomTile.js
index 0b50d85ff6..c546b7503e 100644
--- a/src/components/views/rooms/RoomTile.js
+++ b/src/components/views/rooms/RoomTile.js
@@ -478,7 +478,8 @@ export default createReactClass({
 
         let dmIndicator;
         let dmOnline;
-        if (dmUserId) {
+        // If we can place a shield, do that instead
+        if (dmUserId && !this.state.e2eStatus) {
             dmIndicator = <img
                 src={require("../../../../res/img/icon_person.svg")}
                 className="mx_RoomTile_dm"
@@ -527,8 +528,7 @@ export default createReactClass({
         }
 
         let e2eIcon = null;
-        // For now, skip the icon for DMs.  Possibly we want to move the DM icon elsewhere?
-        if (!dmUserId && this.state.e2eStatus) {
+        if (this.state.e2eStatus) {
             e2eIcon = <E2EIcon status={this.state.e2eStatus} className="mx_RoomTile_e2eIcon" />;
         }
 
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 099b64dd49..1d5f534a36 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -1012,7 +1012,7 @@
     "Community Invites": "Community Invites",
     "Invites": "Invites",
     "Favourites": "Favourites",
-    "People": "People",
+    "Direct Messages": "Direct Messages",
     "Start chat": "Start chat",
     "Rooms": "Rooms",
     "Low priority": "Low priority",
@@ -1471,7 +1471,6 @@
     "Suggestions": "Suggestions",
     "Recently Direct Messaged": "Recently Direct Messaged",
     "Show more": "Show more",
-    "Direct Messages": "Direct Messages",
     "If you can't find someone, ask them for their username, or share your username (%(userId)s) or <a>profile link</a>.": "If you can't find someone, ask them for their username, or share your username (%(userId)s) or <a>profile link</a>.",
     "Go": "Go",
     "If you can't find someone, ask them for their username (e.g. @user:server.com) or <a>share this room</a>.": "If you can't find someone, ask them for their username (e.g. @user:server.com) or <a>share this room</a>.",