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(Profile flow): Send a contact request (CR) 

- make `SendContactRequestModal.qml` use the common dialog, use the
contact details if we already have it
- make some minimal changes to the "Send ID verification" flow since it
shares the same dialog
- simplify the `CommonContactDialog.qml` footer/buttons handling
- adjust the menu item texts
- emit toasts when the action is performed
- display a tooltip over the compressed elided key

Fixes #13518
This commit is contained in:
Lukáš Tinkl 2024-02-16 12:56:29 +01:00 committed by Lukáš Tinkl
parent 610a9dc115
commit 2fa65968c0
13 changed files with 129 additions and 138 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
storybook/pages/ProfileDialogViewPage.qml
View File

@ -78,10 +78,10 @@ SplitView {
localNickname: localNickname.text, localNickname: localNickname.text,
thumbnailImage: "", thumbnailImage: "",
largeImage: userImage.checked ? Style.png("status-logo") : "", largeImage: userImage.checked ? Style.png("status-logo") : "",
isContact: isContact.checked, isContact: ctrlIsContact.checked,
isBlocked: isBlocked.checked, isBlocked: ctrlIsBlocked.checked,
isSyncing: false, isSyncing: false,
trustStatus: trustStatus.currentValue, trustStatus: ctrlTrustStatus.currentValue,
verificationStatus: Constants.verificationStatus.unverified, verificationStatus: Constants.verificationStatus.unverified,
incomingVerificationStatus: Constants.verificationStatus.unverified, incomingVerificationStatus: Constants.verificationStatus.unverified,
contactRequestState: ctrlContactRequestState.currentValue, contactRequestState: ctrlContactRequestState.currentValue,
@ -122,11 +122,22 @@ SplitView {
} }
function blockContact(publicKey) { function blockContact(publicKey) {
logs.logEvent("rootStore::contactsStore::blockContact", ["publicKey"], arguments) logs.logEvent("rootStore::contactStore::blockContact", ["publicKey"], arguments)
ctrlIsBlocked.checked = true
} }
function unblockContact(publicKey) { function unblockContact(publicKey) {
logs.logEvent("rootStore::contactsStore::unblockContact", ["publicKey"], arguments) logs.logEvent("rootStore::contactStore::unblockContact", ["publicKey"], arguments)
ctrlIsBlocked.checked = false
}
function sendContactRequest(publicKey, message) {
logs.logEvent("rootStore::contactStore::sendContactRequest", ["publicKey", "message"], arguments)
ctrlContactRequestState.currentIndex = ctrlContactRequestState.indexOfValue(Constants.ContactRequestState.Sent)
}
function sendVerificationRequest(publicKey, challenge) {
logs.logEvent("rootStore::contactStore::sendVerificationRequest", ["publicKey", "challenge"], arguments)
} }
} }
} }
@ -194,6 +205,7 @@ SplitView {
function markUntrustworthy(publicKey) { function markUntrustworthy(publicKey) {
logs.logEvent("contactsStore::markUntrustworthy", ["publicKey"], arguments) logs.logEvent("contactsStore::markUntrustworthy", ["publicKey"], arguments)
ctrlTrustStatus.currentIndex = ctrlTrustStatus.indexOfValue(Constants.trustStatus.untrustworthy)
} }
function removeContact(publicKey) { function removeContact(publicKey) {
@ -338,7 +350,7 @@ SplitView {
Layout.fillWidth: true Layout.fillWidth: true
enabled: !switchOwnProfile.checked enabled: !switchOwnProfile.checked
CheckBox { CheckBox {
id: isContact id: ctrlIsContact
enabled: true enabled: true
checked: ctrlContactRequestState.currentValue === Constants.ContactRequestState.Mutual checked: ctrlContactRequestState.currentValue === Constants.ContactRequestState.Mutual
text: "isContact" text: "isContact"
@ -356,7 +368,7 @@ SplitView {
] ]
} }
CheckBox { CheckBox {
id: isBlocked id: ctrlIsBlocked
text: "isBlocked" text: "isBlocked"
} }
} }
@ -365,7 +377,7 @@ SplitView {
enabled: !switchOwnProfile.checked enabled: !switchOwnProfile.checked
Label { text: "trustStatus:" } Label { text: "trustStatus:" }
ComboBox { ComboBox {
id: trustStatus id: ctrlTrustStatus
textRole: "text" textRole: "text"
valueRole: "value" valueRole: "value"
model: [ model: [

3
ui/app/AppLayouts/Chat/views/ChatMessagesView.qml
View File

@ -40,7 +40,6 @@ Item {
property bool isContactBlocked: false property bool isContactBlocked: false
property bool isChatBlocked: false property bool isChatBlocked: false
property bool isOneToOne: false property bool isOneToOne: false
property bool isActiveChannel: false
signal openStickerPackPopup(string stickerPackId) signal openStickerPackPopup(string stickerPackId)
signal showReplyArea(string messageId, string author) signal showReplyArea(string messageId, string author)
@ -391,7 +390,7 @@ Item {
anchors.horizontalCenter: parent ? parent.horizontalCenter : undefined anchors.horizontalCenter: parent ? parent.horizontalCenter : undefined
text: qsTr("Send Contact Request") text: qsTr("Send Contact Request")
onClicked: { onClicked: {
Global.openContactRequestPopup(root.chatId, null) Global.openContactRequestPopup(root.chatId, null, null)
} }
} }
} }

2
ui/app/AppLayouts/Chat/views/MembersSelectorView.qml
View File

@ -115,7 +115,7 @@ MembersSelectorBase {
if (root.model.count === 0 && !hasPendingContactRequest) { if (root.model.count === 0 && !hasPendingContactRequest) {
// List is empty and not a contact yet. Open the contact request popup // List is empty and not a contact yet. Open the contact request popup
Global.openContactRequestPopup(contactDetails.publicKey, Global.openContactRequestPopup(contactDetails.publicKey, contactDetails,
popup => popup.closed.connect(root.rejected)) popup => popup.closed.connect(root.rejected))
return return
} }

2
ui/app/AppLayouts/Profile/stores/ContactsStore.qml
View File

@ -80,6 +80,7 @@ QtObject {
function sendContactRequest(pubKey, message) { function sendContactRequest(pubKey, message) {
root.contactsModule.sendContactRequest(pubKey, message) root.contactsModule.sendContactRequest(pubKey, message)
Global.displaySuccessToastMessage(qsTr("Contact request sent"))
} }
function acceptContactRequest(pubKey, contactRequestId) { function acceptContactRequest(pubKey, contactRequestId) {
@ -100,6 +101,7 @@ QtObject {
function sendVerificationRequest(pubKey, challenge) { function sendVerificationRequest(pubKey, challenge) {
root.contactsModule.sendVerificationRequest(pubKey, challenge); root.contactsModule.sendVerificationRequest(pubKey, challenge);
Global.displaySuccessToastMessage(qsTr("ID verification request sent"))
} }
function cancelVerificationRequest(pubKey) { function cancelVerificationRequest(pubKey) {

26
ui/app/mainui/Popups.qml
View File

@ -157,15 +157,14 @@ QtObject {
openPopup(communityProfilePopup, { store: store, community: community, communitySectionModule: communitySectionModule}) openPopup(communityProfilePopup, { store: store, community: community, communitySectionModule: communitySectionModule})
} }
function openSendIDRequestPopup(publicKey, cb) { function openSendIDRequestPopup(publicKey, contactDetails, cb) {
const contactDetails = Utils.getContactDetailsAsJson(publicKey, false)
const mainDisplayName = ProfileUtils.displayName(contactDetails.localNickname, contactDetails.name, contactDetails.displayName, contactDetails.alias)
openPopup(sendIDRequestPopupComponent, { openPopup(sendIDRequestPopupComponent, {
userPublicKey: publicKey, publicKey: publicKey,
contactDetails: contactDetails, contactDetails: contactDetails,
title: qsTr("Verify %1's Identity").arg(mainDisplayName), title: qsTr("Request ID verification"),
challengeText: qsTr("Ask a question that only the real %1 will be able to answer e.g. a question about a shared experience, or ask %1 to enter a code or phrase you have sent to them via a different communication channel (phone, post, etc...).").arg(mainDisplayName), labelText: qsTr("Ask a question only they can answer"),
buttonText: qsTr("Send verification request") challengeText: qsTr("Ask your question..."),
buttonText: qsTr("Request ID verification")
}, cb) }, cb)
} }
@ -201,13 +200,12 @@ QtObject {
openPopup(inviteFriendsToCommunityPopup, { community: community, communitySectionModule: communitySectionModule }, cb) openPopup(inviteFriendsToCommunityPopup, { community: community, communitySectionModule: communitySectionModule }, cb)
} }
function openContactRequestPopup(publicKey, cb) { function openContactRequestPopup(publicKey, contactDetails, cb) {
const contactDetails = Utils.getContactDetailsAsJson(publicKey, false) let details = contactDetails ?? Utils.getContactDetailsAsJson(publicKey, false)
const popupProperties = { const popupProperties = {
userPublicKey: publicKey, publicKey: publicKey,
contactDetails: contactDetails contactDetails: details
} }
openPopup(sendContactRequestPopupComponent, popupProperties, cb) openPopup(sendContactRequestPopupComponent, popupProperties, cb)
} }
@ -393,7 +391,7 @@ QtObject {
id: sendIDRequestPopupComponent id: sendIDRequestPopupComponent
SendContactRequestModal { SendContactRequestModal {
rootStore: root.rootStore rootStore: root.rootStore
onAccepted: root.rootStore.profileSectionStore.contactsStore.sendVerificationRequest(userPublicKey, message) onAccepted: rootStore.contactStore.sendVerificationRequest(publicKey, message)
onClosed: destroy() onClosed: destroy()
} }
}, },
@ -413,7 +411,7 @@ QtObject {
SendContactRequestModal { SendContactRequestModal {
rootStore: root.rootStore rootStore: root.rootStore
onAccepted: root.rootStore.profileSectionStore.contactsStore.sendContactRequest(userPublicKey, message) onAccepted: rootStore.contactStore.sendContactRequest(publicKey, message)
onClosed: destroy() onClosed: destroy()
} }
}, },

2
ui/app/mainui/activitycenter/popups/ReviewContactRequestPopup.qml
View File

@ -56,7 +56,7 @@ StatusDialog {
sender: root.messageDetails.sender sender: root.messageDetails.sender
amISender: root.messageDetails.amISender amISender: root.messageDetails.amISender
messageOriginInfo: root.messageDetails.messageOriginInfo messageOriginInfo: root.messageDetails.messageOriginInfo
tertiaryDetail: Utils.getElidedCompressedPk(sender.id) tertiaryDetail: Utils.getCompressedPk(sender.id)
timestamp: root.timestamp timestamp: root.timestamp
} }

2
ui/app/mainui/activitycenter/views/ActivityNotificationContactRemoved.qml
View File

@ -49,6 +49,6 @@ ActivityNotificationMessage {
enabled: root.contactDetails && !root.contactDetails.added && !root.contactDetails.isContactRequestReceived enabled: root.contactDetails && !root.contactDetails.added && !root.contactDetails.isContactRequestReceived
size: StatusBaseButton.Size.Small size: StatusBaseButton.Size.Small
text: qsTr("Send Contact Request") text: qsTr("Send Contact Request")
onClicked: Global.openContactRequestPopup(root.contactId, null) onClicked: Global.openContactRequestPopup(root.contactId, root.contactDetails, null)
} }
} }

33
ui/imports/shared/popups/CommonContactDialog.qml
View File

@ -1,9 +1,11 @@
import QtQuick 2.15 import QtQuick 2.15
import QtQuick.Layouts 1.15 import QtQuick.Layouts 1.15
import QtQml.Models 2.15
import StatusQ.Core 0.1 import StatusQ.Core 0.1
import StatusQ.Core.Theme 0.1 import StatusQ.Core.Theme 0.1
import StatusQ.Components 0.1 import StatusQ.Components 0.1
import StatusQ.Controls 0.1
import StatusQ.Popups.Dialog 0.1 import StatusQ.Popups.Dialog 0.1
import utils 1.0 import utils 1.0
@ -18,27 +20,23 @@ StatusDialog {
default property alias content: contentLayout.children default property alias content: contentLayout.children
readonly property string originalDisplayName: d.optionalDisplayName property ObjectModel rightButtons
readonly property string mainDisplayName: ProfileUtils.displayName(contactDetails.localNickname, contactDetails.name,
contactDetails.displayName, contactDetails.alias)
readonly property string optionalDisplayName: ProfileUtils.displayName("", contactDetails.name, contactDetails.displayName, contactDetails.alias)
width: 480 width: 480
horizontalPadding: 16 horizontalPadding: 16
verticalPadding: 20 verticalPadding: 20
QtObject {
id: d
readonly property string mainDisplayName: ProfileUtils.displayName(contactDetails.localNickname, contactDetails.name,
contactDetails.displayName, contactDetails.alias)
readonly property string optionalDisplayName: ProfileUtils.displayName("", contactDetails.name, contactDetails.displayName, contactDetails.alias)
}
contentItem: ColumnLayout { contentItem: ColumnLayout {
RowLayout { RowLayout {
Layout.fillWidth: true Layout.fillWidth: true
spacing: Style.current.padding spacing: Style.current.padding
UserImage { UserImage {
name: d.mainDisplayName name: root.mainDisplayName
pubkey: root.publicKey pubkey: root.publicKey
image: Utils.addTimestampToURL(contactDetails.largeImage) image: Utils.addTimestampToURL(contactDetails.largeImage)
interactive: false interactive: false
@ -64,7 +62,7 @@ StatusDialog {
font.bold: true font.bold: true
font.pixelSize: 17 font.pixelSize: 17
elide: Text.ElideRight elide: Text.ElideRight
text: d.mainDisplayName text: root.mainDisplayName
} }
StatusContactVerificationIcons { StatusContactVerificationIcons {
id: verificationIcons id: verificationIcons
@ -83,7 +81,7 @@ StatusDialog {
id: contactSecondaryName id: contactSecondaryName
color: Theme.palette.baseColor1 color: Theme.palette.baseColor1
font.pixelSize: 13 font.pixelSize: 13
text: d.optionalDisplayName text: root.optionalDisplayName
visible: !!contactDetails.localNickname visible: !!contactDetails.localNickname
} }
Rectangle { Rectangle {
@ -97,6 +95,13 @@ StatusDialog {
font.pixelSize: 13 font.pixelSize: 13
color: Theme.palette.baseColor1 color: Theme.palette.baseColor1
text: Utils.getElidedCompressedPk(root.publicKey) text: Utils.getElidedCompressedPk(root.publicKey)
HoverHandler {
id: keyHoverHandler
}
StatusToolTip {
text: Utils.getCompressedPk(root.publicKey)
visible: keyHoverHandler.hovered
}
} }
} }
EmojiHash { EmojiHash {
@ -117,4 +122,8 @@ StatusDialog {
id: contentLayout id: contentLayout
} }
} }
footer: StatusDialogFooter {
rightButtons: root.rightButtons
}
} }

36
ui/imports/shared/popups/NicknamePopup.qml
View File

@ -60,25 +60,23 @@ CommonContactDialog {
font.pixelSize: Theme.tertiaryTextFontSize font.pixelSize: Theme.tertiaryTextFontSize
} }
footer: StatusDialogFooter { rightButtons: ObjectModel {
rightButtons: ObjectModel { StatusFlatButton {
StatusFlatButton { visible: !d.editMode
visible: !d.editMode text: qsTr("Cancel")
text: qsTr("Cancel") onClicked: root.close()
onClicked: root.close() }
} StatusFlatButton {
StatusFlatButton { visible: d.editMode
visible: d.editMode borderColor: "transparent"
borderColor: "transparent" type: StatusBaseButton.Type.Danger
type: StatusBaseButton.Type.Danger text: qsTr("Remove nickname")
text: qsTr("Remove nickname") onClicked: root.removeNicknameRequested()
onClicked: root.removeNicknameRequested() }
} StatusButton {
StatusButton { enabled: root.nickname !== nicknameInput.text && nicknameInput.valid
enabled: root.nickname !== nicknameInput.text && nicknameInput.valid text: d.editMode ? qsTr("Change nickname") : qsTr("Add nickname")
text: d.editMode ? qsTr("Change nickname") : qsTr("Add nickname") onClicked: root.editDone(nicknameInput.text)
onClicked: root.editDone(nicknameInput.text)
}
} }
} }
} }

95
ui/imports/shared/popups/SendContactRequestModal.qml
View File

@ -4,7 +4,6 @@ import QtQuick.Layouts 1.15
import QtQml.Models 2.15 import QtQml.Models 2.15
import utils 1.0 import utils 1.0
import shared.controls.chat 1.0
import StatusQ.Core 0.1 import StatusQ.Core 0.1
import StatusQ.Core.Theme 0.1 import StatusQ.Core.Theme 0.1
@ -12,42 +11,35 @@ import StatusQ.Controls 0.1
import StatusQ.Controls.Validators 0.1 import StatusQ.Controls.Validators 0.1
import StatusQ.Popups.Dialog 0.1 import StatusQ.Popups.Dialog 0.1
StatusDialog { CommonContactDialog {
id: root id: root
property var rootStore property var rootStore
required property string userPublicKey property string labelText: qsTr("Why should they accept your contact request?")
required property var contactDetails property string challengeText: qsTr("Write a short message telling them who you are...")
property string buttonText: qsTr("Send contact request")
property string challengeText: qsTr("Say who you are / why you want to become a contact...")
property string buttonText: qsTr("Send Contact Request")
signal accepted(string message) signal accepted(string message)
width: 480 title: qsTr("Send Contact Request")
horizontalPadding: Style.current.padding
verticalPadding: Style.current.bigPadding
title: qsTr("Send Contact Request to %1").arg(d.mainDisplayName)
onAboutToShow: { onAboutToShow: {
messageInput.input.edit.forceActiveFocus() messageInput.input.edit.forceActiveFocus()
// (request) update from mailserver // (request) update from mailserver
if (d.userDisplayName === "") { if (d.userDisplayName === "") {
root.rootStore.contactStore.requestContactInfo(root.userPublicKey) root.rootStore.contactStore.requestContactInfo(root.publicKey)
d.loadingContactDetails = true d.loadingContactDetails = true
} }
} }
QtObject { readonly property var d: QtObject {
id: d id: d
readonly property int maxMsgLength: 280 readonly property int maxMsgLength: 280
readonly property int minMsgLength: 1 readonly property int minMsgLength: 1
readonly property int msgHeight: 152 readonly property int msgHeight: 152
readonly property int contentSpacing: Style.current.halfPadding
property bool loadingContactDetails: false property bool loadingContactDetails: false
@ -62,62 +54,47 @@ StatusDialog {
readonly property var userIcon: contactDetails.largeImage readonly property var userIcon: contactDetails.largeImage
} }
Connections { readonly property var _conn: Connections {
target: root.rootStore.contactStore.contactsModule target: root.rootStore.contactStore.contactsModule
function onContactInfoRequestFinished(publicKey, ok) { function onContactInfoRequestFinished(publicKey, ok) {
if (publicKey !== root.userPublicKey) if (publicKey !== root.publicKey)
return return
if (ok) if (ok)
d.contactDetails = Utils.getContactDetailsAsJson(root.userPublicKey, false) d.contactDetails = Utils.getContactDetailsAsJson(root.publicKey, false)
d.loadingContactDetails = false d.loadingContactDetails = false
} }
} }
contentItem: ColumnLayout { StatusInput {
spacing: d.contentSpacing id: messageInput
input.edit.objectName: "ProfileSendContactRequestModal_sayWhoYouAreInput"
ProfileHeader { Layout.fillWidth: true
Layout.fillWidth: true label: root.labelText
displayName: d.mainDisplayName charLimit: d.maxMsgLength
pubkey: root.userPublicKey placeholderText: root.challengeText
icon: d.userIcon input.multiline: true
userIsEnsVerified: d.userIsEnsVerified minimumHeight: d.msgHeight
isContact: d.contactDetails.isContact maximumHeight: d.msgHeight
trustStatus: d.contactDetails.trustStatus input.verticalAlignment: TextEdit.AlignTop
onlineStatus: d.contactDetails.onlineStatus validators: StatusMinLengthValidator {
isBlocked: d.contactDetails.isBlocked minLength: d.minMsgLength
imageSize: ProfileHeader.ImageSize.Middle errorMessage: Utils.getErrorMessage(messageInput.errors, qsTr("who are you"))
loading: d.loadingContactDetails
}
StatusInput {
id: messageInput
input.edit.objectName: "ProfileSendContactRequestModal_sayWhoYouAreInput"
Layout.fillWidth: true
charLimit: d.maxMsgLength
placeholderText: root.challengeText
input.multiline: true
minimumHeight: d.msgHeight
maximumHeight: d.msgHeight
input.verticalAlignment: TextEdit.AlignTop
validators: StatusMinLengthValidator {
minLength: d.minMsgLength
errorMessage: Utils.getErrorMessage(messageInput.errors, qsTr("who are you"))
}
} }
} }
footer: StatusDialogFooter { rightButtons: ObjectModel {
rightButtons: ObjectModel { StatusFlatButton {
StatusButton { text: qsTr("Cancel")
objectName: "ProfileSendContactRequestModal_sendContactRequestButton" onClicked: root.close()
enabled: messageInput.valid }
text: root.buttonText StatusButton {
onClicked: { objectName: "ProfileSendContactRequestModal_sendContactRequestButton"
root.accepted(messageInput.text); enabled: messageInput.valid
root.close(); text: root.buttonText
} onClicked: {
root.accepted(messageInput.text);
root.close();
} }
} }
} }

19
ui/imports/shared/views/ProfileDialogView.qml
View File

@ -174,10 +174,8 @@ Pane {
StatusButton { StatusButton {
objectName: "profileDialog_sendContactRequestButton" objectName: "profileDialog_sendContactRequestButton"
size: StatusButton.Size.Small size: StatusButton.Size.Small
text: qsTr("Send Contact Request") text: qsTr("Send contact request")
onClicked: { onClicked: Global.openContactRequestPopup(root.publicKey, d.contactDetails, null)
Global.openContactRequestPopup(root.publicKey, null)
}
} }
} }
@ -214,7 +212,7 @@ Pane {
font.weight: Font.Medium font.weight: Font.Medium
color: Theme.palette.baseColor1 color: Theme.palette.baseColor1
verticalAlignment: Text.AlignVCenter verticalAlignment: Text.AlignVCenter
text: qsTr("Contact Request Pending…") text: qsTr("Contact Request Pending")
} }
} }
} }
@ -386,7 +384,7 @@ Pane {
enabled: !d.isContact && !d.isBlocked && d.contactRequestState !== Constants.ContactRequestState.Sent && enabled: !d.isContact && !d.isBlocked && d.contactRequestState !== Constants.ContactRequestState.Sent &&
d.contactDetails.trustStatus === Constants.trustStatus.untrustworthy // we have an action button otherwise d.contactDetails.trustStatus === Constants.trustStatus.untrustworthy // we have an action button otherwise
onTriggered: { onTriggered: {
Global.openContactRequestPopup(root.publicKey, null) Global.openContactRequestPopup(root.publicKey, d.contactDetails, null)
} }
} }
StatusAction { StatusAction {
@ -396,7 +394,7 @@ Pane {
d.outgoingVerificationStatus === Constants.verificationStatus.unverified && d.outgoingVerificationStatus === Constants.verificationStatus.unverified &&
!d.isVerificationRequestReceived !d.isVerificationRequestReceived
onTriggered: { onTriggered: {
Global.openSendIDRequestPopup(root.publicKey, Global.openSendIDRequestPopup(root.publicKey, d.contactDetails,
popup => popup.accepted.connect(d.reload)) popup => popup.accepted.connect(d.reload))
} }
} }
@ -552,6 +550,13 @@ Pane {
StatusBaseText { StatusBaseText {
color: Theme.palette.baseColor1 color: Theme.palette.baseColor1
text: Utils.getElidedCompressedPk(root.publicKey) text: Utils.getElidedCompressedPk(root.publicKey)
HoverHandler {
id: keyHoverHandler
}
StatusToolTip {
text: Utils.getCompressedPk(root.publicKey)
visible: keyHoverHandler.hovered
}
} }
CopyButton { CopyButton {
Layout.leftMargin: -4 Layout.leftMargin: -4

15
ui/imports/shared/views/chat/ProfileContextMenu.qml
View File

@ -143,10 +143,7 @@ StatusMenu {
objectName: "sendContactRequest_StatusItem" objectName: "sendContactRequest_StatusItem"
enabled: !root.isMe && !root.isContact enabled: !root.isMe && !root.isContact
&& !root.isBlockedContact && !root.hasPendingContactRequest && !root.isBridgedAccount && !root.isBlockedContact && !root.hasPendingContactRequest && !root.isBridgedAccount
onTriggered: { onTriggered: Global.openContactRequestPopup(root.selectedUserPublicKey, root.contactDetails, null)
Global.openContactRequestPopup(root.selectedUserPublicKey, null)
root.close()
}
} }
StatusAction { StatusAction {
@ -159,10 +156,7 @@ StatusMenu {
&& root.outgoingVerificationStatus === Constants.verificationStatus.unverified && root.outgoingVerificationStatus === Constants.verificationStatus.unverified
&& !root.hasActiveReceivedVerificationRequestFrom && !root.hasActiveReceivedVerificationRequestFrom
&& !root.isBridgedAccount && !root.isBridgedAccount
onTriggered: { onTriggered: Global.openSendIDRequestPopup(root.selectedUserPublicKey, root.contactDetails, null)
Global.openSendIDRequestPopup(root.selectedUserPublicKey, null)
root.close()
}
} }
// TODO Mark as ID verified // TODO Mark as ID verified
StatusAction { StatusAction {
@ -193,10 +187,7 @@ StatusMenu {
text: contactDetails.localNickname ? qsTr("Edit nickname") : qsTr("Add nickname") text: contactDetails.localNickname ? qsTr("Edit nickname") : qsTr("Add nickname")
icon.name: "edit_pencil" icon.name: "edit_pencil"
enabled: !root.isMe && !root.isBridgedAccount enabled: !root.isMe && !root.isBridgedAccount
onTriggered: { onTriggered: Global.openNicknamePopupRequested(root.selectedUserPublicKey, root.contactDetails)
Global.openNicknamePopupRequested(root.selectedUserPublicKey, root.contactDetails)
root.close()
}
} }
StatusMenuSeparator { StatusMenuSeparator {

4
ui/imports/utils/Global.qml
View File

@ -38,8 +38,8 @@ QtObject {
signal openImagePopup(var image, string url) signal openImagePopup(var image, string url)
signal openProfilePopupRequested(string publicKey, var parentPopup, var cb) signal openProfilePopupRequested(string publicKey, var parentPopup, var cb)
signal openActivityCenterPopupRequested() signal openActivityCenterPopupRequested()
signal openSendIDRequestPopup(string publicKey, var cb) signal openSendIDRequestPopup(string publicKey, var contactDetails, var cb)
signal openContactRequestPopup(string publicKey, var cb) signal openContactRequestPopup(string publicKey, var contactDetails, var cb)
signal removeContactRequested(string displayName, string publicKey) signal removeContactRequested(string displayName, string publicKey)
signal openInviteFriendsToCommunityPopup(var community, var communitySectionModule, var cb) signal openInviteFriendsToCommunityPopup(var community, var communitySectionModule, var cb)
signal openIncomingIDRequestPopup(string publicKey, var cb) signal openIncomingIDRequestPopup(string publicKey, var cb)