diff --git a/background.html b/background.html index d489a7b4e..8bb34969d 100644 --- a/background.html +++ b/background.html @@ -654,6 +654,8 @@
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; }