From 74dc56e82d83bd854f079ed92e2c5e621611cf2c Mon Sep 17 00:00:00 2001 From: Jaco Greeff Date: Sat, 20 Mar 2021 14:16:02 +0100 Subject: [PATCH] Add expander to proposals (#4878) * Add expander to proposals * Update packages/page-parachains/src/Proposals/Proposals.tsx --- .../src/Proposals/Proposal.tsx | 30 +++++++++++++------ .../src/Proposals/Proposals.tsx | 2 +- 2 files changed, 22 insertions(+), 10 deletions(-) diff --git a/packages/page-parachains/src/Proposals/Proposal.tsx b/packages/page-parachains/src/Proposals/Proposal.tsx index 1c540bbfa1..e40c59c12b 100644 --- a/packages/page-parachains/src/Proposals/Proposal.tsx +++ b/packages/page-parachains/src/Proposals/Proposal.tsx @@ -4,9 +4,9 @@ import type { ParaId } from '@polkadot/types/interfaces'; import type { ScheduledProposals } from '../types'; -import React, { useMemo } from 'react'; +import React, { useCallback, useMemo } from 'react'; -import { AddressMini, AddressSmall, Badge, ParaLink, TxButton } from '@polkadot/react-components'; +import { AddressMini, AddressSmall, Badge, Expander, ParaLink, TxButton } from '@polkadot/react-components'; import { useAccounts, useApi, useSudo } from '@polkadot/react-hooks'; import { FormatBalance } from '@polkadot/react-query'; import { formatNumber } from '@polkadot/util'; @@ -47,6 +47,16 @@ function Proposal ({ approvedIds, id, scheduled }: Props): React.ReactElement proposal.proposal?.validators.map((validatorId) => ( + + )), + [proposal.proposal] + ); + return (

{formatNumber(id)}

@@ -60,15 +70,17 @@ function Proposal ({ approvedIds, id, scheduled }: Props): React.ReactElement {proposal.proposal?.name.toUtf8()} + + {proposal.proposal?.validators && ( + ('Validators ({{count}})', { replace: { count: formatNumber(proposal.proposal?.validators.length) } })} + /> + )} + {proposal.proposal && } {proposal.proposal && } - {initialHex} - {proposal.proposal?.validators.map((validatorId) => ( - - ))} + {initialHex} {!(proposal.isApproved || proposal.isScheduled) && ( <> diff --git a/packages/page-parachains/src/Proposals/Proposals.tsx b/packages/page-parachains/src/Proposals/Proposals.tsx index 098bba9be1..6f01ba2cb9 100644 --- a/packages/page-parachains/src/Proposals/Proposals.tsx +++ b/packages/page-parachains/src/Proposals/Proposals.tsx @@ -25,10 +25,10 @@ function Proposals ({ proposals }: Props): React.ReactElement { const headerRef = useRef([ [t('proposals'), 'start', 3], [], + [], [t('proposer'), 'address'], [t('balance'), 'media--1100'], [t('initial state'), 'start media--1400'], - [t('validators'), 'start'], [] ]);