From 22df66c08fb3c23337de84dfb0b8a0e4e4cc412b Mon Sep 17 00:00:00 2001
From: Beaudan Brown <beau@loki.network>
Date: Wed, 23 Oct 2019 13:30:25 +1100
Subject: [PATCH] Fix missing await, fix undefined bug

---
 background.html            | 2 ++
 js/models/conversations.js | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/background.html b/background.html
index d489a7b4e..8bb34969d 100644
--- a/background.html
+++ b/background.html
@@ -654,6 +654,8 @@
                 <div class='error'></div>
             </div>
             <div class='buttons'>
+              <!-- <a class='button grey' id='back-button'>Back</a> -->
+              <!-- <a class='button' id='save-button' data-loading-text='Please wait...'>Save</a> -->
               <button class='button grey' id='back-button' tabindex='2'>Back</button>
               <button class='button' id='save-button' tabindex='1'>Save</button>
             </div>
diff --git a/js/models/conversations.js b/js/models/conversations.js
index 35ecae10c..4da731a20 100644
--- a/js/models/conversations.js
+++ b/js/models/conversations.js
@@ -2015,7 +2015,7 @@
         );
         const ourNumber = textsecure.storage.user.getNumber();
         return !stillUnread.some(
-          m => m.propsForMessage.text.indexOf(`@${ourNumber}`) !== -1
+          m => m.propsForMessage.text && m.propsForMessage.text.indexOf(`@${ourNumber}`) !== -1
         );
       })();
 
@@ -2419,7 +2419,7 @@
     },
 
     async deletePublicMessage(message) {
-      const channelAPI = this.getPublicSendData();
+      const channelAPI = await this.getPublicSendData();
       if (!channelAPI) {
         return false;
       }