feat(contacts): add a tab for dismissed contacts and a button to undo

Fixes #16844 Adds a tab in the Messaging>Contacts page that shows the dismissed contact requests. it has a button to undo the rejection. That is simply a call to accept the old contact request, which then makes the two users mutual contacts
status-im · Jan 14, 2025 · 1295d9a · 1295d9a
1 parent 7babefd
commit 1295d9a
Show file tree

Hide file tree

Showing 8 changed files with 49 additions and 0 deletions.
diff --git a/storybook/pages/ContactsViewPage.qml b/storybook/pages/ContactsViewPage.qml
@@ -42,6 +42,7 @@ Item {
         mutualContactsModel: adaptor.mutualContacts
         blockedContactsModel: adaptor.blockedContacts
         pendingContactsModel: adaptor.pendingContacts
+        dismissedReceivedRequestContactsModel: adaptor.dismissedReceivedRequestContactsModel
         pendingReceivedContactsCount: adaptor.pendingReceivedRequestContacts.count
     }
 

diff --git a/ui/app/AppLayouts/Profile/ProfileLayout.qml b/ui/app/AppLayouts/Profile/ProfileLayout.qml
@@ -57,6 +57,7 @@ StatusSectionLayout {
     property var blockedContactsModel
     property var pendingContactsModel
     property int pendingReceivedContactsCount
+    property var dismissedReceivedRequestContactsModel
 
     required property bool isCentralizedMetricsEnabled
 
@@ -246,6 +247,7 @@ StatusSectionLayout {
                 blockedContactsModel: root.blockedContactsModel
                 pendingContactsModel: root.pendingContactsModel
                 pendingReceivedContactsCount: root.pendingReceivedContactsCount
+                dismissedReceivedRequestContactsModel: root.dismissedReceivedRequestContactsModel
             }
         }
 

diff --git a/ui/app/AppLayouts/Profile/panels/ContactPanel.qml b/ui/app/AppLayouts/Profile/panels/ContactPanel.qml
@@ -12,12 +12,14 @@ ContactListItemDelegate {
     property bool showSendMessageButton: false
     property bool showRejectContactRequestButton: false
     property bool showAcceptContactRequestButton: false
+    property bool showRemoveRejectionButton: false
     property string contactText: ""
 
     signal contextMenuRequested
     signal sendMessageRequested
     signal acceptContactRequested
     signal rejectRequestRequested
+    signal removeRejectionRequested
 
     icon.width: 40
     icon.height: 40

diff --git a/ui/app/AppLayouts/Profile/panels/ContactsListPanel.qml b/ui/app/AppLayouts/Profile/panels/ContactsListPanel.qml
@@ -16,6 +16,7 @@ StatusListView {
     signal sendMessageRequested(string publicKey)
     signal acceptContactRequested(string publicKey)
     signal rejectContactRequested(string publicKey)
+    signal rejectionRemoved(string publicKey)
 
     objectName: "ContactListPanel_ListView"
 
@@ -32,6 +33,7 @@ StatusListView {
         showRejectContactRequestButton:
             model.contactRequest === Constants.ContactRequestState.Received
         showAcceptContactRequestButton: showRejectContactRequestButton
+        showRemoveRejectionButton: model.contactRequest === Constants.ContactRequestState.Dismissed
 
         contactText: model.contactRequest === Constants.ContactRequestState.Sent
                      ? qsTr("Contact Request Sent") : ""
@@ -41,5 +43,6 @@ StatusListView {
         onSendMessageRequested: root.sendMessageRequested(model.pubKey)
         onAcceptContactRequested: root.acceptContactRequested(model.pubKey)
         onRejectRequestRequested: root.rejectContactRequested(model.pubKey)
+        onRemoveRejectionRequested: root.rejectionRemoved(model.pubKey)
     }
 }
diff --git a/ui/app/AppLayouts/Profile/views/ContactsView.qml b/ui/app/AppLayouts/Profile/views/ContactsView.qml
@@ -31,6 +31,7 @@ SettingsContentBase {
     required property var blockedContactsModel
     required property var pendingContactsModel
     required property int pendingReceivedContactsCount
+    required property var dismissedReceivedRequestContactsModel
 
     property alias searchStr: searchBox.text
 
@@ -87,6 +88,13 @@ SettingsContentBase {
                 text: qsTr("Pending Requests")
                 badge.value: root.pendingReceivedContactsCount
             }
+            StatusTabButton {
+                objectName: "ContactsView_DismissedRequest_Button"
+
+                width: implicitWidth
+                enabled: !root.dismissedReceivedRequestContactsModel.ModelCount.empty
+                text: qsTr("Dismissed Requests")
+            }
             StatusTabButton {
                 objectName: "ContactsView_Blocked_Button"
 
@@ -175,6 +183,21 @@ SettingsContentBase {
                                       ViewSection.CurrentLabelAtStart
         }
 
+        ContactsList {
+            model: SortFilterProxyModel {
+                sourceModel: root.dismissedReceivedRequestContactsModel
+
+                filters: UserSearchFilter {
+                    searchString: searchBox.text
+                }
+
+                sorters: StringSorter {
+                    roleName: "preferredDisplayName"
+                    caseSensitivity: Qt.CaseInsensitive
+                }
+            }
+        }
+
         ContactsList {
             model: SortFilterProxyModel {
                 sourceModel: root.blockedContactsModel
@@ -198,6 +221,7 @@ SettingsContentBase {
         onSendMessageRequested: root.contactsStore.joinPrivateChat(publicKey)
         onAcceptContactRequested: root.contactsStore.acceptContactRequest(publicKey, "")
         onRejectContactRequested: root.contactsStore.dismissContactRequest(publicKey, "")
+        onRejectionRemoved: root.contactsStore.acceptContactRequest(publicKey, "")
     }
 
     component SectionComponent: Rectangle {

diff --git a/ui/app/mainui/AppMain.qml b/ui/app/mainui/AppMain.qml
@@ -1752,6 +1752,7 @@ Item {
                             blockedContactsModel: contactsModelAdaptor.blockedContacts
                             pendingContactsModel: contactsModelAdaptor.pendingContacts
                             pendingReceivedContactsCount: contactsModelAdaptor.pendingReceivedRequestContacts.count
+                            dismissedReceivedRequestContactsModel: contactsModelAdaptor.dimissedReceivedRequestContacts
 
                             Binding on settingsSubsection {
                                 value: profileLoader.settingsSubsection

diff --git a/ui/app/mainui/adaptors/ContactsModelAdaptor.qml b/ui/app/mainui/adaptors/ContactsModelAdaptor.qml
@@ -92,4 +92,19 @@ QObject {
             }
         ]
     }
+
+    readonly property var dimissedReceivedRequestContacts: SortFilterProxyModel {
+        sourceModel: root.allContacts ?? null
+
+        filters: [
+            ValueFilter {
+                roleName: "contactRequest"
+                value: Constants.ContactRequestState.Dismissed
+            },
+            ValueFilter {
+                roleName: "isBlocked"
+                value: false
+            }
+        ]
+    }
 }
diff --git a/ui/imports/utils/Constants.qml b/ui/imports/utils/Constants.qml
@@ -500,6 +500,7 @@ QtObject {
         readonly property int mutualContacts: 0
         readonly property int pendingContacts: 1
         readonly property int blockedContacts: 2
+        readonly property int rejectedReceivedContactRequest: 3
     }
 
     readonly property QtObject keypair: QtObject {