Merge pull request #1273 from Bilb/fix-showing-secondary-conversation-sync

password_preload.js

@@ -32,7 +32,7 @@ window.Signal = {
   Components: {
     SessionPasswordPrompt,
   },
-}
+};
 
 window.CONSTANTS = {
   MAX_LOGIN_TRIES: 3,

ts/receiver/dataMessage.ts

@@ -632,7 +632,20 @@ export async function handleMessageEvent(event: MessageEvent): Promise<void> {
     );
   }
 
-  await window.ConversationController.getOrCreateAndWait(conversationId, type);
+  const conv = await window.ConversationController.getOrCreateAndWait(
+    conversationId,
+    type
+  );
+  if (!isGroupMessage && !isIncoming) {
+    const primaryDestination = await MultiDeviceProtocol.getPrimaryDevice(
+      destination
+    );
+
+    if (destination !== primaryDestination.key) {
+      // mark created conversation as secondary if this is one
+      conv.setSecondaryStatus(true, primaryDestination.key);
+    }
+  }
 
   // =========== Process flags =============