mirror of
https://github.com/status-im/status-desktop.git
synced 2025-01-10 14:26:34 +00:00
parent
496d3c8441
commit
2b1945425c
@ -212,6 +212,7 @@ Item {
|
|||||||
messageContextMenu.emojiOnly = emojiOnly;
|
messageContextMenu.emojiOnly = emojiOnly;
|
||||||
messageContextMenu.hideEmojiPicker = hideEmojiPicker;
|
messageContextMenu.hideEmojiPicker = hideEmojiPicker;
|
||||||
messageContextMenu.pinnedMessage = pinnedMessage;
|
messageContextMenu.pinnedMessage = pinnedMessage;
|
||||||
|
messageContextMenu.isCurrentUser = isCurrentUser;
|
||||||
messageContextMenu.show(userName, fromAuthor, root.profileImageSource || identicon, plainText, nickname, emojiReactionsModel);
|
messageContextMenu.show(userName, fromAuthor, root.profileImageSource || identicon, plainText, nickname, emojiReactionsModel);
|
||||||
// Position the center of the menu where the mouse is
|
// Position the center of the menu where the mouse is
|
||||||
if (messageContextMenu.x + messageContextMenu.width + Style.current.padding < root.width) {
|
if (messageContextMenu.x + messageContextMenu.width + Style.current.padding < root.width) {
|
||||||
|
@ -112,7 +112,7 @@ PopupMenu {
|
|||||||
|
|
||||||
StyledText {
|
StyledText {
|
||||||
id: username
|
id: username
|
||||||
text: Utils.removeStatusEns(userName)
|
text: Utils.removeStatusEns(isCurrentUser ? profileModel.ens.preferredUsername || userName : userName)
|
||||||
elide: Text.ElideRight
|
elide: Text.ElideRight
|
||||||
maximumLineCount: 3
|
maximumLineCount: 3
|
||||||
horizontalAlignment: Text.AlignHCenter
|
horizontalAlignment: Text.AlignHCenter
|
||||||
|
@ -24,6 +24,7 @@ ModalPopup {
|
|||||||
property bool isEnsVerified: false
|
property bool isEnsVerified: false
|
||||||
property bool noFooter: false
|
property bool noFooter: false
|
||||||
property bool isBlocked: false
|
property bool isBlocked: false
|
||||||
|
property bool isCurrentUser: false
|
||||||
|
|
||||||
signal blockButtonClicked(name: string, address: string)
|
signal blockButtonClicked(name: string, address: string)
|
||||||
signal unblockButtonClicked(name: string, address: string)
|
signal unblockButtonClicked(name: string, address: string)
|
||||||
@ -46,7 +47,7 @@ ModalPopup {
|
|||||||
isEnsVerified = chatsModel.ensView.isEnsVerified(this.fromAuthor)
|
isEnsVerified = chatsModel.ensView.isEnsVerified(this.fromAuthor)
|
||||||
isBlocked = profileModel.contacts.isContactBlocked(this.fromAuthor);
|
isBlocked = profileModel.contacts.isContactBlocked(this.fromAuthor);
|
||||||
alias = chatsModel.alias(this.fromAuthor) || ""
|
alias = chatsModel.alias(this.fromAuthor) || ""
|
||||||
|
isCurrentUser = profileModel.profile.pubKey === this.fromAuthor
|
||||||
noFooter = !showFooter;
|
noFooter = !showFooter;
|
||||||
popup.open()
|
popup.open()
|
||||||
}
|
}
|
||||||
@ -67,7 +68,7 @@ ModalPopup {
|
|||||||
|
|
||||||
StyledText {
|
StyledText {
|
||||||
id: profileName
|
id: profileName
|
||||||
text: Utils.removeStatusEns(userName)
|
text: Utils.removeStatusEns(isCurrentUser ? profileModel.ens.preferredUsername || userName : userName)
|
||||||
elide: Text.ElideRight
|
elide: Text.ElideRight
|
||||||
anchors.top: parent.top
|
anchors.top: parent.top
|
||||||
anchors.topMargin: Style.current.padding
|
anchors.topMargin: Style.current.padding
|
||||||
@ -137,9 +138,9 @@ ModalPopup {
|
|||||||
id: ensText
|
id: ensText
|
||||||
//% "ENS username"
|
//% "ENS username"
|
||||||
label: qsTrId("ens-username")
|
label: qsTrId("ens-username")
|
||||||
text: userName
|
text: isCurrentUser ? profileModel.ens.preferredUsername || userName : userName
|
||||||
anchors.top: parent.top
|
anchors.top: parent.top
|
||||||
visible: isEnsVerified
|
visible: isEnsVerified || profileModel.ens.preferredUsername !== ""
|
||||||
height: visible ? implicitHeight : 0
|
height: visible ? implicitHeight : 0
|
||||||
textToCopy: userName
|
textToCopy: userName
|
||||||
}
|
}
|
||||||
@ -187,10 +188,36 @@ ModalPopup {
|
|||||||
id: valueShareURL
|
id: valueShareURL
|
||||||
//% "Share Profile URL"
|
//% "Share Profile URL"
|
||||||
label: qsTrId("share-profile-url")
|
label: qsTrId("share-profile-url")
|
||||||
text: Constants.userLinkPrefix + fromAuthor.substr(0, 4) + "..." + fromAuthor.substr(fromAuthor.length - 5)
|
text: {
|
||||||
|
let user = ""
|
||||||
|
if (isCurrentUser) {
|
||||||
|
user = profileModel.ens.preferredUsername
|
||||||
|
} else {
|
||||||
|
if (isEnsVerified) {
|
||||||
|
user = userName.startsWith("@") ? userName.substring(1) : userName
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (user === ""){
|
||||||
|
user = fromAuthor.substr(0, 4) + "..." + fromAuthor.substr(fromAuthor.length - 5)
|
||||||
|
}
|
||||||
|
return Constants.userLinkPrefix + user;
|
||||||
|
}
|
||||||
anchors.top: separator.top
|
anchors.top: separator.top
|
||||||
anchors.topMargin: popup.innerMargin
|
anchors.topMargin: popup.innerMargin
|
||||||
textToCopy: Constants.userLinkPrefix + fromAuthor
|
textToCopy: {
|
||||||
|
let user = ""
|
||||||
|
if (isCurrentUser) {
|
||||||
|
user = profileModel.ens.preferredUsername
|
||||||
|
} else {
|
||||||
|
if (isEnsVerified) {
|
||||||
|
user = userName.startsWith("@") ? userName.substring(1) : userName
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (user === ""){
|
||||||
|
user = fromAuthor
|
||||||
|
}
|
||||||
|
return Constants.userLinkPrefix + user;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
Separator {
|
Separator {
|
||||||
|
@ -6,7 +6,7 @@ import "../../../../shared"
|
|||||||
import "../../../../shared/status"
|
import "../../../../shared/status"
|
||||||
|
|
||||||
Item {
|
Item {
|
||||||
property string ensName: profileModel.profile.preferredUsername || ""
|
property string ensName: profileModel.ens.preferredUsername || ""
|
||||||
property string username: profileModel.profile.username
|
property string username: profileModel.profile.username
|
||||||
property string pubkey: profileModel.profile.pubKey
|
property string pubkey: profileModel.profile.pubKey
|
||||||
|
|
||||||
@ -146,8 +146,8 @@ Item {
|
|||||||
TextWithLabel {
|
TextWithLabel {
|
||||||
//% "Share Profile URL"
|
//% "Share Profile URL"
|
||||||
label: qsTrId("share-profile-url")
|
label: qsTrId("share-profile-url")
|
||||||
text: `${Constants.userLinkPrefix}${pubkey.substring(0, 5)}...${pubkey.substring(pubkey.length - 5)}`
|
text: `${Constants.userLinkPrefix}${ensName !== "" ? ensName : (pubkey.substring(0, 5) + "..." + pubkey.substring(pubkey.length - 5))}`
|
||||||
textToCopy: Constants.userLinkPrefix + pubkey
|
textToCopy: Constants.userLinkPrefix + (ensName !== "" ? ensName : pubkey)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user