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/chat): display correct identicon for reply 

fixes #2959
This commit is contained in:
Anthony Laibe 2021-07-28 11:52:25 +02:00 committed by Iuri Matias
parent 06fd450545
commit 9893dbb00c
3 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
ui/app/AppLayouts/Chat/ChatColumn/.ChatMessages.qml.swp Normal file
View File

Binary file not shown.

18
ui/app/AppLayouts/Chat/ChatColumn/Message.qml
View File

@ -186,7 +186,7 @@ Item {
}
}
property var clickMessage: function(isProfileClick, isSticker = false, isImage = false, image = null, emojiOnly = false, hideEmojiPicker = false) {
property var clickMessage: function(isProfileClick, isSticker = false, isImage = false, image = null, emojiOnly = false, hideEmojiPicker = false, isReply = false) {
if (placeholderMessage || activityCenterMessage) {
return
}
@ -200,11 +200,10 @@ Item {
SelectedMessage.set(messageId, fromAuthor);
}
// Get contact nickname
let nickname = appMain.getUserNickname(fromAuthor)
messageContextMenu.messageId = root.messageId;
messageContextMenu.linkUrls = root.linkUrls;
messageContextMenu.messageId = root.messageId
messageContextMenu.contentType = root.contentType
messageContextMenu.linkUrls = root.linkUrls;
messageContextMenu.isProfile = !!isProfileClick;
messageContextMenu.isCurrentUser = root.isCurrentUser
messageContextMenu.isText = root.isText
@ -214,6 +213,15 @@ Item {
messageContextMenu.pinnedMessage = pinnedMessage;
messageContextMenu.isCurrentUser = isCurrentUser;
messageContextMenu.show(userName, fromAuthor, root.profileImageSource || identicon, plainText, nickname, emojiReactionsModel);
if (isReply) {
let nickname = appMain.getUserNickname(repliedMessageAuthor)
messageContextMenu.show(repliedMessageAuthor, repliedMessageAuthorPubkey, repliedMessageUserImage || repliedMessageUserIdenticon, plainText, nickname, emojiReactionsModel);
} else {
let nickname = appMain.getUserNickname(fromAuthor)
messageContextMenu.show(userName, fromAuthor, root.profileImageSource || identicon, plainText, nickname, emojiReactionsModel);
}
// Position the center of the menu where the mouse is
if (messageContextMenu.x + messageContextMenu.width + Style.current.padding < root.width) {
messageContextMenu.x = messageContextMenu.x - messageContextMenu.width / 2;

2
ui/app/AppLayouts/Chat/ChatColumn/MessageComponents/UserImage.qml
View File

@ -40,7 +40,7 @@ Loader {
acceptedButtons: Qt.LeftButton | Qt.RightButton
anchors.fill: parent
onClicked: {
clickMessage(true)
clickMessage(true, false, false, null, false, false, isReplyImage)
}
}
}