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:
parent
266e10026d
commit
3aba152206
|
@ -19,7 +19,6 @@ Column {
|
||||||
|
|
||||||
property var rootStore
|
property var rootStore
|
||||||
property var contactsStore
|
property var contactsStore
|
||||||
property var communitySectionModule
|
|
||||||
property var community
|
property var community
|
||||||
property alias contactListSearch: contactFieldAndList
|
property alias contactListSearch: contactFieldAndList
|
||||||
|
|
||||||
|
@ -55,7 +54,6 @@ Column {
|
||||||
anchors.horizontalCenter: parent.horizontalCenter
|
anchors.horizontalCenter: parent.horizontalCenter
|
||||||
width: parent.width - 32
|
width: parent.width - 32
|
||||||
contactsStore: root.contactsStore
|
contactsStore: root.contactsStore
|
||||||
communityModule: root.communitySectionModule
|
|
||||||
community: root.community
|
community: root.community
|
||||||
showCheckbox: true
|
showCheckbox: true
|
||||||
hideCommunityMembers: true
|
hideCommunityMembers: true
|
||||||
|
|
|
@ -32,14 +32,14 @@ ModalPopup {
|
||||||
|
|
||||||
delegate: ContactRequestPanel {
|
delegate: ContactRequestPanel {
|
||||||
contactPubKey: model.pubKey
|
contactPubKey: model.pubKey
|
||||||
contactName: model.name
|
contactName: model.displayName
|
||||||
contactIcon: model.icon
|
contactIcon: model.icon
|
||||||
|
|
||||||
onOpenProfilePopup: {
|
onOpenProfilePopup: {
|
||||||
Global.openProfilePopup(model.pubKey)
|
Global.openProfilePopup(model.pubKey)
|
||||||
}
|
}
|
||||||
onBlockContactActionTriggered: {
|
onBlockContactActionTriggered: {
|
||||||
blockContactConfirmationDialog.contactName = model.name
|
blockContactConfirmationDialog.contactName = model.displayName
|
||||||
blockContactConfirmationDialog.contactAddress = model.pubKey
|
blockContactConfirmationDialog.contactAddress = model.pubKey
|
||||||
blockContactConfirmationDialog.open()
|
blockContactConfirmationDialog.open()
|
||||||
}
|
}
|
||||||
|
|
|
@ -93,7 +93,6 @@ StatusModal {
|
||||||
//% "Invite friends"
|
//% "Invite friends"
|
||||||
headerTitle: qsTrId("invite-friends")
|
headerTitle: qsTrId("invite-friends")
|
||||||
community: root.community
|
community: root.community
|
||||||
communitySectionModule: root.communitySectionModule
|
|
||||||
contactsStore: root.contactsStore
|
contactsStore: root.contactsStore
|
||||||
rootStore: root.store
|
rootStore: root.store
|
||||||
|
|
||||||
|
|
|
@ -35,6 +35,9 @@ StatusModal {
|
||||||
contentItem.contactListSearch.noContactsRect.visible = !contentItem.contactListSearch.existingContacts.visible;
|
contentItem.contactListSearch.noContactsRect.visible = !contentItem.contactListSearch.existingContacts.visible;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
margins: 32
|
||||||
|
height: 550
|
||||||
|
|
||||||
//% "Invite friends"
|
//% "Invite friends"
|
||||||
header.title: qsTrId("invite-friends")
|
header.title: qsTrId("invite-friends")
|
||||||
|
|
||||||
|
@ -51,7 +54,6 @@ StatusModal {
|
||||||
contentItem: CommunityProfilePopupInviteFriendsPanel {
|
contentItem: CommunityProfilePopupInviteFriendsPanel {
|
||||||
id: contactFieldAndList
|
id: contactFieldAndList
|
||||||
rootStore: popup.rootStore
|
rootStore: popup.rootStore
|
||||||
communitySectionModule: popup.communitySectionModule
|
|
||||||
contactsStore: popup.contactsStore
|
contactsStore: popup.contactsStore
|
||||||
community: popup.community
|
community: popup.community
|
||||||
}
|
}
|
||||||
|
|
|
@ -153,8 +153,7 @@ StatusAppTwoPanelLayout {
|
||||||
onInviteNewPeopleClicked: {
|
onInviteNewPeopleClicked: {
|
||||||
Global.openPopup(inviteFriendsToCommunityPopup, {
|
Global.openPopup(inviteFriendsToCommunityPopup, {
|
||||||
community: root.community,
|
community: root.community,
|
||||||
hasAddedContacts: root.hasAddedContacts,
|
hasAddedContacts: root.hasAddedContacts
|
||||||
communitySectionModule: root.chatCommunitySectionModule
|
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -231,7 +230,7 @@ StatusAppTwoPanelLayout {
|
||||||
InviteFriendsToCommunityPopup {
|
InviteFriendsToCommunityPopup {
|
||||||
anchors.centerIn: parent
|
anchors.centerIn: parent
|
||||||
rootStore: root.rootStore
|
rootStore: root.rootStore
|
||||||
contactsStore: root.rootStore.contactStore
|
contactsStore: root.rootStore.contactsStore
|
||||||
onClosed: {
|
onClosed: {
|
||||||
destroy()
|
destroy()
|
||||||
}
|
}
|
||||||
|
|
|
@ -21,7 +21,6 @@ Item {
|
||||||
property var rootStore
|
property var rootStore
|
||||||
property var contactsStore
|
property var contactsStore
|
||||||
property var community
|
property var community
|
||||||
property var communityModule
|
|
||||||
|
|
||||||
property string validationError: ""
|
property string validationError: ""
|
||||||
property string successMessage: ""
|
property string successMessage: ""
|
||||||
|
@ -182,7 +181,6 @@ Item {
|
||||||
|
|
||||||
contactsStore: root.contactsStore
|
contactsStore: root.contactsStore
|
||||||
community: root.community
|
community: root.community
|
||||||
communityModule: root.communityModule
|
|
||||||
visible: showContactList
|
visible: showContactList
|
||||||
hideCommunityMembers: root.hideCommunityMembers
|
hideCommunityMembers: root.hideCommunityMembers
|
||||||
anchors.topMargin: this.height > 0 ? Style.current.halfPadding : 0
|
anchors.topMargin: this.height > 0 ? Style.current.halfPadding : 0
|
||||||
|
@ -211,7 +209,7 @@ Item {
|
||||||
root.pubKeys = pubKeysCopy
|
root.pubKeys = pubKeysCopy
|
||||||
|
|
||||||
chatKey.hasValidSearchResult = false
|
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
|
expanded: !searchResults.loading && pubKey === "" && !searchResults.showProfileNotFoundMessage
|
||||||
}
|
}
|
||||||
|
|
|
@ -16,7 +16,6 @@ Item {
|
||||||
|
|
||||||
property var contactsStore
|
property var contactsStore
|
||||||
property var community
|
property var community
|
||||||
property var communityModule
|
|
||||||
|
|
||||||
property string filterText: ""
|
property string filterText: ""
|
||||||
property bool expanded: true
|
property bool expanded: true
|
||||||
|
@ -47,17 +46,19 @@ Item {
|
||||||
showCheckbox: root.showCheckbox
|
showCheckbox: root.showCheckbox
|
||||||
isChecked: root.pubKeys.indexOf(model.pubKey) > -1
|
isChecked: root.pubKeys.indexOf(model.pubKey) > -1
|
||||||
pubKey: model.pubKey
|
pubKey: model.pubKey
|
||||||
isContact: model.isMutualContact
|
isContact: model.isContact
|
||||||
isUser: false
|
isUser: false
|
||||||
name: model.name
|
name: model.displayName
|
||||||
image: model.icon
|
image: model.icon
|
||||||
isVisible: {
|
isVisible: {
|
||||||
return model.isMutualContact && !model.isBlocked && (root.filterText === "" ||
|
return model.isContact && !model.isBlocked && (root.filterText === "" ||
|
||||||
root.matchesAlias(model.name.toLowerCase(), root.filterText.toLowerCase()) ||
|
root.matchesAlias(model.alias.toLowerCase(), root.filterText.toLowerCase()) ||
|
||||||
model.name.toLowerCase().includes(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())) &&
|
model.pubKey.toLowerCase().includes(root.filterText.toLowerCase())) &&
|
||||||
(!root.hideCommunityMembers ||
|
(!root.hideCommunityMembers ||
|
||||||
!root.communityModule.hasMember(commmunity.id, model.pubKey))
|
!root.community.hasMember(model.pubKey))
|
||||||
}
|
}
|
||||||
onContactClicked: function () {
|
onContactClicked: function () {
|
||||||
root.contactClicked(model)
|
root.contactClicked(model)
|
||||||
|
|
|
@ -87,7 +87,7 @@ Item {
|
||||||
anchors.verticalCenter: parent.verticalCenter
|
anchors.verticalCenter: parent.verticalCenter
|
||||||
anchors.left: parent.left
|
anchors.left: parent.left
|
||||||
anchors.leftMargin: Style.current.padding
|
anchors.leftMargin: Style.current.padding
|
||||||
name: root.userName
|
name: root.username
|
||||||
}
|
}
|
||||||
|
|
||||||
StyledText {
|
StyledText {
|
||||||
|
|
Loading…
Reference in New Issue