From c5ff70c970425f3a0f358df0a1635e20c3baa9fc Mon Sep 17 00:00:00 2001
From: Vincent <vincent@loki.network>
Date: Wed, 5 Feb 2020 16:01:55 +1100
Subject: [PATCH] Message deletion fix

---
 js/views/conversation_view.js  | 3 ++-
 stylesheets/_conversation.scss | 2 +-
 stylesheets/_theme_dark.scss   | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/js/views/conversation_view.js b/js/views/conversation_view.js
index 1014520c6..ab9e5a547 100644
--- a/js/views/conversation_view.js
+++ b/js/views/conversation_view.js
@@ -1282,8 +1282,9 @@
     },
 
     deleteSelectedMessages() {
+      const ourPubkey = textsecure.storage.user.getNumber();
       const selected = Array.from(this.model.selectedMessages);
-      const isModerator = this.model.isModerator(this.model.OUR_NUMBER);
+      const isModerator = this.model.isModerator(ourPubkey);
       const isAllOurs = selected.every(
         message => message.attributes.source === message.OUR_NUMBER
       );
diff --git a/stylesheets/_conversation.scss b/stylesheets/_conversation.scss
index a320d6dbc..2f879d9c3 100644
--- a/stylesheets/_conversation.scss
+++ b/stylesheets/_conversation.scss
@@ -671,7 +671,7 @@
 .module-last-seen-indicator__bar {
   background-color: $color-light-60;
   width: 100%;
-  height: 4px;
+  height: 2px;
 }
 
 .module-last-seen-indicator__text {
diff --git a/stylesheets/_theme_dark.scss b/stylesheets/_theme_dark.scss
index 726573b64..39de2faad 100644
--- a/stylesheets/_theme_dark.scss
+++ b/stylesheets/_theme_dark.scss
@@ -116,7 +116,7 @@ body.dark-theme {
   }
 
   .module-last-seen-indicator__bar {
-    background-color: $color-dark-30;
+    background-color: #353535;
   }
 
   .module-last-seen-indicator__text {