status-im/status-desktop
2
0
Fork 0
mirror of https://github.com/status-im/status-desktop.git synced 2025-02-18 09:37:59 +00:00
Code Issues Projects Releases Wiki Activity

fix: user display name discrepancies

Browse Source 
restore taking local nickname into account in various places
This commit is contained in:
Lukáš Tinkl 2023-01-20 16:33:21 +01:00 committed by Lukáš Tinkl
parent 0fb954b640
commit a55a207bb2
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/app/modules/shared_models/message_item.nim
View File

@ -146,7 +146,8 @@ proc initItem*(
if result.quotedMessageAuthorAvatar == "": if result.quotedMessageAuthorAvatar == "":
result.quotedMessageAuthorAvatar = quotedMessageDiscordMessage.author.avatarUrl result.quotedMessageAuthorAvatar = quotedMessageDiscordMessage.author.avatarUrl
else: else:
result.quotedMessageAuthorDisplayName = quotedMessageAuthorDetails.details.displayName result.quotedMessageAuthorDisplayName = if quotedMessageAuthorDetails.details.localNickname != "": quotedMessageAuthorDetails.details.localNickname
else: quotedMessageAuthorDetails.details.displayName
result.quotedMessageAuthorAvatar = quotedMessageAuthorDetails.details.image.thumbnail result.quotedMessageAuthorAvatar = quotedMessageAuthorDetails.details.image.thumbnail
if contentType == ContentType.DiscordMessage: if contentType == ContentType.DiscordMessage:

2
ui/app/AppLayouts/Chat/panels/UserListPanel.qml
View File

@ -96,7 +96,7 @@ Item {
messageContextMenu.isProfile = true messageContextMenu.isProfile = true
messageContextMenu.myPublicKey = userProfile.pubKey messageContextMenu.myPublicKey = userProfile.pubKey
messageContextMenu.selectedUserPublicKey = model.pubKey messageContextMenu.selectedUserPublicKey = model.pubKey
messageContextMenu.selectedUserDisplayName = model.displayName messageContextMenu.selectedUserDisplayName = nickName || userName
messageContextMenu.selectedUserIcon = model.icon messageContextMenu.selectedUserIcon = model.icon
messageContextMenu.popup(4, 4) messageContextMenu.popup(4, 4)
} else if (mouse.button === Qt.LeftButton && !!messageContextMenu) { } else if (mouse.button === Qt.LeftButton && !!messageContextMenu) {

2
ui/imports/shared/views/chat/MessageView.qml
View File

@ -641,7 +641,7 @@ Loader {
sender.isContact: quotedMessageAuthorDetailsIsContact sender.isContact: quotedMessageAuthorDetailsIsContact
sender.displayName: quotedMessageAuthorDetailsDisplayName sender.displayName: quotedMessageAuthorDetailsDisplayName
sender.isEnsVerified: quotedMessageAuthorDetailsEnsVerified sender.isEnsVerified: quotedMessageAuthorDetailsEnsVerified
sender.secondaryName: quotedMessageAuthorDetailsName || "" sender.secondaryName: quotedMessageAuthorDetailsName
sender.profileImage { sender.profileImage {
width: 20 width: 20
height: 20 height: 20