From 4b718b679a09aee74b697c3c14f4a24463e01463 Mon Sep 17 00:00:00 2001
From: Tuan Dang <dangtony98@gmail.com>
Date: Thu, 18 Jul 2024 10:44:54 +0700
Subject: [PATCH] Change deactivate button messaging, add scim check

---
 .../components/OrgMembersSection/OrgMembersSection.tsx        | 1 +
 .../components/OrgMembersSection/OrgMembersTable.tsx          | 4 ++--
 frontend/src/views/Org/UserPage/UserPage.tsx                  | 1 +
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/frontend/src/views/Org/MembersPage/components/OrgMembersTab/components/OrgMembersSection/OrgMembersSection.tsx b/frontend/src/views/Org/MembersPage/components/OrgMembersTab/components/OrgMembersSection/OrgMembersSection.tsx
index e4a54f1b56..c272145d57 100644
--- a/frontend/src/views/Org/MembersPage/components/OrgMembersTab/components/OrgMembersSection/OrgMembersSection.tsx
+++ b/frontend/src/views/Org/MembersPage/components/OrgMembersTab/components/OrgMembersSection/OrgMembersSection.tsx
@@ -165,6 +165,7 @@ export const OrgMembersSection = () => {
             (popUp?.deactivateMember?.data as { orgMembershipId: string })?.orgMembershipId
           )
         }
+        buttonText="Deactivate"
       />
       <UpgradePlanModal
         isOpen={popUp.upgradePlan.isOpen}
diff --git a/frontend/src/views/Org/MembersPage/components/OrgMembersTab/components/OrgMembersSection/OrgMembersTable.tsx b/frontend/src/views/Org/MembersPage/components/OrgMembersTab/components/OrgMembersSection/OrgMembersTable.tsx
index 9212a51355..304b104a7b 100644
--- a/frontend/src/views/Org/MembersPage/components/OrgMembersTab/components/OrgMembersSection/OrgMembersTable.tsx
+++ b/frontend/src/views/Org/MembersPage/components/OrgMembersTab/components/OrgMembersSection/OrgMembersTable.tsx
@@ -293,7 +293,7 @@ export const OrgMembersTable = ({ handlePopUpOpen, setCompleteInviteLink }: Prop
                                     onClick={async (e) => {
                                       e.stopPropagation();
 
-                                      if (currentOrg?.authEnforced) {
+                                      if (currentOrg?.scimEnabled) {
                                         createNotification({
                                           text: "You cannot manage users from Infisical when org-level auth is enforced for your organization",
                                           type: "error"
@@ -338,7 +338,7 @@ export const OrgMembersTable = ({ handlePopUpOpen, setCompleteInviteLink }: Prop
                                     onClick={(e) => {
                                       e.stopPropagation();
 
-                                      if (currentOrg?.authEnforced) {
+                                      if (currentOrg?.scimEnabled) {
                                         createNotification({
                                           text: "You cannot manage users from Infisical when org-level auth is enforced for your organization",
                                           type: "error"
diff --git a/frontend/src/views/Org/UserPage/UserPage.tsx b/frontend/src/views/Org/UserPage/UserPage.tsx
index d27ba2365f..eb8b8e8e17 100644
--- a/frontend/src/views/Org/UserPage/UserPage.tsx
+++ b/frontend/src/views/Org/UserPage/UserPage.tsx
@@ -259,6 +259,7 @@ export const UserPage = withPermission(
               (popUp?.deactivateMember?.data as { orgMembershipId: string })?.orgMembershipId
             )
           }
+          buttonText="Deactivate"
         />
         <UpgradePlanModal
           isOpen={popUp.upgradePlan.isOpen}