From ec6859d5e41e4af321beb59a98a783a569b346f7 Mon Sep 17 00:00:00 2001
From: Jaco <jacogr@gmail.com>
Date: Wed, 7 Jul 2021 08:21:06 +0300
Subject: [PATCH] Clear dispatchQueue on bestNumber > enact (#5782)

---
 packages/page-democracy/src/Execute/DispatchQueue.tsx | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/packages/page-democracy/src/Execute/DispatchQueue.tsx b/packages/page-democracy/src/Execute/DispatchQueue.tsx
index 29a33d8b75..a8988c3cbf 100644
--- a/packages/page-democracy/src/Execute/DispatchQueue.tsx
+++ b/packages/page-democracy/src/Execute/DispatchQueue.tsx
@@ -6,7 +6,7 @@ import type { DeriveDispatch } from '@polkadot/api-derive/types';
 import React, { useRef } from 'react';
 
 import { Table } from '@polkadot/react-components';
-import { useApi, useCall } from '@polkadot/react-hooks';
+import { useApi, useBestNumber, useCall } from '@polkadot/react-hooks';
 
 import { useTranslation } from '../translate';
 import DispatchEntry from './DispatchEntry';
@@ -18,6 +18,7 @@ interface Props {
 function DispatchQueue ({ className }: Props): React.ReactElement<Props> | null {
   const { t } = useTranslation();
   const { api } = useApi();
+  const bestNumber = useBestNumber();
   const queued = useCall<DeriveDispatch[]>(api.derive.democracy.dispatchQueue);
 
   const headerRef = useRef([
@@ -33,7 +34,7 @@ function DispatchQueue ({ className }: Props): React.ReactElement<Props> | null
       empty={queued && t<string>('Nothing queued for execution')}
       header={headerRef.current}
     >
-      {queued?.map((entry): React.ReactNode => (
+      {bestNumber && queued?.filter(({ at }) => bestNumber.gte(at)).map((entry): React.ReactNode => (
         <DispatchEntry
           key={entry.index.toString()}
           value={entry}