From c7fa765b65bc3709d2346d300c6374eb1a0667f9 Mon Sep 17 00:00:00 2001
From: Audric Ackermann <audric@loki.network>
Date: Tue, 9 Feb 2021 14:44:23 +1100
Subject: [PATCH] be sure to have a conversationId on handleMessageEvent()

---
 ts/receiver/dataMessage.ts | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/ts/receiver/dataMessage.ts b/ts/receiver/dataMessage.ts
index 29f051a4b..153b63560 100644
--- a/ts/receiver/dataMessage.ts
+++ b/ts/receiver/dataMessage.ts
@@ -583,7 +583,12 @@ export async function handleMessageEvent(event: MessageEvent): Promise<void> {
     ? ConversationType.GROUP
     : ConversationType.PRIVATE;
 
-  let conversationId = isIncoming ? source : destination;
+  let conversationId = isIncoming ? source : destination || source; // for synced message
+  if (!conversationId) {
+    window.log.error('We cannot handle a message without a conversationId');
+    confirm();
+    return;
+  }
   if (message.profileKey?.length) {
     await handleProfileUpdate(
       message.profileKey,