fix(frontend): sort announcements by time (#133)

GZTimeWalker · Aug 14, 2023 · 57c1923 · 57c1923
1 parent 2e270f7
commit 57c1923
Showing 1 changed file with 3 additions and 5 deletions.
diff --git a/src/GZCTF/ClientApp/src/components/GameNoticePanel.tsx b/src/GZCTF/ClientApp/src/components/GameNoticePanel.tsx
@@ -120,11 +120,9 @@ const GameNoticePanel: FC = () => {
   const filteredNotices = ApplyFilter(allNotices, filter)
 
   filteredNotices.sort((a, b) =>
-    a.type === NoticeType.Normal && b.type === NoticeType.Normal
-      ? 0
-      : a.type === NoticeType.Normal
-      ? -1
-      : 1
+    a.type !== b.type && (a.type === NoticeType.Normal || b.type == NoticeType.Normal)
+      ? (a.type === NoticeType.Normal ? -1 : 1)
+      : (dayjs(a.time).isAfter(b.time) ? -1 : 1)
   )
 
   return (