chore(contact-request): remove old contact request button and popup

Fixes #9072 I made clicking on the OS notification open the AC instead of the old popup
status-im · Jan 13, 2023 · f8c4682 · f8c4682
1 parent c16fc0d
commit f8c4682
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 134 deletions.
diff --git a/src/app/modules/main/module.nim b/src/app/modules/main/module.nim
@@ -861,7 +861,7 @@ method displayWindowsOsNotification*[T](self: Module[T], title: string,
 method osNotificationClicked*[T](self: Module[T], details: NotificationDetails) =
   if(details.notificationType == NotificationType.NewContactRequest):
     self.controller.switchTo(details.sectionId, "", "")
-    self.view.emitOpenContactRequestsPopupSignal()
+    self.view.emitOpenActivityCenterSignal()
   elif(details.notificationType == NotificationType.JoinCommunityRequest):
     self.controller.switchTo(details.sectionId, "", "")
     self.view.emitOpenCommunityMembershipRequestsPopupSignal(details.sectionId)

diff --git a/src/app/modules/main/view.nim b/src/app/modules/main/view.nim
@@ -197,9 +197,9 @@ QtObject:
   proc emitResolvedENSSignal*(self: View, resolvedPubKey: string, resolvedAddress: string, uuid: string) =
     self.resolvedENS(resolvedPubKey, resolvedAddress, uuid)
 
-  proc openContactRequestsPopup*(self: View) {.signal.}
-  proc emitOpenContactRequestsPopupSignal*(self: View) =
-    self.openContactRequestsPopup()
+  proc openActivityCenter*(self: View) {.signal.}
+  proc emitOpenActivityCenterSignal*(self: View) =
+    self.openActivityCenter()
 
   proc openCommunityMembershipRequestsPopup*(self: View, sectionId: string) {.signal.}
   proc emitOpenCommunityMembershipRequestsPopupSignal*(self: View, sectionId: string) =

diff --git a/ui/app/AppLayouts/Chat/popups/ContactRequestsPopup.qml b/ui/app/AppLayouts/Chat/popups/ContactRequestsPopup.qml
diff --git a/ui/app/AppLayouts/Chat/views/ContactsColumnView.qml b/ui/app/AppLayouts/Chat/views/ContactsColumnView.qml
@@ -127,21 +127,6 @@ Item {
             }
         }
 
-        // contact requests
-        StatusContactRequestsIndicatorListItem {
-            id: contactRequests
-            Layout.fillWidth: true
-            Layout.preferredHeight: visible ? implicitHeight : 0
-
-            readonly property int nbRequests: root.store.contactRequestsModel.count
-
-            visible: nbRequests > 0
-            title: qsTr("Contact requests")
-            requestsCount: nbRequests
-
-            onClicked: Global.openPopup(contactRequestsPopup)
-        }
-
         Item {
             Layout.fillWidth: true
             Layout.fillHeight: true
@@ -309,16 +294,6 @@ Item {
         }
     }
 
-    Component {
-        id: contactRequestsPopup
-        ContactRequestsPopup {
-            store: root.store
-            onClosed: {
-                destroy()
-            }
-        }
-    }
-
     Connections {
         target: root.store
         function onImportingCommunityStateChanged(communityId, state, errorMsg) {
@@ -353,12 +328,4 @@ Item {
                                        "")
         }
     }
-
-    Connections {
-        target: root.store.mainModuleInst
-
-        function onOpenContactRequestsPopup() {
-            Global.openPopup(contactRequestsPopup)
-        }
-    }
 }
diff --git a/ui/app/mainui/AppMain.qml b/ui/app/mainui/AppMain.qml
@@ -74,6 +74,10 @@ Item {
         onActiveSectionChanged: {
             createChatView.opened = false
         }
+
+        onOpenActivityCenter: {
+            Global.openPopup(activityCenterPopupComponent)
+        }
     }
 
     Popups {