From 7bfec141eb3351b0d066a4891c323e04949e66b5 Mon Sep 17 00:00:00 2001
From: Boris Melnik <borismelnik@status.im>
Date: Thu, 17 Feb 2022 21:18:05 +0300
Subject: [PATCH] fix(groups): Fix members count

Closes: #4822
---
 ui/app/AppLayouts/Chat/popups/GroupInfoPopup.qml | 12 +++++-------
 ui/app/AppLayouts/Chat/views/ChatContentView.qml |  2 +-
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/ui/app/AppLayouts/Chat/popups/GroupInfoPopup.qml b/ui/app/AppLayouts/Chat/popups/GroupInfoPopup.qml
index 2419b0b95c..cb8fdb138b 100644
--- a/ui/app/AppLayouts/Chat/popups/GroupInfoPopup.qml
+++ b/ui/app/AppLayouts/Chat/popups/GroupInfoPopup.qml
@@ -26,7 +26,7 @@ StatusModal {
     property var chatSectionModule
     property var store
     property bool addMembers: false
-    property int currMemberCount: 1
+    property int currMemberCount: chatContentModule.usersModule.model.count
     property int memberCount: 1
 
     property int channelType: GroupInfoPopup.ChannelType.ActiveChannel
@@ -41,8 +41,7 @@ StatusModal {
     function resetSelectedMembers() {
         contactList.selectedPubKeys = []
 
-        memberCount = popup.chatContentModule.usersModule.model.rowCount()
-        currMemberCount = memberCount
+        memberCount = popup.chatContentModule.usersModule.model.count
     }
 
     function doAddMembers() {
@@ -58,14 +57,13 @@ StatusModal {
     //% "Add members"
     header.title: addMembers ? qsTrId("add-members") : (popup.chatDetails ? popup.chatDetails.name : "")
     header.subTitle:  {
-        let cnt = memberCount;
         if (addMembers) {
             //% "%1 / 10 members"
-            return qsTrId("%1-/-10-members").arg(cnt)
+            return qsTrId("%1-/-10-members").arg(memberCount)
         } else {
             //% "%1 members"
-            if (cnt > 1) {
-                return qsTrId("%1-members").arg(cnt);
+            if (currMemberCount > 1) {
+                return qsTrId("%1-members").arg(currMemberCount);
             }
             //% "1 member"
             return qsTrId("1-member");
diff --git a/ui/app/AppLayouts/Chat/views/ChatContentView.qml b/ui/app/AppLayouts/Chat/views/ChatContentView.qml
index aaa4b4b1c5..202b631477 100644
--- a/ui/app/AppLayouts/Chat/views/ChatContentView.qml
+++ b/ui/app/AppLayouts/Chat/views/ChatContentView.qml
@@ -76,7 +76,7 @@ ColumnLayout {
                 //% "Public chat"
                 return qsTrId("public-chat")
             case Constants.chatType.privateGroupChat:
-                let cnt = chatContentRoot.usersStore.usersModule.count
+                let cnt = chatContentRoot.usersStore.usersModule.model.count
                 //% "%1 members"
                 if(cnt > 1) return qsTrId("-1-members").arg(cnt);
                 //% "1 member"