status-im · caybro · Mar 4, 2024 · Feb 26, 2024 · MishkaRogachev · Feb 29, 2024
diff --git a/storybook/pages/ProfileDialogViewPage.qml b/storybook/pages/ProfileDialogViewPage.qml
diff --git a/ui/app/AppLayouts/Profile/panels/ContactPanel.qml b/ui/app/AppLayouts/Profile/panels/ContactPanel.qml
@@ -73,8 +73,8 @@ StatusListItem {
             width: visible ? implicitWidth : 0
             height: visible ? implicitHeight : 0
             text: verificationRequestStatus === Constants.verificationStatus.verifying ?
-                qsTr("Respond to ID Request") :
-                qsTr("See ID Request")
+                qsTr("Reply to ID verification request") :
+                qsTr("Review ID verification reply")
             size: StatusBaseButton.Size.Small
             onClicked: root.showVerificationRequest(root.publicKey)
         },

diff --git a/ui/app/AppLayouts/Profile/popups/ConfirmChangePasswordModal.qml b/ui/app/AppLayouts/Profile/popups/ConfirmChangePasswordModal.qml
@@ -81,7 +81,7 @@ StatusDialog {
                 title: !d.dbEncryptionInProgress ? qsTr("Re-encryption complete") :
                                                    qsTr("Re-encrypting your data with your new password...")
                 subTitle: !d.dbEncryptionInProgress ? qsTr("Restart Status and log in using your new password") :
-                                                      qsTr("Do not quit the app of turn off your device")
+                                                      qsTr("Do not quit the app or turn off your device")
                 statusListItemSubTitle.customColor: !d.passwordChanged ? Style.current.red : Theme.palette.successColor1
                 statusListItemIcon.active: d.passwordChanged
                 asset.name: "checkmark-circle"

diff --git a/ui/app/AppLayouts/Profile/stores/ProfileSectionStore.qml b/ui/app/AppLayouts/Profile/stores/ProfileSectionStore.qml
@@ -96,7 +96,7 @@ QtObject {
                        icon: "profile"})
             append({subsection: Constants.settingsSubsection.password,
                        text: qsTr("Password"),
-                       icon: "profile"})
+                       icon: "password"})
             append({subsection: Constants.settingsSubsection.keycard,
                        text: qsTr("Keycard"),
                        icon: "keycard"})

diff --git a/ui/app/AppLayouts/Profile/views/ContactsView.qml b/ui/app/AppLayouts/Profile/views/ContactsView.qml
@@ -55,7 +55,7 @@ SettingsContentBase {
                 store: ({contactsStore: root.contactsStore})
 
                 onOpenProfileClicked: function (pubkey) {
-                    Global.openProfilePopup(pubkey, null)
+                    Global.openProfilePopup(pubkey, null, null)
                 }
                 onCreateOneToOneChat: function (communityId, chatId, ensName) {
                     root.contactsStore.joinPrivateChat(chatId)
@@ -216,7 +216,7 @@ SettingsContentBase {
                     }
 
                     onShowVerificationRequest: {
-                        Global.openIncomingIDRequestPopup(publicKey, null)
+                        Global.openIncomingIDRequestPopup(publicKey, null, null)
                     }
                 }
 
@@ -320,4 +320,3 @@ SettingsContentBase {
         }
     }
 }
-
diff --git a/ui/app/mainui/Popups.qml b/ui/app/mainui/Popups.qml
@@ -183,11 +183,13 @@ QtObject {
         openPopup(removeIDVerificationPopupComponent, {publicKey, contactDetails}, cb)
     }
 
