From 8d9a0959c2cc38f3974fb630a2b2eba73c728b21 Mon Sep 17 00:00:00 2001
From: automated-signal <37887102+automated-signal@users.noreply.github.com>
Date: Tue, 6 Aug 2024 11:49:10 -0500
Subject: [PATCH] Streamline logic in maybeMergeContacts

Co-authored-by: Fedor Indutny <79877362+indutny-signal@users.noreply.github.com>
---
 ts/ConversationController.ts | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/ts/ConversationController.ts b/ts/ConversationController.ts
index 78cde7b060..daf99bc0b6 100644
--- a/ts/ConversationController.ts
+++ b/ts/ConversationController.ts
@@ -492,12 +492,20 @@ export class ConversationController {
     const dataProvided = [];
     if (providedAci) {
       dataProvided.push(`aci=${providedAci}`);
-    }
-    if (e164) {
-      dataProvided.push(`e164=${e164}`);
-    }
-    if (providedPni) {
-      dataProvided.push(`pni=${providedPni}`);
+
+      if (e164) {
+        dataProvided.push('e164');
+      }
+      if (providedPni) {
+        dataProvided.push('pni');
+      }
+    } else {
+      if (e164) {
+        dataProvided.push(`e164=${e164}`);
+      }
+      if (providedPni) {
+        dataProvided.push(`pni=${providedPni}`);
+      }
     }
     if (fromPniSignature) {
       dataProvided.push(`fromPniSignature=${fromPniSignature}`);