halfway

js/models/conversations.js

@@ -595,7 +595,6 @@
         isRss: this.isRss(),
         isClosable: this.isClosable(),
         isTyping: typingKeys.length > 0,
-        
         lastUpdated: this.get('timestamp'),
         name: this.getName(),
         profileName: this.getProfileName(),
@@ -608,6 +607,7 @@
         hasSentFriendRequest: this.hasSentFriendRequest(),
         isBlocked: this.isBlocked(),
         isSecondary: !!this.get('secondaryStatus'),
+        primaryDevice: this.getPrimaryDevicePubKey(),
         phoneNumber: format(this.id, {
           ourRegionCode: regionCode,
         }),

ts/state/ducks/conversations.ts

@@ -54,6 +54,7 @@ export type ConversationType = {
   isTyping: boolean;
   isFriend?: boolean;
   isSecondary?: boolean;
+  primaryDevice: string;
   hasReceivedFriendRequest?: boolean;
   hasSentFriendRequest?: boolean;
 };

ts/state/selectors/conversations.ts

@@ -9,10 +9,6 @@ import {
   ConversationType,
 } from '../ducks/conversations';
 
-import {
-  getPrimaryDeviceFor
-} from '../../../js/modules/data';
-
 import { getIntl, getRegionCode, getUserNumber } from './user';
 import { PropsData as ConversationListItemPropsType } from '../../components/ConversationListItem';
 
@@ -123,25 +119,77 @@ export const _getLeftPaneLists = (
   // Map pubkeys to their primary pubkey so you don't need to call getPrimaryDeviceFor
   // every time.
 
-  const filterToPrimary = async (conversation: ConversationType, filerGroup: Array<ConversationType | ConversationListItemPropsType>) => {
+  const filterToPrimary = (conversation: ConversationType, group: Array<ConversationType | ConversationListItemPropsType>) => {
     // Used to ensure that only the primary device gets added  to LeftPane filtered groups
     // Get one result per user. Dont just ignore secondaries, in case
     // a user hasn't synced with primary but FR or contact is duplicated.
 
-    const primaryPubkey = conversation.isSecondary
-      ? await getPrimaryDeviceFor(conversation.id)
-      : conversation.id;
+    // You can't just get the primary device for each conversation, as different
+    // devices might have seperate FR and contacts status, etc.
 
-    const primaryConversation = conversation.isSecondary
-      ? conversations.find(c => c.id === primaryPubkey)
-      : conversation;
+    const primaryPubkey = conversation.primaryDevice;
+    const groupHasPrimary = group.some(c => c.id === primaryPubkey);
 
-    if (!_.includes(filerGroup, primaryConversation)) {
-      // Push secondary to array only if private pubkey not found
-      filerGroup.push(primaryConversation || conversation);
+    if (!groupHasPrimary) {
+      group.push(conversation);
     }
 
-    return primaryConversation;
+    const constructedGroup = conversations.filter(c => _.includes(group, c.id));
+    
+    const newGroup = constructedGroup.filter(c => {
+      if (
+        c.isSecondary &&
+        group.some(g => g.id === c.primaryDevice)
+      ) {
+        return false;
+      }
+
+      return true;
+    });
+
+    console.log('[group] primaryPubkey:', primaryPubkey);
+    console.log('[group] groupHasPrimary:', groupHasPrimary);
+
+    console.log('[group] group:', group);
+    console.log('[vince] newGroup:', newGroup);
+    
+    // const isPrimary = !conversation.isSecondary;
+
+    // // If no secondary or primary currently in group, add
+    // if (!groupHasPrimary) {
+    //   group.push(conversation);
+    // }
+
+    // if (clg) {
+    //   console.log('[group] conversation:', conversation);
+    //   console.log('[group] primaryPubkey:', primaryPubkey);
+    //   console.log('[group] group:', group);
+    //   console.log('[group] groupHasPrimary:', groupHasPrimary);
+
+    //   const qwer = conversations.filter(c => _.includes(group, c.id));
+    //   console.log('[group] constructedGroup:', qwer);
+    // }
+
+    // // If primary, but secondary already added to group, remove secondary
+    // if (isPrimary) {
+    //   // Build up propsData into ConversationType
+    //   const constructedGroup = conversations.filter(c => _.includes(group, c.id));
+
+    //   console.log('[group] primary, but secondary already added to group, remove secondary:');
+
+    //   constructedGroup.every(c => {
+    //     if (c.primaryDevice === primaryPubkey) {
+    //       const secondaryIndex = group.indexOf(c);
+    //       group.splice(secondaryIndex, 1);
+
+    //       // Early break; removed redundant secondary
+    //       return false;
+    //     }
+
+    //     return true;
+    //   });
+    // }
+
   };
 
   for (let i = 0; i < max; i += 1) {
@@ -155,11 +203,11 @@ export const _getLeftPaneLists = (
     }
 
     if (conversation.isFriend && conversation.activeAt !== undefined) {
-      void filterToPrimary(conversation, friends);
+      filterToPrimary(true, conversation, friends);
     }
 
     if (conversation.hasReceivedFriendRequest) {
-      void filterToPrimary(conversation, receivedFriendsRequest);
+      filterToPrimary(false, conversation, receivedFriendsRequest);
     } else if (
       unreadCount < 9 &&
       conversation.isFriend &&
@@ -168,7 +216,7 @@ export const _getLeftPaneLists = (
       unreadCount += conversation.unreadCount;
     }
     if (conversation.hasSentFriendRequest) {
-      void filterToPrimary(conversation, sentFriendsRequest);
+      filterToPrimary(false, conversation, sentFriendsRequest);
     }
 
     if (!conversation.activeAt) {

ts/test/state/selectors/conversations_test.ts

@@ -20,6 +20,7 @@ describe('state/selectors/conversations', () => {
           phoneNumber: 'notused',
           isArchived: false,
           isSecondary: false,
+          primaryDevice: 'id1',
 
           type: 'direct',
           isMe: false,
@@ -37,6 +38,7 @@ describe('state/selectors/conversations', () => {
           phoneNumber: 'notused',
           isArchived: false,
           isSecondary: false,
+          primaryDevice: 'id2',
 
           type: 'direct',
           isMe: false,
@@ -54,6 +56,7 @@ describe('state/selectors/conversations', () => {
           phoneNumber: 'notused',
           isArchived: false,
           isSecondary: false,
+          primaryDevice: 'id3',
 
           type: 'direct',
           isMe: false,
@@ -71,6 +74,7 @@ describe('state/selectors/conversations', () => {
           phoneNumber: 'notused',
           isArchived: false,
           isSecondary: false,
+          primaryDevice: 'id4',
 
           type: 'direct',
           isMe: false,
@@ -88,6 +92,7 @@ describe('state/selectors/conversations', () => {
           phoneNumber: 'notused',
           isArchived: false,
           isSecondary: false,
+          primaryDevice: 'id5',
 
           type: 'direct',
           isMe: false,