diff --git a/packages/page-coretime/src/Row.tsx b/packages/page-coretime/src/Row.tsx index d8fac0ca26..21f4eb14b0 100644 --- a/packages/page-coretime/src/Row.tsx +++ b/packages/page-coretime/src/Row.tsx @@ -98,7 +98,7 @@ function Row ({ chainRecord, highlight = false, id, lastCommittedTimeslice, leas > {estimatedTime} - {!!isWithinWeek && !isReservation && ( + {!!isWithinWeek && !isReservation && chainRecord?.renewalStatus !== ChainRenewalStatus.Renewed && ( @@ -108,7 +108,7 @@ function Row ({ chainRecord, highlight = false, id, lastCommittedTimeslice, leas {chainRecord?.renewalStatus} + >{chainRecord?.renewalStatus === ChainRenewalStatus.Renewed ? chainRecord.renewalStatusMessage : chainRecord.renewalStatus} renewal.task.toString() === taskId); - let renewalStatus = potentialRenewal ? ChainRenewalStatus.Eligible : ChainRenewalStatus.None; + const chainRenewedCore = type === CoreTimeTypes['Bulk Coretime'] && !!workplan?.length; + + let renewalStatus = ChainRenewalStatus.None; + let renewalStatusMessage = ''; + + if (potentialRenewal) { + renewalStatus = ChainRenewalStatus.Eligible; + } + + if (chainRenewedCore) { + renewalStatus = ChainRenewalStatus.Renewed; + renewalStatusMessage = `Next cycle on core ${workplan[0].core}`; + } + const chainRegionEnd = (renewalStatus === ChainRenewalStatus.Renewed ? salesInfo?.regionEnd : salesInfo?.regionBegin); const targetTimeslice = lease?.until || chainRegionEnd; const lastBlock = targetTimeslice ? targetTimeslice * coretimeConstants?.relay.blocksPerTimeslice : 0; - const chainRenewedCore = type === CoreTimeTypes['Bulk Coretime'] && !!workplan?.length; - - if (chainRenewedCore) { - renewalStatus = `Next cycle on core ${workplan[0].core}`; - } - return { - chainRenewedCore, lastBlock, renewal: potentialRenewal, renewalStatus, + renewalStatusMessage, type, workload, workplan