From 3a64bda17141c3dd4ceae176ab6dd2a0cc1edffb Mon Sep 17 00:00:00 2001
From: Conor Macpherson <conor.macpherson@mattermost.com>
Date: Fri, 14 Apr 2023 16:53:28 -0400
Subject: [PATCH] add additional checks for service setting.

---
 .../announcement_bar/overage_users_banner/index.tsx           | 4 +++-
 .../invitation_modal/overage_users_banner_notice/index.tsx    | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/webapp/channels/src/components/announcement_bar/overage_users_banner/index.tsx b/webapp/channels/src/components/announcement_bar/overage_users_banner/index.tsx
index 7012548f7a..b5e20a1ca8 100644
--- a/webapp/channels/src/components/announcement_bar/overage_users_banner/index.tsx
+++ b/webapp/channels/src/components/announcement_bar/overage_users_banner/index.tsx
@@ -21,6 +21,7 @@ import {StatTypes, Preferences, AnnouncementBarTypes, ConsolePages} from 'utils/
 import './overage_users_banner.scss';
 import {getSiteURL} from 'utils/url';
 import useCanSelfHostedExpand from 'components/common/hooks/useCanSelfHostedExpand';
+import {getConfig} from 'mattermost-redux/selectors/entities/admin';
 
 type AdminHasDismissedItArgs = {
     preferenceName: string;
@@ -55,7 +56,8 @@ const OverageUsersBanner = () => {
         activeUsers,
         seatsPurchased,
     });
-    const canSelfHostedExpand = useCanSelfHostedExpand();
+    const isSelfHostedExpansionEnabled = useSelector(getConfig)?.ServiceSettings?.SelfHostedExpansion;
+    const canSelfHostedExpand = useCanSelfHostedExpand() && isSelfHostedExpansionEnabled;
     const siteURL = getSiteURL();
     const prefixPreferences = isOver10PercerntPurchasedSeats ? 'error' : 'warn';
     const prefixLicenseId = (license.Id || '').substring(0, 8);
diff --git a/webapp/channels/src/components/invitation_modal/overage_users_banner_notice/index.tsx b/webapp/channels/src/components/invitation_modal/overage_users_banner_notice/index.tsx
index f05638c2ec..bb6702c669 100644
--- a/webapp/channels/src/components/invitation_modal/overage_users_banner_notice/index.tsx
+++ b/webapp/channels/src/components/invitation_modal/overage_users_banner_notice/index.tsx
@@ -23,6 +23,7 @@ import './overage_users_banner_notice.scss';
 import ExternalLink from 'components/external_link';
 import useCanSelfHostedExpand from 'components/common/hooks/useCanSelfHostedExpand';
 import {getSiteURL} from 'utils/url';
+import {getConfig} from 'mattermost-redux/selectors/entities/admin';
 
 type AdminHasDismissedArgs = {
     preferenceName: string;
@@ -45,7 +46,8 @@ const OverageUsersBannerNotice = () => {
     const currentUser = useSelector((state: GlobalState) => getCurrentUser(state));
     const overagePreferences = useSelector((state: GlobalState) => getPreferencesCategory(state, Preferences.OVERAGE_USERS_BANNER));
     const activeUsers = ((stats || {})[StatTypes.TOTAL_USERS]) as number || 0;
-    const canSelfHostedExpand = useCanSelfHostedExpand();
+    const isSelfHostedExpansionEnabled = useSelector(getConfig)?.ServiceSettings?.SelfHostedExpansion;
+    const canSelfHostedExpand = useCanSelfHostedExpand() && isSelfHostedExpansionEnabled;
     const siteURL = getSiteURL();
 
     const {