Make it easier to understand, what button to click for verification from profile

2 files changed, 13 insertions, 4 deletions

diff --git a/resources/qml/UserProfile.qml b/resources/qml/UserProfile.qml

index fa8a190d..baff991e 100644
--- a/resources/qml/UserProfile.qml
+++ b/resources/qml/UserProfile.qml
@@ -61,10 +61,18 @@ ApplicationWindow {
             text: qsTr("Verify")
             Layout.alignment: Qt.AlignHCenter
             enabled: !profile.isUserVerified
-            visible: !profile.isUserVerified
+            visible: !profile.isUserVerified && !profile.isSelf && profile.userVerificationEnabled
             onClicked: profile.verify()
         }
 
+        Image {
+            Layout.preferredHeight: 16
+            Layout.preferredWidth: 16
+            source: "image://colorimage/:/icons/icons/ui/lock.png?green"
+            visible: profile.isUserVerified
+            Layout.alignment: Qt.AlignHCenter
+        }
+
         RowLayout {
             Layout.alignment: Qt.AlignHCenter
             spacing: 8
@@ -153,6 +161,7 @@ ApplicationWindow {
                 Button {
                     id: verifyButton
 
+                    visible: (!profile.userVerificationEnabled && !profile.isSelf) || (profile.isSelf && (model.verificationStatus != VerificationStatus.VERIFIED || !profile.userVerificationEnabled))
                     text: (model.verificationStatus != VerificationStatus.VERIFIED) ? "Verify" : "Unverify"
                     onClicked: {
                         if (model.verificationStatus == VerificationStatus.VERIFIED)
diff --git a/resources/qml/device-verification/NewVerificationRequest.qml b/resources/qml/device-verification/NewVerificationRequest.qml

index fae63371..a34038a9 100644
--- a/resources/qml/device-verification/NewVerificationRequest.qml
+++ b/resources/qml/device-verification/NewVerificationRequest.qml
@@ -10,6 +10,8 @@ Pane {
         spacing: 16
 
         Label {
+            // Self verification
+
             Layout.maximumWidth: 400
             Layout.fillHeight: true
             Layout.fillWidth: true
@@ -21,14 +23,12 @@ Pane {
                     else
                         return qsTr("To ensure that no malicious user can eavesdrop on your encrypted communications you can verify the other party.");
                 } else {
-                    // Self verification
-
                     if (!flow.isSelfVerification && flow.isDeviceVerification)
                         return qsTr("%1 has requested to verify their device %2.").arg(flow.userId).arg(flow.deviceId);
                     else if (!flow.isSelfVerification && !flow.isDeviceVerification)
                         return qsTr("%1 using the device %2 has requested to be verified.").arg(flow.userId).arg(flow.deviceId);
                     else
-                        return qsTr("Your devices (%1) has requested to be verified.").arg(flow.deviceId);
+                        return qsTr("Your device (%1) has requested to be verified.").arg(flow.deviceId);
                 }
             }
             color: colors.text