From 09c1fb716d0b66918c09075de0d36fa5ec79829c Mon Sep 17 00:00:00 2001 From: Jaco Greeff Date: Fri, 12 Mar 2021 13:08:25 +0100 Subject: [PATCH] Initial display for auction bids (#4828) * Initial display for auction bids * Dedupe bids --- packages/page-bounties/src/Bounty.tsx | 4 -- .../page-parachains/src/Auctions/Auction.tsx | 37 +++++------ packages/page-parachains/src/Auctions/Bid.tsx | 4 +- .../page-parachains/src/Auctions/Summary.tsx | 15 ++++- .../page-parachains/src/Auctions/WinBlock.tsx | 35 ++++++++++ .../page-parachains/src/Auctions/WinRange.tsx | 47 +++++++++++++ .../page-parachains/src/Auctions/index.tsx | 10 ++- .../page-parachains/src/Auctions/types.ts | 16 +++++ .../src/Auctions/useWinningData.ts | 66 +++++++++++++++++++ .../src/Crowdloan/FundContribute.tsx | 13 ++-- packages/react-components/src/Table/Body.tsx | 4 ++ packages/react-hooks/src/index.ts | 1 + .../react-hooks/src/useExtrinsicTrigger.ts | 34 ++++++++++ 13 files changed, 253 insertions(+), 33 deletions(-) create mode 100644 packages/page-parachains/src/Auctions/WinBlock.tsx create mode 100644 packages/page-parachains/src/Auctions/WinRange.tsx create mode 100644 packages/page-parachains/src/Auctions/types.ts create mode 100644 packages/page-parachains/src/Auctions/useWinningData.ts create mode 100644 packages/react-hooks/src/useExtrinsicTrigger.ts diff --git a/packages/page-bounties/src/Bounty.tsx b/packages/page-bounties/src/Bounty.tsx index a389914518..3d8424e6b8 100644 --- a/packages/page-bounties/src/Bounty.tsx +++ b/packages/page-bounties/src/Bounty.tsx @@ -209,10 +209,6 @@ export default React.memo(styled(Bounty)(({ theme }: ThemeProps) => ` visibility: visible; } - &.noBorder td { - border-bottom: 1px solid transparent; - } - .description-column { max-width: 200px; diff --git a/packages/page-parachains/src/Auctions/Auction.tsx b/packages/page-parachains/src/Auctions/Auction.tsx index 8cc56eef5a..e9ee000a92 100644 --- a/packages/page-parachains/src/Auctions/Auction.tsx +++ b/packages/page-parachains/src/Auctions/Auction.tsx @@ -6,10 +6,10 @@ import type { AuctionIndex, BlockNumber, LeasePeriodOf } from '@polkadot/types/i import React, { useRef } from 'react'; import { Table } from '@polkadot/react-components'; -import { formatNumber } from '@polkadot/util'; import { useTranslation } from '../translate'; -import Bid from './Bid'; +import useWinningData from './useWinningData'; +import WinBlock from './WinBlock'; interface Props { auctionInfo: [LeasePeriodOf, BlockNumber] | null; @@ -19,32 +19,31 @@ interface Props { function Auction ({ auctionInfo, className, numAuctions }: Props): React.ReactElement { const { t } = useTranslation(); + const winningData = useWinningData(); const headerRef = useRef([ - [t('auctions'), 'start', 1], - [t('duration'), 'number'], - [t('lease period'), 'number'], - [t('winning'), 'number', 3], - [] + [t('winners'), 'start', 4], + [t('range'), 'start'], + [t('value'), 'number'] ]); return ( ('No ongoing auction')} + empty={winningData && numAuctions && auctionInfo + ? t('No winners in this auction') + : t('No ongoing auction') + } header={headerRef.current} > - {auctionInfo && numAuctions && ( - - - - - - - )} + {winningData?.map((value, count) => ( + + ))}

{formatNumber(numAuctions)}

{formatNumber(auctionInfo[1])}{formatNumber(auctionInfo[0])} - - -
); } diff --git a/packages/page-parachains/src/Auctions/Bid.tsx b/packages/page-parachains/src/Auctions/Bid.tsx index 8bfd0b56ce..51068d5e3f 100644 --- a/packages/page-parachains/src/Auctions/Bid.tsx +++ b/packages/page-parachains/src/Auctions/Bid.tsx @@ -14,7 +14,7 @@ import { useTranslation } from '../translate'; interface Props { className?: string; - id: AuctionIndex; + id: AuctionIndex | null; } function Bid ({ className, id }: Props): React.ReactElement { @@ -34,7 +34,7 @@ function Bid ({ className, id }: Props): React.ReactElement { <>