diff --git a/packages/app-democracy/src/Referendums.tsx b/packages/app-democracy/src/Referendums.tsx index d5f566ae75..118927707d 100644 --- a/packages/app-democracy/src/Referendums.tsx +++ b/packages/app-democracy/src/Referendums.tsx @@ -4,7 +4,6 @@ import { I18nProps } from '@polkadot/ui-app/types'; -import BN from 'bn.js'; import React from 'react'; import { ReferendumInfoExtended } from '@polkadot/api-derive/democracy/referendumInfo'; import { Option } from '@polkadot/types'; @@ -14,8 +13,6 @@ import Referendum from './Referendum'; import translate from './translate'; type Props = I18nProps & { - democracy_nextTally?: BN, - democracy_referendumCount?: BN, democracy_referendums?: Array> }; @@ -32,10 +29,12 @@ class Referendums extends React.PureComponent { } private renderReferendums () { - const { democracy_nextTally, democracy_referendums, democracy_referendumCount, t } = this.props; - const referendumCount = (democracy_referendumCount || new BN(0)).toNumber(); + const { democracy_referendums = [], t } = this.props; + const referendums = democracy_referendums + .filter((opt) => opt.isSome) + .map((opt) => opt.unwrap()); - if (!democracy_referendums || !democracy_referendums.length || (referendumCount === (democracy_nextTally || new BN(0)).toNumber())) { + if (!referendums.length) { return (
{t('no available referendums')} @@ -43,23 +42,18 @@ class Referendums extends React.PureComponent { ); } - return democracy_referendums - .filter((opt) => opt.isSome) - .map((opt) => opt.unwrap()) - .map((referendum) => ( - - )); + return referendums.map((referendum) => ( + + )); } } export default translate( withCalls( - 'query.democracy.nextTally', - 'query.democracy.referendumCount', 'derive.democracy.referendums' )(Referendums) );