diff --git a/packages/ui/src/app/pages/Election/PastElections/PastElections.tsx b/packages/ui/src/app/pages/Election/PastElections/PastElections.tsx index 06e10b778a..003f87c108 100644 --- a/packages/ui/src/app/pages/Election/PastElections/PastElections.tsx +++ b/packages/ui/src/app/pages/Election/PastElections/PastElections.tsx @@ -48,7 +48,7 @@ export const PastElections = () => { <> Round - Election ended at + Election ended at Total staked Revealed votes Total candidates diff --git a/packages/ui/src/common/components/BlockTime/BlockInfo.tsx b/packages/ui/src/common/components/BlockTime/BlockInfo.tsx index a4c37a4442..94c4d98fba 100644 --- a/packages/ui/src/common/components/BlockTime/BlockInfo.tsx +++ b/packages/ui/src/common/components/BlockTime/BlockInfo.tsx @@ -3,6 +3,7 @@ import styled, { css } from 'styled-components' import { BlockIcon } from '@/common/components/icons' import { Link } from '@/common/components/Link' +import { Tooltip } from '@/common/components/Tooltip' import { TextSmall } from '@/common/components/typography' import { Colors } from '@/common/constants' import { useNetworkEndpoints } from '@/common/hooks/useNetworkEndpoints' @@ -17,18 +18,24 @@ export interface BlockInfoProp { export const BlockInfo = ({ block, lessInfo, inline }: BlockInfoProp) => { const [endpoints] = useNetworkEndpoints() + const explorerURLBase = `https://polkadot.js.org/apps/?rpc=${endpoints.nodeRpcEndpoint}/ws-rpc#/explorer/query/` + const tooltipLinkURL = explorerURLBase + block.number + const tooltipText = Produced on {block.network} network. + return ( - - + + - {formatTokenValue(block.number)} {lessInfo && 'block'} + {lessInfo && 'Block'} {formatTokenValue(block.number)} - {/* {!lessInfo && on {block.network} network} */} - - + + ) } diff --git a/packages/ui/src/council/components/election/pastElection/PastElectionStats.tsx b/packages/ui/src/council/components/election/pastElection/PastElectionStats.tsx index 94cfed6575..7ba7eb2ac1 100644 --- a/packages/ui/src/council/components/election/pastElection/PastElectionStats.tsx +++ b/packages/ui/src/council/components/election/pastElection/PastElectionStats.tsx @@ -30,16 +30,16 @@ export const PastElectionStats = ({ tooltipLinkText="Learn more" tooltipLinkURL="https://joystream.gitbook.io/testnet-workspace/system/council#election" > - {cycleId} round + {cycleId} diff --git a/packages/ui/src/council/components/election/pastElection/PastElectionsList/PastElectionsListRow.tsx b/packages/ui/src/council/components/election/pastElection/PastElectionsList/PastElectionsListRow.tsx index 7db781f159..af27169f2c 100644 --- a/packages/ui/src/council/components/election/pastElection/PastElectionsList/PastElectionsListRow.tsx +++ b/packages/ui/src/council/components/election/pastElection/PastElectionsList/PastElectionsListRow.tsx @@ -17,6 +17,7 @@ interface PastElectionsListRowProps { } export const PastElectionsListRow = ({ election }: PastElectionsListRowProps) => { + const endedAt = election.finishedAtBlock return ( to={generatePath(ElectionRoutes.pastElection, { id: election.id })} > #{election.cycleId} - {election.finishedAtBlock ? ( - - ) : ( - <> - )} + {endedAt ? : <>}