From ced2454bdcce77ba0c81dbe0aec965b79c63f56b Mon Sep 17 00:00:00 2001
From: MishkaRogachev <mishkarogachev@gmail.com>
Date: Mon, 26 Sep 2022 19:51:06 +0400
Subject: [PATCH] feat(ActivityCenter): Force sorting notifications by
 timespamp

Close #7492
---
 .../activitycenter/popups/ActivityCenterPopup.qml   | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/ui/app/mainui/activitycenter/popups/ActivityCenterPopup.qml b/ui/app/mainui/activitycenter/popups/ActivityCenterPopup.qml
index 430d30317b..6ed67d88b3 100644
--- a/ui/app/mainui/activitycenter/popups/ActivityCenterPopup.qml
+++ b/ui/app/mainui/activitycenter/popups/ActivityCenterPopup.qml
@@ -148,6 +148,13 @@ Popup {
 
             filters: ExpressionFilter { expression: filterActivityCategories(model.notificationType) &&
                                                     !(acStore.hideReadNotifications && model.read) }
+
+            sorters: [
+                RoleSorter {
+                    roleName: "timestamp"
+                    sortOrder: Qt.DescendingOrder
+                }
+            ]
         }
 
         delegate: DelegateChooser {
@@ -161,7 +168,7 @@ Popup {
                     store: root.store
                     notification: model
                     messageContextMenu: root.messageContextMenu
-                    previousNotificationIndex: Math.max(0, index - 1)
+                    previousNotificationIndex: Math.min(listView.count - 1, index + 1)
                     onActivityCenterClose: root.close()
                 }
             }
@@ -173,7 +180,7 @@ Popup {
                     store: root.store
                     notification: model
                     messageContextMenu: root.messageContextMenu
-                    previousNotificationIndex: Math.max(0, index - 1)
+                    previousNotificationIndex: Math.min(listView.count - 1, index + 1)
                     onActivityCenterClose: root.close()
                 }
             }
@@ -185,7 +192,7 @@ Popup {
                     store: root.store
                     notification: model
                     messageContextMenu: root.messageContextMenu
-                    previousNotificationIndex: Math.max(0, index - 1)
+                    previousNotificationIndex: Math.min(listView.count - 1, index + 1)
                     onActivityCenterClose: root.close()
                 }
             }