From 5ec2deba9cdbb86ff4f650b04e72315ee8356ebb Mon Sep 17 00:00:00 2001
From: RachelElysia <71795832+RachelElysia@users.noreply.github.com>
Date: Thu, 8 May 2025 09:16:51 -0400
Subject: [PATCH] Fleet UI: Fix unreleased app store app timestamp broken
 (#28934)

---
 frontend/interfaces/software.ts                     |  2 +-
 .../Software/SelfService/SelfServiceTableConfig.tsx | 13 +++++++++----
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/frontend/interfaces/software.ts b/frontend/interfaces/software.ts
index a6dc031ecc..f2df9b8ab5 100644
--- a/frontend/interfaces/software.ts
+++ b/frontend/interfaces/software.ts
@@ -365,7 +365,7 @@ export interface ISoftwareInstallVersion {
 export interface IHostSoftwarePackage {
   name: string;
   self_service: boolean;
-  icon_url: string;
+  icon_url: string | null;
   version: string;
   last_install: ISoftwareLastInstall | null;
   categories?: SoftwareCategory[];
diff --git a/frontend/pages/hosts/details/cards/Software/SelfService/SelfServiceTableConfig.tsx b/frontend/pages/hosts/details/cards/Software/SelfService/SelfServiceTableConfig.tsx
index 723c67df61..0169638bfc 100644
--- a/frontend/pages/hosts/details/cards/Software/SelfService/SelfServiceTableConfig.tsx
+++ b/frontend/pages/hosts/details/cards/Software/SelfService/SelfServiceTableConfig.tsx
@@ -45,8 +45,11 @@ const STATUS_CONFIG: Record<
   installed: {
     iconName: "success",
     displayText: "Installed",
-    tooltip: ({ lastInstalledAt = "" }) =>
-      `Software is installed (${dateAgo(lastInstalledAt as string)}).`,
+    tooltip: ({ lastInstalledAt = null }) => {
+      return `Software is installed${
+        lastInstalledAt ? ` (${dateAgo(lastInstalledAt)})` : ""
+      }.`;
+    },
   },
   pending_install: {
     iconName: "pending-outline",
@@ -56,7 +59,7 @@ const STATUS_CONFIG: Record<
   failed_install: {
     iconName: "error",
     displayText: "Failed",
-    tooltip: ({ lastInstalledAt = "" }) => (
+    tooltip: ({ lastInstalledAt = null }) => (
       <>
         Software failed to install
         {lastInstalledAt ? ` (${dateAgo(lastInstalledAt)})` : ""}. Select{" "}
@@ -300,7 +303,9 @@ export const generateSoftwareTableHeaders = ({
         <InstallerStatus
           status={cellProps.row.original.status}
           last_install={
-            cellProps.row.original.software_package?.last_install || null
+            cellProps.row.original.software_package?.last_install ||
+            cellProps.row.original.app_store_app?.last_install ||
+            null
           }
           onShowInstallerDetails={onShowInstallerDetails}
         />