From 5e4a3966c0b67b69dcf34459849125e3090c4600 Mon Sep 17 00:00:00 2001 From: automated-signal <37887102+automated-signal@users.noreply.github.com> Date: Thu, 7 Mar 2024 11:15:29 -0600 Subject: [PATCH] onSentMessage: only merge if we have a destinationConversatonId Co-authored-by: Scott Nonnenberg --- ts/background.ts | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ts/background.ts b/ts/background.ts index c16b90779..7f4a56273 100644 --- a/ts/background.ts +++ b/ts/background.ts @@ -2732,7 +2732,10 @@ export async function startApp(): Promise { strictAssert(source && sourceServiceId, 'Missing user number and uuid'); // Make sure destination conversation is created before we hit getMessageDescriptor - if (data.destinationServiceId !== sourceServiceId) { + if ( + data.destinationServiceId && + data.destinationServiceId !== sourceServiceId + ) { const { mergePromises } = window.ConversationController.maybeMergeContacts({ e164: data.destination,