From 94be443822aca54703ba2e3ce74a189da6ef5c84 Mon Sep 17 00:00:00 2001
From: Vincent <vincent@loki.network>
Date: Tue, 7 Apr 2020 15:19:18 +1000
Subject: [PATCH] Message deletion cleanup

---
 js/views/conversation_view.js            | 9 ++++++++-
 ts/components/session/SessionConfirm.tsx | 2 --
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/js/views/conversation_view.js b/js/views/conversation_view.js
index e32b56742..f98839610 100644
--- a/js/views/conversation_view.js
+++ b/js/views/conversation_view.js
@@ -1313,9 +1313,14 @@
       const selected = Array.from(this.model.selectedMessages);
       const isModerator = this.model.isModerator(ourPubkey);
       const isAllOurs = selected.every(
-        message => message.attributes.source === message.OUR_NUMBER
+        message => message.propsForMessage.authorPhoneNumber === message.OUR_NUMBER
       );
 
+      console.log(`[deletion] isAllOurs: `, isAllOurs);
+      console.log(`[deletion] isModerator: `, isModerator);
+      console.log(`[deletion] selected: `, selected);
+
+
       if (!isAllOurs && !isModerator) {
         window.pushToast({
           title: i18n('messageDeletionForbidden'),
@@ -1382,8 +1387,10 @@
       }
 
       window.confirmationDialog({
+        title: i18n('deleteMessage'),
         message: warningMessage,
         okText: i18n('delete'),
+        okTheme: 'danger',
         resolve: doDelete,
       });
     },
diff --git a/ts/components/session/SessionConfirm.tsx b/ts/components/session/SessionConfirm.tsx
index 2b43cc543..859e856c8 100644
--- a/ts/components/session/SessionConfirm.tsx
+++ b/ts/components/session/SessionConfirm.tsx
@@ -69,8 +69,6 @@ export class SessionConfirm extends React.Component<Props> {
           )}
         </div>
 
-        <div className="spacer-lg" />
-
         <div className="session-modal__button-group">
           <SessionButton
             text={okText}