From af2f387961d32a456aeafdba5acc7259fb78c755 Mon Sep 17 00:00:00 2001
From: Alexandra Betouni <alexandra.betouni@protonmail.com>
Date: Mon, 6 Jun 2022 16:45:26 +0300
Subject: [PATCH] fix(GroupChatPanel): drop down was showing empty entries

Closes #5955
---
 .../AppLayouts/Chat/panels/GroupChatPanel.qml | 28 +++++++++----------
 .../AppLayouts/Chat/views/CreateChatView.qml  |  1 -
 2 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/ui/app/AppLayouts/Chat/panels/GroupChatPanel.qml b/ui/app/AppLayouts/Chat/panels/GroupChatPanel.qml
index bee36910b9..4242f57032 100644
--- a/ui/app/AppLayouts/Chat/panels/GroupChatPanel.qml
+++ b/ui/app/AppLayouts/Chat/panels/GroupChatPanel.qml
@@ -32,6 +32,15 @@ RowLayout {
              removedMembersIds = []
              tagSelector.namesModel.clear()
          }
+
+         function find(val, array) {
+             for(var i = 0; i < array.length; i++) {
+                 if(array[i] === val) {
+                     return true
+                 }
+             }
+             return false
+         }
      }
 
      ListView {
@@ -80,7 +89,7 @@ RowLayout {
              var entry2 = contactsModelListView.itemAtIndex(j)
              d.contactsModel.insert(d.contactsModel.count,
                                 {"pubKey": entry2.pubKey,
-                                 "name": entry2.name,
+                                 "displayName": entry2.name,
                                  "icon": entry2.icon,
                                  "isIdenticon": false,
                                  "onlineStatus": false})
@@ -105,17 +114,8 @@ RowLayout {
              return exists
          }
 
-         function find(val, array) {
-             for(var i = 0; i < array.length; i++) {
-                 if(array[i] === val) {
-                     return true
-                 }
-             }
-             return false
-         }
-
          function addNewMember(memberId) {
-            if(find(memberId, d.addedMembersIds)) {
+            if(d.find(memberId, d.addedMembersIds)) {
                 return
             }
 
@@ -123,13 +123,13 @@ RowLayout {
                  d.addedMembersIds.push(memberId)
              }
 
-             if(memberExists(memberId) && find(memberId, d.removedMembersIds)) {
+             if(memberExists(memberId) && d.find(memberId, d.removedMembersIds)) {
                  d.removedMembersIds.pop(memberId)
              }
          }
 
          function removeExistingMember(memberId) {
-             if(find(memberId, d.removedMembersIds)) {
+             if(d.find(memberId, d.removedMembersIds)) {
                  return
              }
 
@@ -137,7 +137,7 @@ RowLayout {
                  d.removedMembersIds.push(memberId)
              }
 
-             if(!memberExists(memberId) && find(memberId, d.addedMembersIds)) {
+             if(!memberExists(memberId) && d.find(memberId, d.addedMembersIds)) {
                  d.addedMembersIds.pop(memberId)
              }
          }
diff --git a/ui/app/AppLayouts/Chat/views/CreateChatView.qml b/ui/app/AppLayouts/Chat/views/CreateChatView.qml
index 712112c96f..f168bfe2eb 100644
--- a/ui/app/AppLayouts/Chat/views/CreateChatView.qml
+++ b/ui/app/AppLayouts/Chat/views/CreateChatView.qml
@@ -50,7 +50,6 @@ Page {
                 tagSelector.sortModel(root.contactsModel);
             } else {
                 tagSelector.namesModel.clear();
-                contactsModel.clear();
             }
         }
     }