finalised

package.json

@@ -20,7 +20,6 @@
     "start-multi2": "cross-env NODE_APP_INSTANCE=2 electron .",
     "start-prod": "cross-env NODE_ENV=production NODE_APP_INSTANCE=devprod electron .",
     "start-prod-multi": "cross-env NODE_ENV=production NODE_APP_INSTANCE=devprod1 electron .",
-    "start-prod-multi2": "cross-env NODE_ENV=production NODE_APP_INSTANCE=devprod2 electron .",
     "start-swarm-test": "cross-env NODE_ENV=swarm-testing NODE_APP_INSTANCE=1 electron .",
     "start-swarm-test-2": "cross-env NODE_ENV=swarm-testing NODE_APP_INSTANCE=2 electron .",
     "grunt": "grunt",

ts/components/session/LeftPaneContactSection.tsx

@@ -247,8 +247,6 @@ export class LeftPaneContactSection extends React.Component<Props, State> {
     const hasReceivedFriendRequest =
       this.props.receivedFriendsRequest.length > 0;
 
-     console.log('[vince] this.props:', this.props);
-
     return (
       <div className="left-pane-contact-content">
         {this.renderList()}
@@ -324,15 +322,11 @@ export class LeftPaneContactSection extends React.Component<Props, State> {
   private renderList() {
     const { sentFriendsRequest } = this.props;
 
-    console.log('[vince] this.props.friends:', this.props.friends);
-    console.log('[vince] sentFriendsRequest:', sentFriendsRequest);
-
     const friends = window.getFriendsFromContacts(this.props.friends);
-    const length =
-      Number(sentFriendsRequest.length) + Number(friends.length);
-    
-    // prevent where friends and send FR showing two entries
-    const combined = [...new Set ([...sentFriendsRequest, ...friends])];
+    const length = Number(sentFriendsRequest.length) + Number(friends.length);
+
+    // Prevent where friends and send FR showing two entries
+    const combined = [...new Set([...sentFriendsRequest, ...friends])];
 
     const list = (
       <div className="module-left-pane__list" key={0}>

ts/components/session/LeftPaneMessageSection.tsx

@@ -204,8 +204,6 @@ export class LeftPaneMessageSection extends React.Component<Props, any> {
 
   public render(): JSX.Element {
     const conversations = this.getCurrentConversations();
-    console.log('[vince] conversations:', conversations);
-
 
     return (
       <div className="session-left-pane-section-content">

ts/state/selectors/conversations.ts

@@ -102,42 +102,18 @@ export const _getLeftPaneLists = (
   sentFriendsRequest: Array<ConversationListItemPropsType>;
   unreadCount: number;
 } => {
-  const _ = window.Lodash;
-
   const values = Object.values(lookup);
   const sorted = values.sort(comparator);
 
   const conversations: Array<ConversationType> = [];
   const archivedConversations: Array<ConversationType> = [];
-  const friends: Array<ConversationType> = [];
-  const receivedFriendsRequest: Array<ConversationListItemPropsType> = [];
-  const sentFriendsRequest: Array<ConversationListItemPropsType> = [];
+  const allFriends: Array<ConversationType> = [];
+  const allReceivedFriendsRequest: Array<ConversationListItemPropsType> = [];
+  const allSentFriendsRequest: Array<ConversationListItemPropsType> = [];
 
   const max = sorted.length;
   let unreadCount = 0;
 
-  // Map pubkeys to their primary pubkey so you don't need to call getPrimaryDeviceFor
-  // every time.
-
-  const filterToPrimary = (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.
-
-    // You can't just get the primary device for each conversation, as different
-    // devices might have seperate FR and contacts status, etc.
-
-    // Build up propsData into ConversationType
-    const constructedGroup = conversations.filter(c => group.some(g => c.id === g.id));
-    const filteredGroup = constructedGroup.filter(c => !(c.isSecondary && group.some(g => g.id === c.primaryDevice)));
-
-    console.log('[group] conversations:', conversations);
-    console.log('[group] group:', group);
-    console.log('[group] filteredGroup:', filteredGroup);
-
-    return filteredGroup;
-  };
-
   for (let i = 0; i < max; i += 1) {
     let conversation = sorted[i];
 
@@ -149,11 +125,11 @@ export const _getLeftPaneLists = (
     }
 
     if (conversation.isFriend && conversation.activeAt !== undefined) {
-      friends.push(conversation)
+      allFriends.push(conversation);
     }
 
     if (conversation.hasReceivedFriendRequest) {
-      receivedFriendsRequest.push(conversation)
+      allReceivedFriendsRequest.push(conversation);
     } else if (
       unreadCount < 9 &&
       conversation.isFriend &&
@@ -162,7 +138,7 @@ export const _getLeftPaneLists = (
       unreadCount += conversation.unreadCount;
     }
     if (conversation.hasSentFriendRequest) {
-      sentFriendsRequest.push(conversation);
+      allSentFriendsRequest.push(conversation);
     }
 
     if (!conversation.activeAt) {
@@ -176,8 +152,31 @@ export const _getLeftPaneLists = (
     }
   }
 
-  const vFriends = filterToPrimary(friends);
-  console.log('[group] vFriends:', vFriends);
+  const filterToPrimary = (
+    group: Array<ConversationType | ConversationListItemPropsType>
+  ) => {
+    // Used to ensure that only the primary device gets added to LeftPane filtered groups
+
+    const constructedGroup = conversations.filter(c =>
+      group.some(g => c.id === g.id)
+    );
+    // tslint:disable-next-line: no-unnecessary-local-variable
+    const filteredGroup = constructedGroup.filter(
+      (c, idx) =>
+        !(
+          c.isSecondary &&
+          constructedGroup.some(
+            g => !g.isSecondary && g.id === constructedGroup[idx].primaryDevice
+          )
+        )
+    );
+
+    return filteredGroup;
+  };
+
+  const friends = filterToPrimary(allFriends);
+  const receivedFriendsRequest = filterToPrimary(allReceivedFriendsRequest);
+  const sentFriendsRequest = filterToPrimary(allSentFriendsRequest);
 
   return {
     conversations,