status-im/status-desktop
2
0
Fork 0
mirror of https://github.com/status-im/status-desktop.git synced 2025-02-19 10:09:38 +00:00
Code Issues Projects Releases Wiki Activity

fix(groups): Fix members count

Browse Source 
Closes: #4822
This commit is contained in:
Boris Melnik 2022-02-17 21:18:05 +03:00
parent 4c0b09e9f5
commit 7bfec141eb
2 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ui/app/AppLayouts/Chat/popups/GroupInfoPopup.qml
View File

@ -26,7 +26,7 @@ StatusModal {
property var chatSectionModule property var chatSectionModule
property var store property var store
property bool addMembers: false property bool addMembers: false
property int currMemberCount: 1 property int currMemberCount: chatContentModule.usersModule.model.count
property int memberCount: 1 property int memberCount: 1
property int channelType: GroupInfoPopup.ChannelType.ActiveChannel property int channelType: GroupInfoPopup.ChannelType.ActiveChannel
@ -41,8 +41,7 @@ StatusModal {
function resetSelectedMembers() { function resetSelectedMembers() {
contactList.selectedPubKeys = [] contactList.selectedPubKeys = []
memberCount = popup.chatContentModule.usersModule.model.rowCount() memberCount = popup.chatContentModule.usersModule.model.count
currMemberCount = memberCount
} }
function doAddMembers() { function doAddMembers() {
@ -58,14 +57,13 @@ StatusModal {
//% "Add members" //% "Add members"
header.title: addMembers ? qsTrId("add-members") : (popup.chatDetails ? popup.chatDetails.name : "") header.title: addMembers ? qsTrId("add-members") : (popup.chatDetails ? popup.chatDetails.name : "")
header.subTitle: { header.subTitle: {
let cnt = memberCount;
if (addMembers) { if (addMembers) {
//% "%1 / 10 members" //% "%1 / 10 members"
return qsTrId("%1-/-10-members").arg(cnt) return qsTrId("%1-/-10-members").arg(memberCount)
} else { } else {
//% "%1 members" //% "%1 members"
if (cnt > 1) { if (currMemberCount > 1) {
return qsTrId("%1-members").arg(cnt); return qsTrId("%1-members").arg(currMemberCount);
} }
//% "1 member" //% "1 member"
return qsTrId("1-member"); return qsTrId("1-member");

2
ui/app/AppLayouts/Chat/views/ChatContentView.qml
View File

@ -76,7 +76,7 @@ ColumnLayout {
//% "Public chat" //% "Public chat"
return qsTrId("public-chat") return qsTrId("public-chat")
case Constants.chatType.privateGroupChat: case Constants.chatType.privateGroupChat:
let cnt = chatContentRoot.usersStore.usersModule.count let cnt = chatContentRoot.usersStore.usersModule.model.count
//% "%1 members" //% "%1 members"
if(cnt > 1) return qsTrId("-1-members").arg(cnt); if(cnt > 1) return qsTrId("-1-members").arg(cnt);
//% "1 member" //% "1 member"