From 9dd35904eac4cbba1d56539b26592c30ac1b5271 Mon Sep 17 00:00:00 2001 From: Khushboo Mehta Date: Wed, 1 Sep 2021 19:38:39 +0200 Subject: [PATCH] fix(@desktop/chat) Right click on community member list should show member information fixes #3162 --- ui/app/AppLayouts/Chat/ChatColumn/UserList.qml | 6 +----- ui/app/AppLayouts/Chat/ChatLayout.qml | 9 +++++++-- .../Chat/CommunityComponents/CommunityUserList.qml | 1 + 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/ui/app/AppLayouts/Chat/ChatColumn/UserList.qml b/ui/app/AppLayouts/Chat/ChatColumn/UserList.qml index 34965a8087..8058479f63 100644 --- a/ui/app/AppLayouts/Chat/ChatColumn/UserList.qml +++ b/ui/app/AppLayouts/Chat/ChatColumn/UserList.qml @@ -13,17 +13,13 @@ import "../components" import "./samples/" import "./MessageComponents" import "../ContactsColumn" -import "../data" Item { id: root anchors.fill: parent property var userList property var currentTime - property var messageContextMenu: MessageContextMenu { - id: quickActionMessageOptionsMenu - reactionModel: EmojiReactions { } - } + property var messageContextMenu StyledText { id: titleText diff --git a/ui/app/AppLayouts/Chat/ChatLayout.qml b/ui/app/AppLayouts/Chat/ChatLayout.qml index 8a678f9d76..c0c392abfe 100644 --- a/ui/app/AppLayouts/Chat/ChatLayout.qml +++ b/ui/app/AppLayouts/Chat/ChatLayout.qml @@ -163,12 +163,12 @@ StatusAppThreePanelLayout { Component { id: communityUserListComponent - CommunityUserList { currentTime: chatColumn.currentTime } + CommunityUserList { currentTime: chatColumn.currentTime; messageContextMenu: quickActionMessageOptionsMenu } } Component { id: userListComponent - UserList { currentTime: chatColumn.currentTime; userList: chatColumn.userList;} + UserList { currentTime: chatColumn.currentTime; userList: chatColumn.userList; messageContextMenu: quickActionMessageOptionsMenu} } Component { @@ -217,6 +217,11 @@ StatusAppThreePanelLayout { removeContactConfirmationDialog.close(); } } + + MessageContextMenu { + id: quickActionMessageOptionsMenu + reactionModel: EmojiReactions { } + } } /*##^## diff --git a/ui/app/AppLayouts/Chat/CommunityComponents/CommunityUserList.qml b/ui/app/AppLayouts/Chat/CommunityComponents/CommunityUserList.qml index 2b2366b6a0..bd4c803781 100644 --- a/ui/app/AppLayouts/Chat/CommunityComponents/CommunityUserList.qml +++ b/ui/app/AppLayouts/Chat/CommunityComponents/CommunityUserList.qml @@ -19,6 +19,7 @@ Item { anchors.fill: parent property var userList property var currentTime + property var messageContextMenu property QtObject community: chatsModel.communities.activeCommunity StyledText {