From 0b2a511b26b16a13899617394251d2549c31d64c Mon Sep 17 00:00:00 2001
From: RachelElysia <71795832+RachelElysia@users.noreply.github.com>
Date: Tue, 24 Jan 2023 14:11:39 -0500
Subject: [PATCH] Fleet UI: Fix formatting for mdm unenroll activity (#9476)

@gillespi314

Authored by: gillespi314 <73313222+gillespi314@users.noreply.github.com>

Co-authored-by: gillespi314 <73313222+gillespi314@users.noreply.github.com>
---
 frontend/interfaces/activity.ts                        |  1 +
 .../cards/ActivityFeed/ActivityItem/ActivityItem.tsx   | 10 ++++------
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/frontend/interfaces/activity.ts b/frontend/interfaces/activity.ts
index 8f58e75e17..7f1a1f1701 100644
--- a/frontend/interfaces/activity.ts
+++ b/frontend/interfaces/activity.ts
@@ -61,5 +61,6 @@ export interface IActivityDetails {
   email?: string;
   role?: string;
   host_serial?: string;
+  host_display_name?: string;
   installed_from_dep?: boolean;
 }
diff --git a/frontend/pages/DashboardPage/cards/ActivityFeed/ActivityItem/ActivityItem.tsx b/frontend/pages/DashboardPage/cards/ActivityFeed/ActivityItem/ActivityItem.tsx
index a97d3b7b46..6458cd49cb 100644
--- a/frontend/pages/DashboardPage/cards/ActivityFeed/ActivityItem/ActivityItem.tsx
+++ b/frontend/pages/DashboardPage/cards/ActivityFeed/ActivityItem/ActivityItem.tsx
@@ -165,12 +165,10 @@ const TAGGED_TEMPLATES = {
   mdmUnenrolled: (activity: IActivity) => {
     return (
       <>
-        An end user turned off MDM features for a host with serial number
-        <b>
-          {activity.details?.host_serial} (
-          {activity.details?.installed_from_dep ? "automatic" : "manual"})
-        </b>
-        .
+        {activity.actor_full_name
+          ? " turned off mobile device management (MDM) for"
+          : "Mobile device management (MDM) was turned off for"}{" "}
+        <b>{activity.details?.host_display_name}</b>.
       </>
     );
   },