From aa7973a9906446c2d095907e96eb692b376a0e83 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=A0imon=20Brandner?= <simon.bra.ag@gmail.com>
Date: Sat, 29 May 2021 13:28:09 +0200
Subject: [PATCH 1/3] Show a gray shield when enc by deleted session
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
---
 res/css/views/rooms/_EventTile.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/res/css/views/rooms/_EventTile.scss b/res/css/views/rooms/_EventTile.scss
index 5d1dd043835..d49aebdb59f 100644
--- a/res/css/views/rooms/_EventTile.scss
+++ b/res/css/views/rooms/_EventTile.scss
@@ -374,7 +374,7 @@ $left-gutter: 64px;
 .mx_EventTile_e2eIcon_unknown {
     &::after {
         mask-image: url('$(res)/img/e2e/warning.svg');
-        background-color: $notice-primary-color;
+        background-color: $composer-e2e-icon-color;
     }
     opacity: 1;
 }

From 9dbf5768b15107e12cbd116db5943468f78c8222 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=A0imon=20Brandner?= <simon.bra.ag@gmail.com>
Date: Sat, 29 May 2021 17:44:57 +0200
Subject: [PATCH 2/3] Change icon to normal

---
 res/css/views/rooms/_EventTile.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/res/css/views/rooms/_EventTile.scss b/res/css/views/rooms/_EventTile.scss
index d49aebdb59f..82b4101321f 100644
--- a/res/css/views/rooms/_EventTile.scss
+++ b/res/css/views/rooms/_EventTile.scss
@@ -373,7 +373,7 @@ $left-gutter: 64px;
 
 .mx_EventTile_e2eIcon_unknown {
     &::after {
-        mask-image: url('$(res)/img/e2e/warning.svg');
+        mask-image: url('$(res)/img/e2e/normal.svg');
         background-color: $composer-e2e-icon-color;
     }
     opacity: 1;

From 5987c97415068557b430d9f1a4ba850f8ae0a794 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=A0imon=20Brandner?= <simon.bra.ag@gmail.com>
Date: Thu, 10 Jun 2021 15:48:11 +0200
Subject: [PATCH 3/3] Merge styles
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
---
 res/css/views/rooms/_EventTile.scss      | 20 ++------------------
 src/components/views/rooms/EventTile.tsx |  8 ++++----
 2 files changed, 6 insertions(+), 22 deletions(-)

diff --git a/res/css/views/rooms/_EventTile.scss b/res/css/views/rooms/_EventTile.scss
index 82b4101321f..1a11aa51006 100644
--- a/res/css/views/rooms/_EventTile.scss
+++ b/res/css/views/rooms/_EventTile.scss
@@ -363,7 +363,7 @@ $left-gutter: 64px;
     }
 }
 
-.mx_EventTile_e2eIcon_undecryptable, .mx_EventTile_e2eIcon_unverified {
+.mx_EventTile_e2eIcon_warning {
     &::after {
         mask-image: url('$(res)/img/e2e/warning.svg');
         background-color: $notice-primary-color;
@@ -371,23 +371,7 @@ $left-gutter: 64px;
     opacity: 1;
 }
 
-.mx_EventTile_e2eIcon_unknown {
-    &::after {
-        mask-image: url('$(res)/img/e2e/normal.svg');
-        background-color: $composer-e2e-icon-color;
-    }
-    opacity: 1;
-}
-
-.mx_EventTile_e2eIcon_unencrypted {
-    &::after {
-        mask-image: url('$(res)/img/e2e/warning.svg');
-        background-color: $notice-primary-color;
-    }
-    opacity: 1;
-}
-
-.mx_EventTile_e2eIcon_unauthenticated {
+.mx_EventTile_e2eIcon_normal {
     &::after {
         mask-image: url('$(res)/img/e2e/normal.svg');
         background-color: $composer-e2e-icon-color;
diff --git a/src/components/views/rooms/EventTile.tsx b/src/components/views/rooms/EventTile.tsx
index 67df5a84ba7..c6027502539 100644
--- a/src/components/views/rooms/EventTile.tsx
+++ b/src/components/views/rooms/EventTile.tsx
@@ -1186,25 +1186,25 @@ export function haveTileForEvent(e) {
 
 function E2ePadlockUndecryptable(props) {
     return (
-        <E2ePadlock title={_t("This message cannot be decrypted")} icon="undecryptable" {...props} />
+        <E2ePadlock title={_t("This message cannot be decrypted")} icon="warning" {...props} />
     );
 }
 
 function E2ePadlockUnverified(props) {
     return (
-        <E2ePadlock title={_t("Encrypted by an unverified session")} icon="unverified" {...props} />
+        <E2ePadlock title={_t("Encrypted by an unverified session")} icon="warning" {...props} />
     );
 }
 
 function E2ePadlockUnencrypted(props) {
     return (
-        <E2ePadlock title={_t("Unencrypted")} icon="unencrypted" {...props} />
+        <E2ePadlock title={_t("Unencrypted")} icon="warning" {...props} />
     );
 }
 
 function E2ePadlockUnknown(props) {
     return (
-        <E2ePadlock title={_t("Encrypted by a deleted session")} icon="unknown" {...props} />
+        <E2ePadlock title={_t("Encrypted by a deleted session")} icon="normal" {...props} />
     );
 }