diff --git a/packages/page-parachains/src/Overview/Parachain.tsx b/packages/page-parachains/src/Overview/Parachain.tsx index 10ddbc54c8..f9aff0a0c1 100644 --- a/packages/page-parachains/src/Overview/Parachain.tsx +++ b/packages/page-parachains/src/Overview/Parachain.tsx @@ -11,7 +11,7 @@ import React, { useCallback, useMemo } from 'react'; import { AddressMini, Badge, Expander, ParaLink } from '@polkadot/react-components'; import { useApi, useCall, useCallMulti, useParaApi } from '@polkadot/react-hooks'; import { BlockToTime } from '@polkadot/react-query'; -import { BN_ONE, formatNumber } from '@polkadot/util'; +import { formatNumber } from '@polkadot/util'; import { useTranslation } from '../translate'; import { sliceHex } from '../util'; @@ -70,7 +70,6 @@ function Parachain ({ bestNumber, className = '', id, isScheduled, lastBacked, l const { api } = useApi(); const { api: paraApi } = useParaApi(id); const paraBest = useCall(paraApi?.rpc.chain.subscribeNewHeads, undefined, transformHeader); - const lastRelayNumber = useCall(lastInclusion && api.rpc.chain.getHeader, [lastInclusion && lastInclusion[1]], transformHeader); const paraInfo = useCallMulti([ [api.query.paras.heads, id], [api.query.paras.futureCodeUpgrades, id], @@ -83,13 +82,13 @@ function Parachain ({ bestNumber, className = '', id, isScheduled, lastBacked, l const blockDelay = useMemo( () => bestNumber && ( - lastRelayNumber - ? bestNumber.sub(lastRelayNumber).isub(BN_ONE) + lastInclusion + ? bestNumber.sub(lastInclusion[2]) : paraInfo.watermark ? bestNumber.sub(paraInfo.watermark) : undefined ), - [bestNumber, lastRelayNumber, paraInfo] + [bestNumber, lastInclusion, paraInfo] ); const valRender = useCallback( @@ -123,8 +122,8 @@ function Parachain ({ bestNumber, className = '', id, isScheduled, lastBacked, l {paraInfo.headHex} {blockDelay && } - {lastInclusion && lastRelayNumber - ? {formatNumber(lastRelayNumber)} + {lastInclusion + ? {formatNumber(lastInclusion[2])} : paraInfo.watermark && formatNumber(paraInfo.watermark) } diff --git a/packages/page-parachains/src/Overview/ParachainList.tsx b/packages/page-parachains/src/Overview/ParachainList.tsx index 66f4194ece..930cde1075 100644 --- a/packages/page-parachains/src/Overview/ParachainList.tsx +++ b/packages/page-parachains/src/Overview/ParachainList.tsx @@ -109,7 +109,7 @@ function ParachainList ({ ids, scheduled }: Props): React.ReactElement { [t('parachains'), 'start', 3], ['', 'media--1500'], [t('heads'), 'start'], - [t('included (parent)'), undefined, 2], + [t('included'), undefined, 2], [t('backed')], [t('chain best'), 'media--900'], [t('upgrade'), 'media--1300'],