From a37ce0b1331db35a41ef97e61fbbdb4bfaea1f61 Mon Sep 17 00:00:00 2001
From: Jonathan Rainville <rainville.jonathan@gmail.com>
Date: Tue, 27 Jul 2021 13:59:01 -0400
Subject: [PATCH] chore(act-center): hide contact requests from the activity
 center

---
 ui/app/AppLayouts/Chat/ChatColumn.qml         |  2 +-
 .../Chat/ChatColumn/ActivityCenter.qml        | 51 +++++++++----------
 .../ChatComponents/ActivityCenterTopBar.qml   | 20 ++++----
 3 files changed, 36 insertions(+), 37 deletions(-)

diff --git a/ui/app/AppLayouts/Chat/ChatColumn.qml b/ui/app/AppLayouts/Chat/ChatColumn.qml
index cbb1c4bea3..dc8a68b311 100644
--- a/ui/app/AppLayouts/Chat/ChatColumn.qml
+++ b/ui/app/AppLayouts/Chat/ChatColumn.qml
@@ -234,7 +234,7 @@ Item {
 
                 membersButton.visible: appSettings.showOnlineUsers && chatsModel.channelView.activeChannel.chatType !== Constants.chatTypeOneToOne
                 notificationButton.visible: appSettings.isActivityCenterEnabled
-                notificationCount: chatsModel.activityNotificationList.unreadCount + profileModel.contacts.contactRequests.count
+                notificationCount: chatsModel.activityNotificationList.unreadCount
 
                 onSearchButtonClicked: searchPopup.open()
                 SearchPopup {
diff --git a/ui/app/AppLayouts/Chat/ChatColumn/ActivityCenter.qml b/ui/app/AppLayouts/Chat/ChatColumn/ActivityCenter.qml
index 2588b4c626..a4d2b3f3b8 100644
--- a/ui/app/AppLayouts/Chat/ChatColumn/ActivityCenter.qml
+++ b/ui/app/AppLayouts/Chat/ChatColumn/ActivityCenter.qml
@@ -18,7 +18,7 @@ Popup {
     property int currentFilter: ActivityCenter.Filter.All
     property bool hasMentions: false
     property bool hasReplies: false
-    property bool hasContactRequests: contactList.count > 0
+//    property bool hasContactRequests: false
 
     property bool hideReadNotifications: false
 
@@ -70,31 +70,31 @@ Popup {
             }
 
             // TODO remove this once it is handled by the activity center
-            Repeater {
-                id: contactList
-                model: profileModel.contacts.contactRequests
+//            Repeater {
+//                id: contactList
+//                model: profileModel.contacts.contactRequests
 
-                delegate: ContactRequest {
-                    visible: !hideReadNotifications &&
-                             (activityCenter.currentFilter === ActivityCenter.Filter.All || activityCenter.currentFilter === ActivityCenter.Filter.ContactRequests)
-                    name: Utils.removeStatusEns(model.name)
-                    address: model.address
-                    localNickname: model.localNickname
-                    identicon: model.thumbnailImage || model.identicon
-                    // TODO set to transparent bg if the notif is read
-                    color: Utils.setColorAlpha(Style.current.blue, 0.1)
-                    radius: 0
-                    profileClick: function (showFooter, userName, fromAuthor, identicon, textParam, nickName) {
-                        var popup = profilePopupComponent.createObject(contactList);
-                        popup.openPopup(showFooter, userName, fromAuthor, identicon, textParam, nickName);
-                    }
-                    onBlockContactActionTriggered: {
-                        blockContactConfirmationDialog.contactName = name
-                        blockContactConfirmationDialog.contactAddress = address
-                        blockContactConfirmationDialog.open()
-                    }
-                }
-            }
+//                delegate: ContactRequest {
+//                    visible: !hideReadNotifications &&
+//                             (activityCenter.currentFilter === ActivityCenter.Filter.All || activityCenter.currentFilter === ActivityCenter.Filter.ContactRequests)
+//                    name: Utils.removeStatusEns(model.name)
+//                    address: model.address
+//                    localNickname: model.localNickname
+//                    identicon: model.thumbnailImage || model.identicon
+//                    // TODO set to transparent bg if the notif is read
+//                    color: Utils.setColorAlpha(Style.current.blue, 0.1)
+//                    radius: 0
+//                    profileClick: function (showFooter, userName, fromAuthor, identicon, textParam, nickName) {
+//                        var popup = profilePopupComponent.createObject(contactList);
+//                        popup.openPopup(showFooter, userName, fromAuthor, identicon, textParam, nickName);
+//                    }
+//                    onBlockContactActionTriggered: {
+//                        blockContactConfirmationDialog.contactName = name
+//                        blockContactConfirmationDialog.contactAddress = address
+//                        blockContactConfirmationDialog.open()
+//                    }
+//                }
+//            }
 
             Repeater {
                 model: notifDelegateList
@@ -129,7 +129,6 @@ Popup {
                                 hasReplies = true
                             }
                             break
-
                         }
                     }
 
diff --git a/ui/app/AppLayouts/Chat/ChatColumn/ChatComponents/ActivityCenterTopBar.qml b/ui/app/AppLayouts/Chat/ChatColumn/ChatComponents/ActivityCenterTopBar.qml
index 1dd8944b92..70104fcc5a 100644
--- a/ui/app/AppLayouts/Chat/ChatColumn/ChatComponents/ActivityCenterTopBar.qml
+++ b/ui/app/AppLayouts/Chat/ChatColumn/ChatComponents/ActivityCenterTopBar.qml
@@ -50,16 +50,16 @@ Item {
            onClicked: activityCenter.currentFilter = ActivityCenter.Filter.Replies
        }
 
-       StatusButton {
-           id: contactRequestsBtn
-           //% "Contact requests"
-           text: qsTrId("contact-requests")
-           enabled: hasContactRequests
-           type: "secondary"
-           size: "small"
-           highlighted: activityCenter.currentFilter === ActivityCenter.Filter.ContactRequests
-           onClicked: activityCenter.currentFilter = ActivityCenter.Filter.ContactRequests
-       }
+//       StatusButton {
+//           id: contactRequestsBtn
+//           //% "Contact requests"
+//           text: qsTrId("contact-requests")
+//           enabled: hasContactRequests
+//           type: "secondary"
+//           size: "small"
+//           highlighted: activityCenter.currentFilter === ActivityCenter.Filter.ContactRequests
+//           onClicked: activityCenter.currentFilter = ActivityCenter.Filter.ContactRequests
+//       }
     }
 
     Row {