From 8b6718f7828d2a67276da59351f5d105ef14bf82 Mon Sep 17 00:00:00 2001
From: automated-signal <37887102+automated-signal@users.noreply.github.com>
Date: Thu, 3 Jun 2021 15:34:13 -0700
Subject: [PATCH] Render proper contact in Delivery Issue notifications

Co-authored-by: Scott Nonnenberg <scott@signal.org>
---
 ts/models/messages.ts | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/ts/models/messages.ts b/ts/models/messages.ts
index 889f09cab7..484b8f0f0a 100644
--- a/ts/models/messages.ts
+++ b/ts/models/messages.ts
@@ -905,7 +905,13 @@ export class MessageModel extends window.Backbone.Model<MessageAttributesType> {
   }
 
   getPropsForDeliveryIssue(): DeliveryIssuePropsType {
-    const sender = this.getContact()?.format();
+    const sourceUuid = this.get('sourceUuid');
+    const sender = sourceUuid
+      ? window.ConversationController.getOrCreate(
+          sourceUuid,
+          'private'
+        ).format()
+      : PLACEHOLDER_CONTACT;
 
     return {
       sender,