diff --git a/packages/page-democracy/src/Overview/Scheduled.tsx b/packages/page-democracy/src/Overview/Scheduled.tsx index 269d847584..8787c4b643 100644 --- a/packages/page-democracy/src/Overview/Scheduled.tsx +++ b/packages/page-democracy/src/Overview/Scheduled.tsx @@ -16,7 +16,7 @@ interface Props { value: ScheduledExt; } -function Scheduled ({ className = '', value: { call, count, maybePeriodic, nextBlockNumber } }: Props): React.ReactElement { +function Scheduled ({ className = '', value: { blockNumber, call, maybePeriodic } }: Props): React.ReactElement { const { api } = useApi(); const bestNumber = useCall(api.derive.chain.bestNumber, []); const period = maybePeriodic.unwrapOr(null); @@ -27,8 +27,8 @@ function Scheduled ({ className = '', value: { call, count, maybePeriodic, nextB {bestNumber && ( <> - - #{formatNumber(nextBlockNumber)} + + #{formatNumber(blockNumber)} )} @@ -39,7 +39,7 @@ function Scheduled ({ className = '', value: { call, count, maybePeriodic, nextB {period && ( - formatNumber(count) + ' / ' + formatNumber(period[1]) + formatNumber(period[1]) )} diff --git a/packages/page-democracy/src/Overview/Scheduler.tsx b/packages/page-democracy/src/Overview/Scheduler.tsx index 2616a7e2c6..8a60265f7d 100644 --- a/packages/page-democracy/src/Overview/Scheduler.tsx +++ b/packages/page-democracy/src/Overview/Scheduler.tsx @@ -20,7 +20,6 @@ interface Props { function Schedule ({ className = '' }: Props): React.ReactElement { const { t } = useTranslation(); const { api } = useApi(); - const bestNumber = useCall(api.derive.chain.bestNumber, []); const items = useCall(api.query.scheduler.agenda.entries as any, [], { transform: (entries: [{ args: [BlockNumber] }, Option[]][]): ScheduledExt[] => entries @@ -32,7 +31,7 @@ function Schedule ({ className = '' }: Props): React.ReactElement { .filter((schedOpt) => schedOpt.isSome) .map((schedOpt) => schedOpt.unwrap()) .reduce((items: ScheduledExt[], { call, maybeId, maybePeriodic, priority }, index) => { - items.push({ blockNumber, call, count: 0, key: `${blockNumber.toString()}-${index}`, maybeId, maybePeriodic, nextBlockNumber: blockNumber, priority }); + items.push({ blockNumber, call, key: `${blockNumber.toString()}-${index}`, maybeId, maybePeriodic, priority }); return items; }, items); @@ -46,37 +45,13 @@ function Schedule ({ className = '' }: Props): React.ReactElement { [t('count')] ], [t]); - let scheduled: ScheduledExt[] | undefined; - - if (bestNumber && items) { - scheduled = items - .map((schedule): ScheduledExt => { - if (schedule.maybePeriodic.isSome) { - const [inc, max] = schedule.maybePeriodic.unwrap(); - const nextBlockNumber = schedule.blockNumber.toBn(); - let count = 0; - - while (max.gtn(count) && nextBlockNumber.lt(bestNumber)) { - count++; - nextBlockNumber.iadd(inc); - } - - schedule.count = count; - schedule.nextBlockNumber = nextBlockNumber; - } - - return schedule; - }) - .filter(({ nextBlockNumber }) => nextBlockNumber.gt(bestNumber)); - } - return ( ('No active schedules')} + empty={items?.length === 0 && t('No active schedules')} header={header} > - {scheduled?.map((scheduled): React.ReactNode => ( + {items?.map((scheduled): React.ReactNode => ( ; maybePeriodic: Option; priority: SchedulePriority; - nextBlockNumber: BN; }