fix for showing expires even though chain renewed (#11353)

polkadot-js · Mar 4, 2025 · 2b9e019 · 2b9e019
1 parent 506b38c
commit 2b9e019
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 9 deletions.
diff --git 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
       >
         <span>
           {estimatedTime}
-          {!!isWithinWeek && !isReservation && (
+          {!!isWithinWeek && !isReservation && chainRecord?.renewalStatus !== ChainRenewalStatus.Renewed && (
             <StyledMarkWarning
               content='Expires Soon'
             />
@@ -108,7 +108,7 @@ function Row ({ chainRecord, highlight = false, id, lastCommittedTimeslice, leas
       <StyledCell
         $p={highlight}
         className='media--1200'
-      >{chainRecord?.renewalStatus}</StyledCell>
+      >{chainRecord?.renewalStatus === ChainRenewalStatus.Renewed ? chainRecord.renewalStatusMessage : chainRecord.renewalStatus}</StyledCell>
       <StyledCell
         $p={highlight}
         className='media--1200'

diff --git a/packages/react-hooks/src/types.ts b/packages/react-hooks/src/types.ts
@@ -335,6 +335,7 @@ export interface ChainWorkTaskInformation {
   lastBlock: number
   renewal: PotentialRenewal | undefined
   renewalStatus: string
+  renewalStatusMessage: string
   type: CoreTimeTypes
   workload: CoreWorkload | undefined
   workplan: CoreWorkplan[] | undefined

diff --git a/packages/react-hooks/src/useCoretimeInformation.ts b/packages/react-hooks/src/useCoretimeInformation.ts
@@ -138,23 +138,30 @@ function useCoretimeInformationImpl (api: ApiPromise, ready: boolean): CoretimeI
 
         const potentialRenewal = potentialRenewalsCurrentRegion?.find((renewal) => renewal.task.toString() === taskId);
 
-        let renewalStatus = potentialRenewal ? ChainRenewalStatus.Eligible : ChainRenewalStatus.None;
-        const chainRegionEnd = (renewalStatus === ChainRenewalStatus.Renewed ? salesInfo?.regionEnd : salesInfo?.regionBegin);
-        const targetTimeslice = lease?.until || chainRegionEnd;
+        const chainRenewedCore = type === CoreTimeTypes['Bulk Coretime'] && !!workplan?.length;
 
-        const lastBlock = targetTimeslice ? targetTimeslice * coretimeConstants?.relay.blocksPerTimeslice : 0;
+        let renewalStatus = ChainRenewalStatus.None;
+        let renewalStatusMessage = '';
 
-        const chainRenewedCore = type === CoreTimeTypes['Bulk Coretime'] && !!workplan?.length;
+        if (potentialRenewal) {
+          renewalStatus = ChainRenewalStatus.Eligible;
+        }
 
         if (chainRenewedCore) {
-          renewalStatus = `Next cycle on core ${workplan[0].core}`;
+          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;
+
         return {
-          chainRenewedCore,
           lastBlock,
           renewal: potentialRenewal,
           renewalStatus,
+          renewalStatusMessage,
           type,
           workload,
           workplan