From 019377368d1288ba761b4d014a13b905a6d4fafd Mon Sep 17 00:00:00 2001
From: Gabriel Hernandez <ghernandez345@gmail.com>
Date: Fri, 27 Oct 2023 18:06:10 +0100
Subject: [PATCH] update copy for ABM terms banner message (#14774)

relates to #13012

Updates the copy of the ABM terms banner message to reflect that Apple
may take a long time to update that the terms have been accepted.

- [x] Changes file added for user-visible changes in `changes/` or
`orbit/changes/`.
See [Changes
files](https://fleetdm.com/docs/contributing/committing-changes#changes-files)
for more information.
- [x] Manual QA for all new/changed functionality
---
 changes/issue-13012-update-abm-terms-banner-copy |  2 ++
 .../AppleBMTermsMessage/AppleBMTermsMessage.tsx  | 16 +++-------------
 .../MDM/AppleBMTermsMessage/_styles.scss         |  1 +
 3 files changed, 6 insertions(+), 13 deletions(-)
 create mode 100644 changes/issue-13012-update-abm-terms-banner-copy

diff --git a/changes/issue-13012-update-abm-terms-banner-copy b/changes/issue-13012-update-abm-terms-banner-copy
new file mode 100644
index 0000000000..6b5d823ab2
--- /dev/null
+++ b/changes/issue-13012-update-abm-terms-banner-copy
@@ -0,0 +1,2 @@
+- update the copy of the ABM terms banner to reflect that Apple may take a while to report the
+  correct status back to Fleet.
diff --git a/frontend/components/MDM/AppleBMTermsMessage/AppleBMTermsMessage.tsx b/frontend/components/MDM/AppleBMTermsMessage/AppleBMTermsMessage.tsx
index c65a6da595..6009288733 100644
--- a/frontend/components/MDM/AppleBMTermsMessage/AppleBMTermsMessage.tsx
+++ b/frontend/components/MDM/AppleBMTermsMessage/AppleBMTermsMessage.tsx
@@ -1,27 +1,17 @@
 import React from "react";
 
-import PATHS from "router/paths";
-import { browserHistory } from "react-router";
-import Button from "components/buttons/Button";
 import CustomLink from "components/CustomLink";
 
 const baseClass = "apple-bm-terms-message";
 
 const AppleBMTermsMessage = () => {
-  const onClick = (): void => {
-    browserHistory.push(PATHS.MANAGE_HOSTS);
-  };
-
   return (
     <div className={baseClass}>
       <p>
-        Your organization can’t automatically enroll macOS hosts until you
+        Your organization can&apos;t automatically enroll macOS hosts until you
         accept the new terms and conditions for Apple Business Manager (ABM). An
-        ABM administrator can accept these terms. Done?{" "}
-        <Button onClick={onClick} variant="unstyled">
-          Go to Hosts
-        </Button>{" "}
-        to remove this banner.
+        ABM administrator can accept these terms. Done? It might take some time
+        for ABM to report back to Fleet.
       </p>
       <CustomLink
         url="https://business.apple.com/"
diff --git a/frontend/components/MDM/AppleBMTermsMessage/_styles.scss b/frontend/components/MDM/AppleBMTermsMessage/_styles.scss
index 5f8deb4f37..b9b59993a5 100644
--- a/frontend/components/MDM/AppleBMTermsMessage/_styles.scss
+++ b/frontend/components/MDM/AppleBMTermsMessage/_styles.scss
@@ -1,5 +1,6 @@
 .apple-bm-terms-message {
   display: flex;
+  gap: $pad-medium;
   justify-content: space-between;
   align-items: center;
   padding: 12px $pad-large;