From 2b9e019c287477bbf7ffba4474aa860dcf056bad Mon Sep 17 00:00:00 2001
From: Daria <2395326+piggydoughnut@users.noreply.github.com>
Date: Wed, 5 Mar 2025 11:15:41 +1300
Subject: [PATCH] fix for showing expires even though chain renewed (#11353)

---
 packages/page-coretime/src/Row.tsx            |  4 ++--
 packages/react-hooks/src/types.ts             |  1 +
 .../react-hooks/src/useCoretimeInformation.ts | 23 ++++++++++++-------
 3 files changed, 18 insertions(+), 10 deletions(-)

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
       >
         <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
index 5986822aee..20e45af73c 100644
--- 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
index 30beedd59f..4f5ffa7e30 100644
--- 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 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