From 48e4862c8ce31c61d9a7c1262cd10be8160a74be Mon Sep 17 00:00:00 2001
From: Audric Ackermann <audric@loki.network>
Date: Tue, 14 Jul 2020 11:59:17 +1000
Subject: [PATCH] be sure ourConversation is set in retrySend()

---
 js/models/messages.js | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/js/models/messages.js b/js/models/messages.js
index 69102da1c..d2b9433a4 100644
--- a/js/models/messages.js
+++ b/js/models/messages.js
@@ -1089,9 +1089,8 @@
         const { body, attachments, preview, quote } = await this.uploadData();
         const ourNumber = window.storage.get('primaryDevicePubKey');
         const ourConversation = window.ConversationController.get(ourNumber);
-        const lokiProfile = ourConversation.getOurProfile();
 
-        const chatMessage = new libsession.Messages.Outgoing.ChatMessage({
+        const chatParams = {
           identifier: this.id,
           body,
           timestamp: this.get('sent_at'),
@@ -1099,8 +1098,14 @@
           attachments,
           preview,
           quote,
-          lokiProfile,
-        });
+        };
+        if (ourConversation) {
+          chatParams.lokiProfile = ourConversation.getOurProfile();
+        }
+
+        const chatMessage = new libsession.Messages.Outgoing.ChatMessage(
+          chatParams
+        );
 
         // Special-case the self-send case - we send only a sync message
         if (recipients.length === 1) {