From 129057df84627ed38a973800a90dd9c1d2ea7f9b Mon Sep 17 00:00:00 2001
From: Jamie Kyle <113370520+jamiebuilds-signal@users.noreply.github.com>
Date: Tue, 18 Apr 2023 16:33:24 -0700
Subject: [PATCH] Fallback to getNotificationText() in updateLastMessage()

---
 ts/models/conversations.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/ts/models/conversations.ts b/ts/models/conversations.ts
index 1b0fc5b92..b0ae97044 100644
--- a/ts/models/conversations.ts
+++ b/ts/models/conversations.ts
@@ -4475,7 +4475,8 @@ export class ConversationModel extends window.Backbone
     const notificationData = previewMessage?.getNotificationData();
 
     this.set({
-      lastMessage: notificationData?.text || '',
+      lastMessage:
+        notificationData?.text || previewMessage?.getNotificationText() || '',
       lastMessageBodyRanges: notificationData?.bodyRanges,
       lastMessagePrefix: notificationData?.emoji,
       lastMessageAuthor: previewMessage?.getAuthorText(),