From 6d8709646e83a1dd6ad575b83b53ef2a173e2121 Mon Sep 17 00:00:00 2001 From: Sarah Gillespie <73313222+gillespi314@users.noreply.github.com> Date: Wed, 18 Sep 2024 16:49:38 -0500 Subject: [PATCH] Update tooltip for mac minimum target OS version label (#22157) (#22225) Backport #22157 Co-authored-by: Gabriel Hernandez Co-authored-by: Roberto Dip --- .../21976-update-macos-target-version-tooltip | 1 + .../AppleOSTargetForm/AppleOSTargetForm.tsx | 24 ++++++++++--------- 2 files changed, 14 insertions(+), 11 deletions(-) create mode 100644 changes/21976-update-macos-target-version-tooltip diff --git a/changes/21976-update-macos-target-version-tooltip b/changes/21976-update-macos-target-version-tooltip new file mode 100644 index 000000000000..5ae1a5ffdf3b --- /dev/null +++ b/changes/21976-update-macos-target-version-tooltip @@ -0,0 +1 @@ +- update the macos target minimum version tooltip diff --git a/frontend/pages/ManageControlsPage/OSUpdates/components/AppleOSTargetForm/AppleOSTargetForm.tsx b/frontend/pages/ManageControlsPage/OSUpdates/components/AppleOSTargetForm/AppleOSTargetForm.tsx index 8c12c4905388..d3c35e3f604b 100644 --- a/frontend/pages/ManageControlsPage/OSUpdates/components/AppleOSTargetForm/AppleOSTargetForm.tsx +++ b/frontend/pages/ManageControlsPage/OSUpdates/components/AppleOSTargetForm/AppleOSTargetForm.tsx @@ -178,16 +178,18 @@ const AppleOSTargetForm = ({ } }; - const getMinimumVersionTooltip = (platform: ApplePlatform) => { - switch (platform) { - case "darwin": - return "The end user sees the window until their macOS is at or above this version."; - case "ios": - case "ipados": - return "If the end user's host is below the minimum version, they see a notification in their Notification Center after the deadline. They can’t continue until the OS update is installed."; - default: - return ""; - } + const getMinimumVersionTooltip = () => { + return ( + <> + If an already enrolled host is below the minimum version, +
the host is updated to exactly the minimum version if it's +
available from Apple. +
+
If a new or wiped host is below the minimum version and +
automatically enrolls (ADE), the host is updated to Apple's +
lastest version during Setup Assistant. + + ); }; const getDeadlineTooltip = (platform: ApplePlatform) => { @@ -206,7 +208,7 @@ const AppleOSTargetForm = ({