review

RocketChat · Oct 25, 2023 · b48d18a · b48d18a
1 parent 95fc6ec
commit b48d18a
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 33 deletions.
diff --git a/apps/meteor/client/hooks/omnichannel/useMacLimitValidations.tsx b/apps/meteor/client/hooks/omnichannel/useMacLimitValidations.tsx
diff --git a/apps/meteor/client/providers/OmnichannelProvider.tsx b/apps/meteor/client/providers/OmnichannelProvider.tsx
@@ -19,7 +19,7 @@ import { useHasLicenseModule } from '../../ee/client/hooks/useHasLicenseModule';
 import { ClientLogger } from '../../lib/ClientLogger';
 import type { OmnichannelContextValue } from '../contexts/OmnichannelContext';
 import { OmnichannelContext } from '../contexts/OmnichannelContext';
-import { useMacLimitValidations } from '../hooks/omnichannel/useMacLimitValidations';
+import { useLicense } from '../hooks/useLicense';
 import { useReactiveValue } from '../hooks/useReactiveValue';
 
 const emptyContextValue: OmnichannelContextValue = {
@@ -76,7 +76,9 @@ const OmnichannelProvider: FC = ({ children }) => {
 		enabled: isPrioritiesEnabled,
 	});
 
-	const { isOverMacLimit } = useMacLimitValidations(enabled);
+	const { data: { preventedActions } = {} } = useLicense();
+
+	const isOverMacLimit = Boolean(preventedActions?.monthlyActiveContacts);
 
 	useEffect(() => {
 		if (!isPrioritiesEnabled) {

diff --git a/apps/meteor/client/sidebar/RoomList/SideBarItemTemplateWithData.tsx b/apps/meteor/client/sidebar/RoomList/SideBarItemTemplateWithData.tsx
@@ -170,7 +170,7 @@ function SideBarItemTemplateWithData({
 					{unread + tunread?.length}
 				</Badge>
 			)}
-			<OmnichannelBadges room={room} />
+			{isOmnichannelRoom(room) && <OmnichannelBadges room={room} />}
 		</Margins>
 	);