diff --git a/packages/page-democracy/src/Overview/Referendums.tsx b/packages/page-democracy/src/Overview/Referendums.tsx index de9f39076e..7d2689b089 100644 --- a/packages/page-democracy/src/Overview/Referendums.tsx +++ b/packages/page-democracy/src/Overview/Referendums.tsx @@ -6,19 +6,17 @@ import { DeriveReferendumExt } from '@polkadot/api-derive/types'; import React, { useMemo } from 'react'; import { Table } from '@polkadot/react-components'; -import { useApi, useCall } from '@polkadot/react-hooks'; import Referendum from './Referendum'; import { useTranslation } from '../translate'; interface Props { className?: string; + referendums?: DeriveReferendumExt[]; } -function Referendums ({ className }: Props): React.ReactElement { +function Referendums ({ className, referendums }: Props): React.ReactElement { const { t } = useTranslation(); - const { api } = useApi(); - const referendums = useCall(api.derive.democracy.referendums, []); const header = useMemo(() => [ [t('referenda'), 'start', 2], diff --git a/packages/page-democracy/src/Overview/Summary.tsx b/packages/page-democracy/src/Overview/Summary.tsx index 9d46c2e919..84589c5961 100644 --- a/packages/page-democracy/src/Overview/Summary.tsx +++ b/packages/page-democracy/src/Overview/Summary.tsx @@ -10,16 +10,17 @@ import { formatNumber } from '@polkadot/util'; import { useTranslation } from '../translate'; -const ZERO = new BN(0); +interface Props { + referendumCount?: number; +} -function Summary (): React.ReactElement<{}> { +function Summary ({ referendumCount }: Props): React.ReactElement { const { t } = useTranslation(); const { api } = useApi(); const activeProposals = useCall(api.derive.democracy.proposals, []); const bestNumber = useCall(api.derive.chain.bestNumber, []); - const nextActive = useCall(api.query.democracy.lowestUnbaked, []); const publicPropCount = useCall(api.query.democracy.publicPropCount, []); - const referendumCount = useCall(api.query.democracy.referendumCount, []); + const referendumTotal = useCall(api.query.democracy.referendumCount, []); return ( @@ -33,10 +34,10 @@ function Summary (): React.ReactElement<{}> {
- {formatNumber(referendumCount && nextActive ? referendumCount.sub(nextActive) : ZERO)} + {formatNumber(referendumCount || 0)} - {formatNumber(referendumCount)} + {formatNumber(referendumTotal || 0)}
{bestNumber && ( diff --git a/packages/page-democracy/src/Overview/index.tsx b/packages/page-democracy/src/Overview/index.tsx index 16f71ebdf8..b46fc9032a 100644 --- a/packages/page-democracy/src/Overview/index.tsx +++ b/packages/page-democracy/src/Overview/index.tsx @@ -2,10 +2,12 @@ // This software may be modified and distributed under the terms // of the Apache-2.0 license. See the LICENSE file for details. +import { DeriveReferendumExt } from '@polkadot/api-derive/types'; + import React from 'react'; import styled from 'styled-components'; import { Button } from '@polkadot/react-components'; -import { useToggle } from '@polkadot/react-hooks'; +import { useApi, useCall, useToggle } from '@polkadot/react-hooks'; import { useTranslation } from '../translate'; import DispatchQueue from './DispatchQueue'; @@ -20,14 +22,16 @@ interface Props { className?: string; } -function Overview ({ className }: Props): React.ReactElement { +function Overview ({ className }: Props): React.ReactElement { const { t } = useTranslation(); + const { api } = useApi(); const [isPreimageOpen, togglePreimage] = useToggle(); const [isProposeOpen, togglePropose] = useToggle(); + const referendums = useCall(api.derive.democracy.referendums, []); return (
- +