From 03449b3a716504e400625e7aff5ecb4087b049c7 Mon Sep 17 00:00:00 2001
From: Scott Gress <scottmgress@gmail.com>
Date: Wed, 16 Apr 2025 08:58:25 -0700
Subject: [PATCH] Remove button variant prop from Conditional Access page
 (#28290)

Support for this property was removed in
https://github.com/fleetdm/fleet/pull/28245, which merged just before
https://github.com/fleetdm/fleet/pull/27982. It's now causing linting
errors. I confirmed that the Save button looks the same without it.

<img width="793" alt="image"
src="https://github.com/user-attachments/assets/f3357cd2-1c4f-4c91-8c2e-e56797fb86e9"
/>
---
 .../cards/ConditionalAccess/ConditionalAccess.tsx            | 1 -
 .../ConditionalAccessModal/ConditionalAccessModal.tsx        | 5 +----
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/frontend/pages/admin/IntegrationsPage/cards/ConditionalAccess/ConditionalAccess.tsx b/frontend/pages/admin/IntegrationsPage/cards/ConditionalAccess/ConditionalAccess.tsx
index e47792cd5c..e7938d31da 100644
--- a/frontend/pages/admin/IntegrationsPage/cards/ConditionalAccess/ConditionalAccess.tsx
+++ b/frontend/pages/admin/IntegrationsPage/cards/ConditionalAccess/ConditionalAccess.tsx
@@ -315,7 +315,6 @@ const ConditionalAccess = () => {
             />
             <Button
               type="submit"
-              variant="brand"
               disabled={!!size(formErrors)}
               className="button-wrap"
               isLoading={isUpdating}
diff --git a/frontend/pages/policies/ManagePoliciesPage/components/ConditionalAccessModal/ConditionalAccessModal.tsx b/frontend/pages/policies/ManagePoliciesPage/components/ConditionalAccessModal/ConditionalAccessModal.tsx
index d25acf700b..a9d841f3eb 100644
--- a/frontend/pages/policies/ManagePoliciesPage/components/ConditionalAccessModal/ConditionalAccessModal.tsx
+++ b/frontend/pages/policies/ManagePoliciesPage/components/ConditionalAccessModal/ConditionalAccessModal.tsx
@@ -78,7 +78,6 @@ const ConditionalAccessModal = ({
             renderChildren={(disableChildren) => (
               <Button
                 type="submit"
-                variant="brand"
                 disabled={disableChildren || !isAdmin}
                 className="button-wrap"
                 isLoading={isUpdating}
@@ -104,9 +103,7 @@ const ConditionalAccessModal = ({
       <br />
       {learnMoreLink}
       <div className="modal-cta-wrap">
-        <Button onClick={onExit} variant="brand">
-          Done
-        </Button>
+        <Button onClick={onExit}>Done</Button>
       </div>
     </>
   );