feat(ProfileContextMenu): Add "Mark as Trusted" and "Remove trusted m…

…ark" - enhance and fix the SB page to be able to show all the permutations, including profile image, emoji hash and ring Fixes #16586
status-im · Nov 4, 2024 · bce084d · bce084d
1 parent 5aefbb8
commit bce084d
Show file tree

Hide file tree

Showing 7 changed files with 241 additions and 273 deletions.
diff --git a/storybook/pages/ProfileContextMenuPage.qml b/storybook/pages/ProfileContextMenuPage.qml
diff --git a/ui/app/AppLayouts/Chat/panels/UserListPanel.qml b/ui/app/AppLayouts/Chat/panels/UserListPanel.qml
@@ -186,7 +186,7 @@ Item {
                 const contactDetails = profileContextMenu.publicKey === "" ? {} : Utils.getContactDetailsAsJson(profileContextMenu.publicKey, true, true)
                 Global.openNicknamePopupRequested(profileContextMenu.publicKey, contactDetails, null)
             }
-            onRemoveNickname: (displayName) => {
+            onRemoveNickname: {
                 root.store.contactsStore.changeContactNickname(profileContextMenu.publicKey, "", displayName, true)
             }
             onUnblockContact: {
@@ -209,6 +209,15 @@ Item {
             onRemoveFromGroup: {
                 root.store.removeMemberFromGroupChat(profileContextMenu.publicKey)
             }
+            onMarkAsTrusted: {
+                const contactDetails = publicKey === "" ? {} : Utils.getContactDetailsAsJson(publicKey, true, true)
+                Global.openMarkAsIDVerifiedPopup(publicKey, contactDetails, null)
+            }
+            onRemoveTrustedMark: {
+                const contactDetails = publicKey === "" ? {} : Utils.getContactDetailsAsJson(publicKey, true, true)
+                Global.openRemoveIDVerificationDialog(publicKey, contactDetails, null)
+            }
+
             onClosed: destroy()
         }
     }

diff --git a/ui/app/AppLayouts/Communities/panels/MembersTabPanel.qml b/ui/app/AppLayouts/Communities/panels/MembersTabPanel.qml
@@ -353,7 +353,7 @@ Item {
                 const contactDetails = memberContextMenuView.publicKey === "" ? {} : Utils.getContactDetailsAsJson(memberContextMenuView.publicKey, true, true)
                 Global.openNicknamePopupRequested(memberContextMenuView.publicKey, contactDetails, null)
             }
-            onRemoveNickname: (displayName) => {
+            onRemoveNickname: {
                 root.rootStore.contactsStore.changeContactNickname(memberContextMenuView.publicKey, "", displayName, true)
             }
             onUnblockContact: {
@@ -373,6 +373,14 @@ Item {
                 const contactDetails = memberContextMenuView.publicKey === "" ? {} : Utils.getContactDetailsAsJson(memberContextMenuView.publicKey, true, true)
                 Global.blockContactRequested(memberContextMenuView.publicKey, contactDetails)
             }
+            onMarkAsTrusted: {
+                const contactDetails = publicKey === "" ? {} : Utils.getContactDetailsAsJson(publicKey, true, true)
+                Global.openMarkAsIDVerifiedPopup(publicKey, contactDetails, null)
+            }
+            onRemoveTrustedMark: {
+                const contactDetails = publicKey === "" ? {} : Utils.getContactDetailsAsJson(publicKey, true, true)
+                Global.openRemoveIDVerificationDialog(publicKey, contactDetails, null)
+            }
             onClosed: destroy()
         }
     }

diff --git a/ui/app/AppLayouts/Profile/views/ContactsView.qml b/ui/app/AppLayouts/Profile/views/ContactsView.qml
@@ -74,7 +74,7 @@ SettingsContentBase {
                     const contactDetails = contactContextMenu.publicKey === "" ? {} : Utils.getContactDetailsAsJson(contactContextMenu.publicKey, true, true)
                     Global.openNicknamePopupRequested(contactContextMenu.publicKey, contactDetails, null)
                 }
-                onRemoveNickname: (displayName) => {
+                onRemoveNickname: {
                     root.contactsStore.changeContactNickname(contactContextMenu.publicKey, "", displayName, true)
                 }
                 onUnblockContact: () => {
@@ -94,6 +94,14 @@ SettingsContentBase {
                     const contactDetails = contactContextMenu.publicKey === "" ? {} : Utils.getContactDetailsAsJson(contactContextMenu.publicKey, true, true)
                     Global.blockContactRequested(contactContextMenu.publicKey, contactDetails)
                 }
+                onMarkAsTrusted: {
+                    const contactDetails = publicKey === "" ? {} : Utils.getContactDetailsAsJson(publicKey, true, true)
+                    Global.openMarkAsIDVerifiedPopup(publicKey, contactDetails, null)
+                }
+                onRemoveTrustedMark: {
+                    const contactDetails = publicKey === "" ? {} : Utils.getContactDetailsAsJson(publicKey, true, true)
+                    Global.openRemoveIDVerificationDialog(publicKey, contactDetails, null)
+                }
                 onClosed: destroy()
             }
         }
@@ -124,7 +132,7 @@ SettingsContentBase {
                 enabled: root.contactsStore.receivedContactRequestsModel.count > 0 ||
                          root.contactsStore.sentContactRequestsModel.count > 0
                 text: qsTr("Pending Requests")
-                badge.value: root.contactsStore.receivedContactRequestsModel.count
+                badge.value: root.contactsStore.receivedContactRequestsModel.count + root.contactsStore.sentContactRequestsModel.count
             }
             StatusTabButton {
                 id: blockedBtn

diff --git a/ui/imports/shared/popups/RemoveIDVerificationDialog.qml b/ui/imports/shared/popups/RemoveIDVerificationDialog.qml
@@ -20,7 +20,7 @@ CommonContactDialog {
         Layout.fillWidth: true
         Layout.bottomMargin: Theme.halfPadding
         wrapMode: Text.WordWrap
-        text: qsTr("%1's identity will no longer be verified. This is only visible to you.").arg(mainDisplayName)
+        text: qsTr("%1' will no longer be trusted. This is only visible to you.").arg(mainDisplayName)
     }
 
     StatusCheckBox {

diff --git a/ui/imports/shared/views/chat/MessageView.qml b/ui/imports/shared/views/chat/MessageView.qml
@@ -1226,6 +1226,14 @@ Loader {
             onRemoveFromGroup: () => {
                 root.store.removeMemberFromGroupChat(profileContextMenu.publicKey)
             }
+            onMarkAsTrusted: {
+                const contactDetails = publicKey === "" ? {} : Utils.getContactDetailsAsJson(publicKey, true, true)
+                Global.openMarkAsIDVerifiedPopup(publicKey, contactDetails, null)
+            }
+            onRemoveTrustedMark: {
+                const contactDetails = publicKey === "" ? {} : Utils.getContactDetailsAsJson(publicKey, true, true)
+                Global.openRemoveIDVerificationDialog(publicKey, contactDetails, null)
+            }
             onOpened: root.setMessageActive(root.messageId, true)
             onClosed: {
                 root.setMessageActive(root.messageId, false)

diff --git a/ui/imports/shared/views/chat/ProfileContextMenu.qml b/ui/imports/shared/views/chat/ProfileContextMenu.qml
@@ -30,8 +30,10 @@ StatusMenu {
     signal reviewContactRequest
     signal sendContactRequest
     signal editNickname
-    signal removeNickname(string displayName)
+    signal removeNickname
     signal unblockContact
+    signal markAsTrusted
+    signal removeTrustedMark
     signal markAsUntrusted
     signal removeTrustStatus
     signal removeContact
@@ -73,14 +75,24 @@ StatusMenu {
         }
     }
 
-    // Edit Nickname
+    // Send Message
+    SendMessageMenuItem {
+        id: sendMessageMenuItem
+        objectName: "sendMessage_StatusItem"
+        enabled: root.profileType === Constants.profileType.regular && root.contactType === Constants.contactType.contact
+        onTriggered: {
+            root.createOneToOneChat()
+            root.close()
+        }
+    }
+
+    // Mark as trusted
     StatusAction {
-        id: renameAction
-        objectName: "rename_StatusItem"
-        enabled: root.profileType === Constants.profileType.blocked || root.profileType === Constants.profileType.regular
-        text: root.hasLocalNickname ? qsTr("Edit nickname") : qsTr("Add nickname")
-        icon.name: "edit_pencil"
-        onTriggered: root.editNickname()
+        objectName: "markAsTrusted_StatusItem"
+        enabled: root.profileType === Constants.profileType.regular && root.contactType === Constants.contactType.contact && root.trustStatus !== Constants.trustStatus.trusted
+        text: qsTr("Mark as trusted")
+        icon.name: "checkmark-circle"
+        onTriggered: root.markAsTrusted()
     }
 
     // Review Contact Request
@@ -92,17 +104,6 @@ StatusMenu {
         onTriggered: root.reviewContactRequest()
     }
 
-    // Send Message
-    SendMessageMenuItem {
-        id: sendMessageMenuItem
-        objectName: "sendMessage_StatusItem"
-        enabled: root.profileType === Constants.profileType.regular && root.contactType === Constants.contactType.contact
-        onTriggered: {
-            root.createOneToOneChat()
-            root.close()
-        }
-    }
-
     // Send Contact Request
     SendContactRequestMenuItem {
         id: sendContactRequestMenuItem
@@ -111,6 +112,16 @@ StatusMenu {
         onTriggered: root.sendContactRequest()
     }
 
+    // Edit Nickname
+    StatusAction {
+        id: renameAction
+        objectName: "rename_StatusItem"
+        enabled: root.profileType === Constants.profileType.blocked || root.profileType === Constants.profileType.regular
+        text: root.hasLocalNickname ? qsTr("Edit nickname") : qsTr("Add nickname")
+        icon.name: "edit_pencil"
+        onTriggered: root.editNickname()
+    }
+
     StatusMenuSeparator {
         topPadding: root.topPadding
         visible: root.profileType !== Constants.profileType.bridged &&
@@ -124,7 +135,17 @@ StatusMenu {
         icon.name: "delete"
         type: StatusAction.Type.Danger
         enabled: (root.profileType === Constants.profileType.blocked || root.profileType === Constants.profileType.regular) && root.hasLocalNickname
-        onTriggered: root.removeNickname(root.displayName)
+        onTriggered: root.removeNickname()
+    }
+
+    // Remove trusted mark
+    StatusAction {
+        objectName: "removeTrustedMark_StatusItem"
+        enabled: root.profileType === Constants.profileType.regular && root.contactType === Constants.contactType.contact && root.trustStatus === Constants.trustStatus.trusted
+        text: qsTr("Remove trusted mark")
+        icon.name: "checkmark-circle"
+        type: StatusAction.Type.Danger
+        onTriggered: root.removeTrustedMark()
     }
 
     // Unblock User