Fix order of messages in activity (#9943)

* Fix order of messages in activity

Signed-off-by: Nikolay Marchuk <[email protected]>

* Fix svelte-check

Signed-off-by: Nikolay Marchuk <[email protected]>

---------

Signed-off-by: Nikolay Marchuk <[email protected]>

Author: n1kolasM

plugins/activity-resources/src/components/ActivityFilter.svelte

@@ -24,7 +24,7 @@
   import activity from '../plugin'
   import FilterPopup from './FilterPopup.svelte'
   import IconClose from './icons/Close.svelte'
-  import { sortActivityMessages } from '../activityMessagesUtils'
+  import { activityMessagesComparator } from '../activityMessagesUtils'
   import { setActivityNewestFirst } from '../utils'
 
   export let messages: ActivityMessage[]
@@ -91,9 +91,13 @@
     selected: Ref<Doc>[] | Ref<ActivityMessagesFilter>,
     sortOrder: SortingOrder
   ): Promise<void> {
-    const sortedMessages = sortActivityMessages(messages, sortOrder).sort(({ isPinned }) =>
-      isPinned && sortOrder === SortingOrder.Ascending ? -1 : 1
-    )
+    const baseComparator = (m1: ActivityMessage, m2: ActivityMessage): number =>
+      sortOrder === SortingOrder.Ascending ? activityMessagesComparator(m1, m2) : activityMessagesComparator(m2, m1)
+    const sortedMessages = messages.sort((message1, message2) => {
+      const isPinned1 = message1.isPinned ?? false
+      const isPinned2 = message2.isPinned ?? false
+      return isPinned1 === isPinned2 ? baseComparator(message1, message2) : Number(isPinned2) - Number(isPinned1)
+    })
 
     if (selected === allId) {
       filtered = sortedMessages