status-im
/
status-desktop
mirror of https://github.com/status-im/status-desktop.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

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
This commit is contained in:
Sale Djenic 2022-06-20 15:27:00 +02:00 committed by saledjenic
parent 266e10026d
commit 3aba152206
8 changed files with 17 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ui/app/AppLayouts/Chat/panels/communities/CommunityProfilePopupInviteFriendsPanel.qml
View File

@ -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

4
ui/app/AppLayouts/Chat/popups/ContactRequestsPopup.qml
View File

@ -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()
}

1
ui/app/AppLayouts/Chat/popups/community/CommunityProfilePopup.qml
View File

@ -93,7 +93,6 @@ StatusModal {
//% "Invite friends"
headerTitle: qsTrId("invite-friends")
community: root.community
communitySectionModule: root.communitySectionModule
contactsStore: root.contactsStore
rootStore: root.store

4
ui/app/AppLayouts/Chat/popups/community/InviteFriendsToCommunityPopup.qml
View File

@ -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
}

5
ui/app/AppLayouts/Chat/views/CommunitySettingsView.qml
View File

@ -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()
}

4
ui/imports/shared/controls/ContactsListAndSearch.qml
View File

@ -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
}

15
ui/imports/shared/views/ExistingContacts.qml
View File

@ -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)

2
ui/imports/shared/views/SearchResults.qml
View File

@ -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 {