From 3aba1522060afdf05c42d83f3eef2919f12d30f1 Mon Sep 17 00:00:00 2001 From: Sale Djenic Date: Mon, 20 Jun 2022 15:27:00 +0200 Subject: [PATCH] fix(@desktop/general): multiple ui issues fixed - Channel is blank on first time joining - fixes: #6131 - Contacts list is empty when trying to invite/share community - fixes: #6139 - The same name is shown for all invited contacts - fixes: #6105 - The names and avatars of contacts are empty in the Contact requests - fixes: #6084 - 'Invite friends' dialog doesn't look good in the minimized app mode - fixes: #6106 --- .../CommunityProfilePopupInviteFriendsPanel.qml | 2 -- .../Chat/popups/ContactRequestsPopup.qml | 4 ++-- .../popups/community/CommunityProfilePopup.qml | 1 - .../community/InviteFriendsToCommunityPopup.qml | 4 +++- .../Chat/views/CommunitySettingsView.qml | 5 ++--- .../shared/controls/ContactsListAndSearch.qml | 4 +--- ui/imports/shared/views/ExistingContacts.qml | 15 ++++++++------- ui/imports/shared/views/SearchResults.qml | 2 +- 8 files changed, 17 insertions(+), 20 deletions(-) diff --git a/ui/app/AppLayouts/Chat/panels/communities/CommunityProfilePopupInviteFriendsPanel.qml b/ui/app/AppLayouts/Chat/panels/communities/CommunityProfilePopupInviteFriendsPanel.qml index 0d1b99b0b9..7c29013bf0 100644 --- a/ui/app/AppLayouts/Chat/panels/communities/CommunityProfilePopupInviteFriendsPanel.qml +++ b/ui/app/AppLayouts/Chat/panels/communities/CommunityProfilePopupInviteFriendsPanel.qml @@ -19,7 +19,6 @@ Column { property var rootStore property var contactsStore - property var communitySectionModule property var community property alias contactListSearch: contactFieldAndList @@ -55,7 +54,6 @@ Column { anchors.horizontalCenter: parent.horizontalCenter width: parent.width - 32 contactsStore: root.contactsStore - communityModule: root.communitySectionModule community: root.community showCheckbox: true hideCommunityMembers: true diff --git a/ui/app/AppLayouts/Chat/popups/ContactRequestsPopup.qml b/ui/app/AppLayouts/Chat/popups/ContactRequestsPopup.qml index 5ee8282b73..b26b0a4451 100644 --- a/ui/app/AppLayouts/Chat/popups/ContactRequestsPopup.qml +++ b/ui/app/AppLayouts/Chat/popups/ContactRequestsPopup.qml @@ -32,14 +32,14 @@ ModalPopup { delegate: ContactRequestPanel { contactPubKey: model.pubKey - contactName: model.name + contactName: model.displayName contactIcon: model.icon onOpenProfilePopup: { Global.openProfilePopup(model.pubKey) } onBlockContactActionTriggered: { - blockContactConfirmationDialog.contactName = model.name + blockContactConfirmationDialog.contactName = model.displayName blockContactConfirmationDialog.contactAddress = model.pubKey blockContactConfirmationDialog.open() } diff --git a/ui/app/AppLayouts/Chat/popups/community/CommunityProfilePopup.qml b/ui/app/AppLayouts/Chat/popups/community/CommunityProfilePopup.qml index 6f199a2c72..a3ab591867 100644 --- a/ui/app/AppLayouts/Chat/popups/community/CommunityProfilePopup.qml +++ b/ui/app/AppLayouts/Chat/popups/community/CommunityProfilePopup.qml @@ -93,7 +93,6 @@ StatusModal { //% "Invite friends" headerTitle: qsTrId("invite-friends") community: root.community - communitySectionModule: root.communitySectionModule contactsStore: root.contactsStore rootStore: root.store diff --git a/ui/app/AppLayouts/Chat/popups/community/InviteFriendsToCommunityPopup.qml b/ui/app/AppLayouts/Chat/popups/community/InviteFriendsToCommunityPopup.qml index 4877049cc7..9b0a432d54 100644 --- a/ui/app/AppLayouts/Chat/popups/community/InviteFriendsToCommunityPopup.qml +++ b/ui/app/AppLayouts/Chat/popups/community/InviteFriendsToCommunityPopup.qml @@ -35,6 +35,9 @@ StatusModal { contentItem.contactListSearch.noContactsRect.visible = !contentItem.contactListSearch.existingContacts.visible; } + margins: 32 + height: 550 + //% "Invite friends" header.title: qsTrId("invite-friends") @@ -51,7 +54,6 @@ StatusModal { contentItem: CommunityProfilePopupInviteFriendsPanel { id: contactFieldAndList rootStore: popup.rootStore - communitySectionModule: popup.communitySectionModule contactsStore: popup.contactsStore community: popup.community } diff --git a/ui/app/AppLayouts/Chat/views/CommunitySettingsView.qml b/ui/app/AppLayouts/Chat/views/CommunitySettingsView.qml index d06465ebf8..d5e39f4e90 100644 --- a/ui/app/AppLayouts/Chat/views/CommunitySettingsView.qml +++ b/ui/app/AppLayouts/Chat/views/CommunitySettingsView.qml @@ -153,8 +153,7 @@ StatusAppTwoPanelLayout { onInviteNewPeopleClicked: { Global.openPopup(inviteFriendsToCommunityPopup, { community: root.community, - hasAddedContacts: root.hasAddedContacts, - communitySectionModule: root.chatCommunitySectionModule + hasAddedContacts: root.hasAddedContacts }) } @@ -231,7 +230,7 @@ StatusAppTwoPanelLayout { InviteFriendsToCommunityPopup { anchors.centerIn: parent rootStore: root.rootStore - contactsStore: root.rootStore.contactStore + contactsStore: root.rootStore.contactsStore onClosed: { destroy() } diff --git a/ui/imports/shared/controls/ContactsListAndSearch.qml b/ui/imports/shared/controls/ContactsListAndSearch.qml index 8d3e4de550..abb5f210e9 100644 --- a/ui/imports/shared/controls/ContactsListAndSearch.qml +++ b/ui/imports/shared/controls/ContactsListAndSearch.qml @@ -21,7 +21,6 @@ Item { property var rootStore property var contactsStore property var community - property var communityModule property string validationError: "" property string successMessage: "" @@ -182,7 +181,6 @@ Item { contactsStore: root.contactsStore community: root.community - communityModule: root.communityModule visible: showContactList hideCommunityMembers: root.hideCommunityMembers anchors.topMargin: this.height > 0 ? Style.current.halfPadding : 0 @@ -211,7 +209,7 @@ Item { root.pubKeys = pubKeysCopy chatKey.hasValidSearchResult = false - userClicked(contact.pubKey, contact.isContact, contact.name, contact.address) + userClicked(contact.pubKey, contact.isContact, contact.alias, contact.address) } expanded: !searchResults.loading && pubKey === "" && !searchResults.showProfileNotFoundMessage } diff --git a/ui/imports/shared/views/ExistingContacts.qml b/ui/imports/shared/views/ExistingContacts.qml index 5e269b9c88..b66254ed16 100644 --- a/ui/imports/shared/views/ExistingContacts.qml +++ b/ui/imports/shared/views/ExistingContacts.qml @@ -16,7 +16,6 @@ Item { property var contactsStore property var community - property var communityModule property string filterText: "" property bool expanded: true @@ -47,17 +46,19 @@ Item { showCheckbox: root.showCheckbox isChecked: root.pubKeys.indexOf(model.pubKey) > -1 pubKey: model.pubKey - isContact: model.isMutualContact + isContact: model.isContact isUser: false - name: model.name + name: model.displayName image: model.icon isVisible: { - return model.isMutualContact && !model.isBlocked && (root.filterText === "" || - root.matchesAlias(model.name.toLowerCase(), root.filterText.toLowerCase()) || - model.name.toLowerCase().includes(root.filterText.toLowerCase()) || + return model.isContact && !model.isBlocked && (root.filterText === "" || + root.matchesAlias(model.alias.toLowerCase(), root.filterText.toLowerCase()) || + model.displayName.toLowerCase().includes(root.filterText.toLowerCase()) || + model.ensName.toLowerCase().includes(root.filterText.toLowerCase()) || + model.localNickname.toLowerCase().includes(root.filterText.toLowerCase()) || model.pubKey.toLowerCase().includes(root.filterText.toLowerCase())) && (!root.hideCommunityMembers || - !root.communityModule.hasMember(commmunity.id, model.pubKey)) + !root.community.hasMember(model.pubKey)) } onContactClicked: function () { root.contactClicked(model) diff --git a/ui/imports/shared/views/SearchResults.qml b/ui/imports/shared/views/SearchResults.qml index a340a3f9da..4210fe9aa3 100644 --- a/ui/imports/shared/views/SearchResults.qml +++ b/ui/imports/shared/views/SearchResults.qml @@ -87,7 +87,7 @@ Item { anchors.verticalCenter: parent.verticalCenter anchors.left: parent.left anchors.leftMargin: Style.current.padding - name: root.userName + name: root.username } StyledText {