Merge branch 'master' into disable-pubkey-download

minio · Oct 26, 2024 · c9882cf · c9882cf
2 parents 3128f7f + 3d8b98f
commit c9882cf
Showing 1 changed file with 3 additions and 2 deletions.
diff --git 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>no-expiry</span>;
       }
-      return "";
     },
   },
   {