diff --git a/frontend/pages/admin/IntegrationsPage/cards/MdmSettings/AppleBusinessManagerPage/AppleBusinessManagerPage.tsx b/frontend/pages/admin/IntegrationsPage/cards/MdmSettings/AppleBusinessManagerPage/AppleBusinessManagerPage.tsx index f2c978adbb..2a125b459c 100644 --- a/frontend/pages/admin/IntegrationsPage/cards/MdmSettings/AppleBusinessManagerPage/AppleBusinessManagerPage.tsx +++ b/frontend/pages/admin/IntegrationsPage/cards/MdmSettings/AppleBusinessManagerPage/AppleBusinessManagerPage.tsx @@ -233,7 +233,6 @@ const AppleBusinessManagerPage = ({ router }: { router: InjectedRouter }) => { {showRenewModal && selectedToken.current && ( diff --git a/frontend/pages/admin/IntegrationsPage/cards/MdmSettings/AppleBusinessManagerPage/components/AddAbmModal/AddAbmModal.tsx b/frontend/pages/admin/IntegrationsPage/cards/MdmSettings/AppleBusinessManagerPage/components/AddAbmModal/AddAbmModal.tsx index 068b69518a..675aa5db9e 100644 --- a/frontend/pages/admin/IntegrationsPage/cards/MdmSettings/AppleBusinessManagerPage/components/AddAbmModal/AddAbmModal.tsx +++ b/frontend/pages/admin/IntegrationsPage/cards/MdmSettings/AppleBusinessManagerPage/components/AddAbmModal/AddAbmModal.tsx @@ -52,73 +52,15 @@ const AddAbmModal = ({ onCancel, onAdded }: IAddAbmModalProps) => { return ( -
    -
  1. - 1. -

    - Download your public key. -

    -
  2. -
  3. - 2. - - - Sign in to{" "} - -
    - If your organization doesn't have an account, select{" "} - Enroll now. -
    -
    -
  4. -
  5. - 3. - - Select your account name at the bottom left of the screen, - then select Preferences. - -
  6. -
  7. - 4. - - In the Your MDM Servers section, select Add. - -
  8. -
  9. - 5. - Enter a name for the server such as "Fleet". -
  10. -
  11. - 6. - - Under MDM Server Settings, upload the public key downloaded - in the first step and select Save. - -
  12. -
  13. - 7. - - In the Default Device Assignment section, select{" "} - Change, then assign the newly created server as the default - for your Macs, iPhones, and iPads. Then select Done. - -
  14. -
  15. - 8. - - Select newly created server in the sidebar, then select{" "} - Download MDM Server Token on the top. - -
  16. -
  17. - 9. - Upload the downloaded token (.p7m file). -
  18. -
+

+ Follow the step-by-step guide to connect Fleet to Apple Business + Manager.{" "} + +

{ > Add AB +
); diff --git a/frontend/pages/admin/IntegrationsPage/cards/MdmSettings/AppleBusinessManagerPage/components/AddAbmModal/_styles.scss b/frontend/pages/admin/IntegrationsPage/cards/MdmSettings/AppleBusinessManagerPage/components/AddAbmModal/_styles.scss index 74ccf5138b..2e95eb5437 100644 --- a/frontend/pages/admin/IntegrationsPage/cards/MdmSettings/AppleBusinessManagerPage/components/AddAbmModal/_styles.scss +++ b/frontend/pages/admin/IntegrationsPage/cards/MdmSettings/AppleBusinessManagerPage/components/AddAbmModal/_styles.scss @@ -1,10 +1,13 @@ .add-abm-modal { + p { + margin: 0; + } + &__request-button { display: flex; gap: $pad-small; align-items: center; - margin-top: $pad-small; label { display: flex; @@ -13,33 +16,8 @@ } } - &__setup-list { - font-size: $x-small; - display: flex; - flex-direction: column; - gap: $pad-large; - padding: 0; - margin: 0; - max-width: 660px; - list-style: none; - - li { - display: flex; - flex-direction: row; - gap: $pad-small; - - p { - display: flex; - flex-direction: column; - align-items: flex-start; - margin: 0; - } - } - } - &__file-uploader { margin-top: $pad-medium; - margin-left: $pad-medium; .file-uploader__message { color: $ui-fleet-black-75; diff --git a/frontend/pages/admin/IntegrationsPage/cards/MdmSettings/AppleBusinessManagerPage/components/RenewAbmModal/RenewAbmModal.tsx b/frontend/pages/admin/IntegrationsPage/cards/MdmSettings/AppleBusinessManagerPage/components/RenewAbmModal/RenewAbmModal.tsx index db93a51a0f..4b35d634b5 100644 --- a/frontend/pages/admin/IntegrationsPage/cards/MdmSettings/AppleBusinessManagerPage/components/RenewAbmModal/RenewAbmModal.tsx +++ b/frontend/pages/admin/IntegrationsPage/cards/MdmSettings/AppleBusinessManagerPage/components/RenewAbmModal/RenewAbmModal.tsx @@ -14,14 +14,12 @@ const baseClass = "renew-abm-modal"; interface IRenewAbmModalProps { tokenId: number; - orgName: string; onCancel: () => void; onRenewedToken: () => void; } const RenewAbmModal = ({ tokenId, - orgName, onCancel, onRenewedToken, }: IRenewAbmModalProps) => { @@ -65,31 +63,24 @@ const RenewAbmModal = ({ width="large" >
-

- Renew Apple Business for {orgName} by uploading your AB token.{" "} +

+ Follow the step-by-step guide to renew.{" "}

- +