diff --git a/frontend/pages/DashboardPage/cards/ActivityFeed/GlobalActivityItem/GlobalActivityItem.tsx b/frontend/pages/DashboardPage/cards/ActivityFeed/GlobalActivityItem/GlobalActivityItem.tsx
index 39696c8899..e5abfdd656 100644
--- a/frontend/pages/DashboardPage/cards/ActivityFeed/GlobalActivityItem/GlobalActivityItem.tsx
+++ b/frontend/pages/DashboardPage/cards/ActivityFeed/GlobalActivityItem/GlobalActivityItem.tsx
@@ -1352,7 +1352,9 @@ const GlobalActivityItem = ({
const hasDetails = ACTIVITIES_WITH_DETAILS.has(activity.type);
const renderActivityPrefix = () => {
- const DEFAULT_ACTOR_DISPLAY = {activity.actor_full_name ?? "Fleet"} ;
+ const DEFAULT_ACTOR_DISPLAY = (
+ {activity.fleet_initiated ? "Fleet" : activity.actor_full_name}
+ );
switch (activity.type) {
case ActivityType.UserLoggedIn:
diff --git a/frontend/pages/hosts/details/cards/Activity/ActivityItems/InstalledSoftwareActivityItem/InstalledSoftwareActivityItem.tsx b/frontend/pages/hosts/details/cards/Activity/ActivityItems/InstalledSoftwareActivityItem/InstalledSoftwareActivityItem.tsx
index 6d0a623cc4..4e1612ba1b 100644
--- a/frontend/pages/hosts/details/cards/Activity/ActivityItems/InstalledSoftwareActivityItem/InstalledSoftwareActivityItem.tsx
+++ b/frontend/pages/hosts/details/cards/Activity/ActivityItems/InstalledSoftwareActivityItem/InstalledSoftwareActivityItem.tsx
@@ -9,6 +9,7 @@ import { IHostActivityItemComponentPropsWithShowDetails } from "../../ActivityCo
const baseClass = "installed-software-activity-item";
const InstalledSoftwareActivityItem = ({
+ tab,
activity,
onShowDetails,
hideCancel,
@@ -24,6 +25,12 @@ const InstalledSoftwareActivityItem = ({
{actorName ?? "Fleet"}
);
+ let installedSoftwarePrefix = getInstallStatusPredicate(status);
+ if (tab !== "past" && activity.fleet_initiated) {
+ installedSoftwarePrefix =
+ status === "pending_uninstall" ? "will uninstall" : "will install";
+ }
+
return (
- <>{actorDisplayName}> {getInstallStatusPredicate(status)} {title}{" "}
- on this host {self_service && "(self-service)"}.{" "}
+ <>{actorDisplayName}> {installedSoftwarePrefix} {title} on this
+ host{self_service && " (self-service)"}.{" "}
);
};
diff --git a/frontend/pages/hosts/details/cards/Activity/ActivityItems/RanScriptActivityItem/RanScriptActivityItem.tsx b/frontend/pages/hosts/details/cards/Activity/ActivityItems/RanScriptActivityItem/RanScriptActivityItem.tsx
index ae4be92455..df7ec7bb49 100644
--- a/frontend/pages/hosts/details/cards/Activity/ActivityItems/RanScriptActivityItem/RanScriptActivityItem.tsx
+++ b/frontend/pages/hosts/details/cards/Activity/ActivityItems/RanScriptActivityItem/RanScriptActivityItem.tsx
@@ -15,7 +15,10 @@ const RanScriptActivityItem = ({
isSoloActivity,
hideCancel,
}: IHostActivityItemComponentPropsWithShowDetails) => {
- const ranScriptPrefix = tab === "past" ? "ran" : "told Fleet to run";
+ let ranScriptPrefix = tab === "past" ? "ran" : "told Fleet to run";
+ if (tab !== "past" && activity.fleet_initiated) {
+ ranScriptPrefix = "will run";
+ }
return (