From d922ee47589a0f1a5538c7d64cd12fdb6c57724f Mon Sep 17 00:00:00 2001
From: Ramon de Klein <mail@ramondeklein.nl>
Date: Thu, 24 Oct 2024 17:19:06 +0200
Subject: [PATCH 1/2] show epoch expiry as never

---
 web-app/src/screens/Console/Account/AccountUtils.tsx | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/web-app/src/screens/Console/Account/AccountUtils.tsx b/web-app/src/screens/Console/Account/AccountUtils.tsx
index d938a414f6..0b86cb88ac 100644
--- a/web-app/src/screens/Console/Account/AccountUtils.tsx
+++ b/web-app/src/screens/Console/Account/AccountUtils.tsx
@@ -23,14 +23,15 @@ export const ACCOUNT_TABLE_COLUMNS = [
     label: "Expiry",
     elementKey: "expiration",
     renderFunction: (expTime: string) => {
-      if (expTime) {
+      if (expTime !== "1970-01-01T00:00:00Z") {
         const fmtDate = DateTime.fromISO(expTime)
           .toUTC()
           .toFormat("y/M/d hh:mm:ss z");
 
         return <span title={fmtDate}>{fmtDate}</span>;
+      } else {
+        return <span>never</span>;
       }
-      return "";
     },
   },
   {

From 51fc80d08edf39fed7cc727e5f3989002de29bd7 Mon Sep 17 00:00:00 2001
From: Ramon de Klein <mail@ramondeklein.nl>
Date: Thu, 24 Oct 2024 17:19:06 +0200
Subject: [PATCH 2/2] show epoch expiry as no-expiry

---
 web-app/src/screens/Console/Account/AccountUtils.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web-app/src/screens/Console/Account/AccountUtils.tsx b/web-app/src/screens/Console/Account/AccountUtils.tsx
index 0b86cb88ac..5f93c108b2 100644
--- a/web-app/src/screens/Console/Account/AccountUtils.tsx
+++ b/web-app/src/screens/Console/Account/AccountUtils.tsx
@@ -30,7 +30,7 @@ export const ACCOUNT_TABLE_COLUMNS = [
 
         return <span title={fmtDate}>{fmtDate}</span>;
       } else {
-        return <span>never</span>;
+        return <span>no-expiry</span>;
       }
     },
   },