From 5e8f3e6565acc3c4389dfe978d9c6c99ad36de4a Mon Sep 17 00:00:00 2001 From: Jonathan Rainville Date: Mon, 9 Jan 2023 14:57:53 -0500 Subject: [PATCH] fix(CreateChatView): enable mentioning people selected in create chat Fixes #8749 I couldn't fully test it because it needs #8991 to be fixed to see if the message is sent correctly --- ui/app/AppLayouts/Chat/views/ContactsColumnView.qml | 10 +++++----- ui/app/AppLayouts/Chat/views/CreateChatView.qml | 3 +++ 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/ui/app/AppLayouts/Chat/views/ContactsColumnView.qml b/ui/app/AppLayouts/Chat/views/ContactsColumnView.qml index ddc22ae91a..2170302867 100644 --- a/ui/app/AppLayouts/Chat/views/ContactsColumnView.qml +++ b/ui/app/AppLayouts/Chat/views/ContactsColumnView.qml @@ -67,10 +67,10 @@ Item { Layout.alignment: Qt.AlignVCenter icon.name: "public-chat" icon.color: Theme.palette.directColor1 - icon.height: editBtn.icon.height - icon.width: editBtn.icon.width - implicitWidth: editBtn.implicitWidth - implicitHeight: editBtn.implicitHeight + icon.height: startChatButton.icon.height + icon.width: startChatButton.icon.width + implicitWidth: startChatButton.implicitWidth + implicitHeight: startChatButton.implicitHeight type: StatusRoundButton.Type.Tertiary onClicked: Global.openPopup(publicChatPopupComponent) @@ -84,7 +84,7 @@ Item { } StatusIconTabButton { - id: editBtn + id: startChatButton Layout.alignment: Qt.AlignVCenter objectName: "startChatButton" icon.name: "edit" diff --git a/ui/app/AppLayouts/Chat/views/CreateChatView.qml b/ui/app/AppLayouts/Chat/views/CreateChatView.qml index 10d067bc6f..0887fb01cf 100644 --- a/ui/app/AppLayouts/Chat/views/CreateChatView.qml +++ b/ui/app/AppLayouts/Chat/views/CreateChatView.qml @@ -156,6 +156,9 @@ Page { emojiPopup: root.emojiPopup stickersPopup: root.stickersPopup closeGifPopupAfterSelection: true + usersStore: ({ + usersModel: membersSelector.model + }) onSendTransactionCommandButtonClicked: { root.rootStore.createChatStartSendTransactionProcess = true; membersSelector.createChat();