From d14fc486b5c24a2c4c5ec84dc8a99b34196d06ee Mon Sep 17 00:00:00 2001 From: Michal Iskierko Date: Mon, 26 Sep 2022 12:09:50 +0200 Subject: [PATCH] fix(@desktop/contacts): Do not show pending identity request when user is verified. Fix #7376 --- ui/imports/shared/views/chat/MessageContextMenuView.qml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/ui/imports/shared/views/chat/MessageContextMenuView.qml b/ui/imports/shared/views/chat/MessageContextMenuView.qml index 38e5cf29c9..f8a6448e1e 100644 --- a/ui/imports/shared/views/chat/MessageContextMenuView.qml +++ b/ui/imports/shared/views/chat/MessageContextMenuView.qml @@ -89,7 +89,9 @@ StatusPopupMenu { if (!root.selectedUserPublicKey || root.isMe || !root.isContact) { return false } - return root.outgoingVerificationStatus !== Constants.verificationStatus.unverified + return root.outgoingVerificationStatus !== Constants.verificationStatus.unverified && + root.outgoingVerificationStatus !== Constants.verificationStatus.verified && + root.outgoingVerificationStatus !== Constants.verificationStatus.trusted } readonly property bool isTrusted: { if (!root.selectedUserPublicKey || root.isMe || !root.isContact) { @@ -264,7 +266,8 @@ StatusPopupMenu { text: qsTr("Verify Identity") icon.name: "checkmark-circle" enabled: root.isProfile && !root.isMe && root.isContact - && !root.isBlockedContact && !root.isVerificationRequestSent + && !root.isBlockedContact + && root.outgoingVerificationStatus === Constants.verificationStatus.unverified && !root.hasReceivedVerificationRequestFrom onTriggered: { root.openProfileClicked(root.selectedUserPublicKey,