-    function openOutgoingIDRequestPopup(publicKey, cb) {
+    function openOutgoingIDRequestPopup(publicKey, contactDetails, cb) {
+        let details = contactDetails ?? Utils.getContactDetailsAsJson(publicKey)
         try {
-            const verificationDetails = root.rootStore.profileSectionStore.contactsStore.getSentVerificationDetailsAsJson(publicKey)
+            const verificationDetails = rootStore.contactStore.getSentVerificationDetailsAsJson(publicKey)
             const popupProperties = {
-                userPublicKey: publicKey,
+                publicKey: publicKey,
+                contactDetails: details,
                 verificationStatus: verificationDetails.requestStatus,
                 verificationChallenge: verificationDetails.challenge,
                 verificationResponse: verificationDetails.response,
@@ -202,13 +204,9 @@ QtObject {
         }
     }
 
-    function openIncomingIDRequestPopup(publicKey, cb) {
-        const popupProperties = {
-            contactsStore: root.rootStore.profileSectionStore.contactsStore,
-            publicKey: publicKey
-        }
-
-        openPopup(contactVerificationRequestPopupComponent, popupProperties, cb)
+    function openIncomingIDRequestPopup(publicKey, contactDetails, cb) {
+        let details = contactDetails ?? Utils.getContactDetailsAsJson(publicKey)
+        openPopup(contactVerificationRequestPopupComponent, {publicKey, contactDetails: details})
     }
 
     function openInviteFriendsToCommunityPopup(community, communitySectionModule, cb) {
@@ -357,7 +355,7 @@ QtObject {
                 onAccepted: {
                     rootStore.contactStore.removeContact(publicKey)
                     if (removeIDVerification)
-                        rootStore.contactStore.cancelVerificationRequest(publicKey)
+                        rootStore.contactStore.removeTrustStatus(publicKey)
                     if (markAsUntrusted) {
                         rootStore.contactStore.markUntrustworthy(publicKey)
                         Global.displaySuccessToastMessage(qsTr("%1 removed from contacts and marked as untrusted").arg(mainDisplayName))
@@ -372,11 +370,14 @@ QtObject {
         Component {
             id: contactVerificationRequestPopupComponent
             ContactVerificationRequestPopup {
-                onResponseSent: {
-                    root.rootStore.profileSectionStore.contactsStore.acceptVerificationRequest(senderPublicKey, response)
+                contactsStore: rootStore.contactStore
+                onResponseSent: (senderPublicKey, response) => {
+                    contactsStore.acceptVerificationRequest(senderPublicKey, response)
+                    Global.displaySuccessToastMessage(qsTr("ID verification reply sent"))
                 }
-                onVerificationRefused: {
-                    root.rootStore.profileSectionStore.contactsStore.declineVerificationRequest(senderPublicKey)
+                onVerificationRefused: (senderPublicKey) => {
+                    contactsStore.declineVerificationRequest(senderPublicKey)
+                    Global.displaySuccessToastMessage(qsTr("ID verification request declined"))
                 }
                 onClosed: destroy()
             }
@@ -386,13 +387,15 @@ QtObject {
             id: contactOutgoingVerificationRequestPopupComponent
             OutgoingContactVerificationRequestPopup {
                 onVerificationRequestCanceled: {
-                    root.rootStore.profileSectionStore.contactsStore.cancelVerificationRequest(userPublicKey)
+                    rootStore.contactStore.cancelVerificationRequest(publicKey)
                 }
                 onUntrustworthyVerified: {
-                    root.rootStore.profileSectionStore.contactsStore.verifiedUntrustworthy(userPublicKey)
+                    rootStore.contactStore.verifiedUntrustworthy(publicKey)
+                    Global.displaySuccessToastMessage(qsTr("%1 marked as untrusted").arg(mainDisplayName))
                 }
                 onTrustedVerified: {
-                    root.rootStore.profileSectionStore.contactsStore.verifiedTrusted(userPublicKey)
+                    rootStore.contactStore.verifiedTrusted(publicKey)
+                    Global.displaySuccessToastMessage(qsTr("%1 ID verified").arg(mainDisplayName))
                 }
                 onClosed: destroy()
             }
@@ -411,7 +414,7 @@ QtObject {
             id: markAsIDVerifiedPopupComponent
             MarkAsIDVerifiedDialog {
                 onAccepted: {
-                    rootStore.contactStore.verifiedTrusted(publicKey)
+                    rootStore.contactStore.markAsTrusted(publicKey)
                     Global.displaySuccessToastMessage(qsTr("%1 ID verified").arg(mainDisplayName))
                     close()
                 }
@@ -576,8 +579,6 @@ QtObject {
             MarkAsUntrustedPopup {
                 onAccepted: {
                     rootStore.contactStore.markUntrustworthy(publicKey)
-                    if (removeIDVerification)
-                        rootStore.contactStore.cancelVerificationRequest(publicKey)
                     if (removeContact) {
                         rootStore.contactStore.removeContact(publicKey)
                         Global.displaySuccessToastMessage(qsTr("%1 removed from contacts and marked as untrusted").arg(mainDisplayName))
@@ -608,7 +609,7 @@ QtObject {
                 onAccepted: {
                     rootStore.contactStore.blockContact(publicKey)
                     if (removeIDVerification)
-                        rootStore.contactStore.cancelVerificationRequest(publicKey)
+                        rootStore.contactStore.removeTrustStatus(publicKey)
                     if (removeContact)
                         rootStore.contactStore.removeContact(publicKey)
                     Global.displaySuccessToastMessage(qsTr("%1 blocked").arg(mainDisplayName))

diff --git a/ui/app/mainui/activitycenter/panels/IncomingContactVerificationCta.qml b/ui/app/mainui/activitycenter/panels/IncomingContactVerificationCta.qml
@@ -14,8 +14,8 @@ StatusFlatButton {
 
     signal activate()
 
-    enabled: verificationStatus == Constants.verificationStatus.verifying ||
-             verificationStatus == Constants.verificationStatus.verified
+    enabled: verificationStatus === Constants.verificationStatus.verifying ||
+             verificationStatus === Constants.verificationStatus.verified
     size: StatusBaseButton.Size.Small
     text: {
         switch (verificationStatus) {
@@ -47,4 +47,4 @@ StatusFlatButton {
     }
 
     onClicked: root.activate()
-}
+}
diff --git a/ui/app/mainui/activitycenter/views/ActivityNotificationContactVerification.qml b/ui/app/mainui/activitycenter/views/ActivityNotificationContactVerification.qml
@@ -58,7 +58,7 @@ ActivityNotificationMessage {
         OutgoingContactVerificationCta {
             verificationStatus: notification ? notification.verificationStatus : Constants.verificationStatus.unverified
             onActivate: {
-                Global.openOutgoingIDRequestPopup(root.contactId, popup => {})
+                Global.openOutgoingIDRequestPopup(root.contactId, root.contactDetails, null)
                 root.closeActivityCenter()
             }
         }
@@ -70,9 +70,9 @@ ActivityNotificationMessage {
         IncomingContactVerificationCta {
             verificationStatus: notification ? notification.verificationStatus : Constants.verificationStatus.unverified
             onActivate: {
-                Global.openIncomingIDRequestPopup(root.contactId, popup => {})
+                Global.openIncomingIDRequestPopup(root.contactId, root.contactDetails, null)
                 root.closeActivityCenter()
             }
         }
     }
-}
+}
diff --git a/ui/imports/shared/popups/BlockContactConfirmationDialog.qml b/ui/imports/shared/popups/BlockContactConfirmationDialog.qml
@@ -19,12 +19,8 @@ CommonContactDialog {
 
     readonly property var d: QtObject {
         id: d
-        readonly property int outgoingVerificationStatus: contactDetails.verificationStatus
-        readonly property int incomingVerificationStatus: contactDetails.incomingVerificationStatus
-        readonly property bool isVerificationRequestReceived: incomingVerificationStatus === Constants.verificationStatus.verifying ||
-                                                              incomingVerificationStatus === Constants.verificationStatus.verified
-        readonly property bool isTrusted: outgoingVerificationStatus === Constants.verificationStatus.trusted ||
-                                          incomingVerificationStatus === Constants.verificationStatus.trusted
+        readonly property bool isTrusted: contactDetails.outgoingVerificationStatus === Constants.verificationStatus.trusted ||
+                                          contactDetails.incomingVerificationStatus === Constants.verificationStatus.trusted
     }
 
     StatusBaseText {
@@ -58,7 +54,7 @@ CommonContactDialog {
 
     StatusCheckBox {
         id: ctrlRemoveIDVerification
-        visible: contactDetails.isContact && !d.isTrusted && d.isVerificationRequestReceived
+        visible: (contactDetails.isContact && d.isTrusted) || contactDetails.trustStatus === Constants.trustStatus.trusted
         checked: visible
         enabled: false
         text: qsTr("Remove ID verification")

diff --git a/ui/imports/shared/popups/CommonContactDialog.qml b/ui/imports/shared/popups/CommonContactDialog.qml
@@ -17,6 +17,7 @@ StatusDialog {
 
     required property string publicKey
     required property var contactDetails
+    property bool loadingContactDetails
 
     default property alias content: contentLayout.children
 
@@ -26,7 +27,7 @@ StatusDialog {
                                                                        contactDetails.displayName, contactDetails.alias)
     readonly property string optionalDisplayName: ProfileUtils.displayName("", contactDetails.name, contactDetails.displayName, contactDetails.alias)
 
-    width: 480
+    width: Math.max(implicitWidth, 480)
     horizontalPadding: 0
     topPadding: 20
     bottomPadding: 0
@@ -47,6 +48,7 @@ StatusDialog {
                 imageHeight: 60
                 ensVerified: contactDetails.ensVerified
                 onlineStatus: contactDetails.onlineStatus
+                loading: root.loadingContactDetails
             }
 
             ColumnLayout {