From f7657e0902304cbc68e0b658a804fdb16eee4d56 Mon Sep 17 00:00:00 2001
From: Jaco <jacogr@gmail.com>
Date: Mon, 6 Jun 2022 10:16:08 +0200
Subject: [PATCH] Sort scheduler display (#7703)

---
 packages/page-democracy/src/Execute/DispatchQueue.tsx | 5 ++++-
 packages/page-democracy/src/Execute/Scheduler.tsx     | 5 ++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/packages/page-democracy/src/Execute/DispatchQueue.tsx b/packages/page-democracy/src/Execute/DispatchQueue.tsx
index 0a54ca2a33..384f626c17 100644
--- a/packages/page-democracy/src/Execute/DispatchQueue.tsx
+++ b/packages/page-democracy/src/Execute/DispatchQueue.tsx
@@ -22,7 +22,10 @@ function DispatchQueue ({ className }: Props): React.ReactElement<Props> | null
   const queued = useCall<DeriveDispatch[]>(api.derive.democracy.dispatchQueue);
 
   const filtered = useMemo(
-    () => bestNumber && queued && queued.filter(({ at }) => at.gte(bestNumber)),
+    () => bestNumber && queued &&
+      queued
+        .filter(({ at }) => at.gte(bestNumber))
+        .sort((a, b) => a.at.cmp(b.at)),
     [bestNumber, queued]
   );
 
diff --git a/packages/page-democracy/src/Execute/Scheduler.tsx b/packages/page-democracy/src/Execute/Scheduler.tsx
index 8b0a5f1e8f..46b9831ba4 100644
--- a/packages/page-democracy/src/Execute/Scheduler.tsx
+++ b/packages/page-democracy/src/Execute/Scheduler.tsx
@@ -54,7 +54,10 @@ function Schedule ({ className = '' }: Props): React.ReactElement<Props> {
   const items = useCall<ScheduledExt[]>(api.query.scheduler.agenda.entries, undefined, OPT_SCHED);
 
   const filtered = useMemo(
-    () => bestNumber && items && items.filter(({ blockNumber }) => blockNumber.gte(bestNumber)),
+    () => bestNumber && items &&
+      items
+        .filter(({ blockNumber }) => blockNumber.gte(bestNumber))
+        .sort((a, b) => a.blockNumber.cmp(b.blockNumber)),
     [bestNumber, items]
   );