From c768755ae43ff469b88ca1d42ee07b3dc72b2609 Mon Sep 17 00:00:00 2001
From: or-else <or.else@gmail.com>
Date: Tue, 11 Sep 2018 16:55:30 +0300
Subject: [PATCH] fix for issues/17

---
 src/webapp.jsx | 43 ++++++++++++++++++++++++++++++++-----------
 1 file changed, 32 insertions(+), 11 deletions(-)

diff --git a/src/webapp.jsx b/src/webapp.jsx
index 923d092d..5edf81b1 100644
--- a/src/webapp.jsx
+++ b/src/webapp.jsx
@@ -1080,7 +1080,7 @@ class ChipInput extends React.Component {
     this.state.sortedChips.map((item) => {
       chips.push(
         <Chip
-          onCancel={instance.handleChipCancel}
+          onCancel={this.handleChipCancel}
           avatar={makeImageUrl(item.public ? item.public.photo : null)}
           title={item.public ? item.public.fn : undefined}
           noAvatar={this.props.avatarDisabled}
@@ -4667,6 +4667,35 @@ class TinodeWeb extends React.Component {
     this.resetContactList();
   }
 
+  // Merge search results and contact list to create a single flat
+  // list of kown contacts for GroupManager to use.
+  static prepareSearchableContacts(chatList, foundContacts) {
+    let merged = {};
+
+    // For chatList topics merge only p2p topics and convert them to the
+    // same format as foundContacts.
+    for (const c of chatList) {
+      if (Tinode.topicType(c.topic) == "p2p") {
+          merged[c.topic] = {
+            user: c.topic,
+            updated: c.updated,
+            public: c.public,
+            private: c.private,
+            acs: c.acs
+          };
+      }
+    }
+
+    // Add all foundCountacts if they have not been added already.
+    for (const c of foundContacts) {
+      if (!merged[c.user]) {
+        merged[c.user] = c;
+      }
+    }
+
+    return Object.values(merged);
+  }
+
   resetContactList() {
     let newState = {
       chatList: []
@@ -4679,11 +4708,7 @@ class TinodeWeb extends React.Component {
       }
     });
     // Merge search results and chat list.
-    let merged = {};
-    for (const c of newState.chatList.concat(this.state.searchResults)) {
-      merged[c.topic] = c;
-    }
-    newState.searchableContacts = Object.values(merged);
+    newState.searchableContacts = TinodeWeb.prepareSearchableContacts(newState.chatList, this.state.searchResults);
     this.setState(newState);
   }
 
@@ -4719,13 +4744,9 @@ class TinodeWeb extends React.Component {
     this.state.tinode.getFndTopic().contacts((s) => {
       foundContacts.push(s);
     });
-    let merged = {};
-    for (const c of foundContacts.concat(this.state.chatList)) {
-      merged[c.topic] = c;
-    }
     this.setState({
       searchResults: foundContacts,
-      searchableContacts: Object.values(merged)
+      searchableContacts: TinodeWeb.prepareSearchableContacts(this.state.chatList, foundContacts)
     });
   }