From b1a6d67be446523c1099e08683ba678cfd75654c Mon Sep 17 00:00:00 2001 From: Sarah Gillespie <73313222+gillespi314@users.noreply.github.com> Date: Thu, 29 Jan 2026 08:39:06 -0600 Subject: [PATCH] Update styling of MDM enrollment modal in device user UI (#38901) --- .../AutoEnrollMdmModal/AutoEnrollMdmModal.tsx | 17 +++++++++++------ .../AutoEnrollMdmModal/_styles.scss | 4 ++++ 2 files changed, 15 insertions(+), 6 deletions(-) diff --git a/frontend/pages/hosts/details/DeviceUserPage/AutoEnrollMdmModal/AutoEnrollMdmModal.tsx b/frontend/pages/hosts/details/DeviceUserPage/AutoEnrollMdmModal/AutoEnrollMdmModal.tsx index 8d7ecd7d3f..c85f2a5643 100644 --- a/frontend/pages/hosts/details/DeviceUserPage/AutoEnrollMdmModal/AutoEnrollMdmModal.tsx +++ b/frontend/pages/hosts/details/DeviceUserPage/AutoEnrollMdmModal/AutoEnrollMdmModal.tsx @@ -19,12 +19,14 @@ const AutoEnrollMdmModal = ({ onCancel, }: IAutoEnrollMdmModalProps): JSX.Element => { let isMacOsSonomaOrLater = false; + let isMacOs26OrLater = false; if (platform === "darwin" && os_version.startsWith("macOS ")) { const [major] = os_version .replace("macOS ", "") .split(".") .map((s) => parseInt(s, 10)); isMacOsSonomaOrLater = major >= 14; + isMacOs26OrLater = major >= 26; } const preSonomaBody = ( @@ -66,6 +68,9 @@ const AutoEnrollMdmModal = ({ ); + const enrollCTA = isMacOs26OrLater + ? "Enroll in Device Management" + : "Enroll in Remote Management"; const sonomaAndAboveBody = ( <>

@@ -77,14 +82,14 @@ const AutoEnrollMdmModal = ({ System Settings.

  • - In the sidebar menu, select Enroll in Remote Management, and - select Enroll. + In the sidebar menu, select {enrollCTA}, and select{" "} + Enroll.
    - If you don't see Enroll in Remote Management, open - your Terminal app (Finder {">"} Applications{" "} - {">"} Utilities folder), copy and paste the below command, - press enter, enter your password, and press enter again. + If you don't see {enrollCTA}, open your{" "} + Terminal app (Finder {">"} Applications {">"}{" "} + Utilities folder), copy and paste the below command, press + enter, enter your password, and press enter again.