fix: incomplete validation on useIsRoomActive

apps/meteor/client/hooks/omnichannel/useIsOverMacLimit.tsx

@@ -1,18 +1,9 @@
-import { useEndpoint, useStream } from '@rocket.chat/ui-contexts';
-import { useQuery, useQueryClient } from '@tanstack/react-query';
-import { useEffect } from 'react';
+import { useEndpoint } from '@rocket.chat/ui-contexts';
+import { useQuery } from '@tanstack/react-query';
 
 export const useIsOverMacLimit = (): boolean => {
-	const queryClient = useQueryClient();
-	const notifyLogged = useStream('notify-logged');
 	const getMacLimit = useEndpoint('GET', '/v1/omnichannel/mac/check');
 	const { data: { onLimit: isOverMacLimit = false } = {} } = useQuery(['/v1/omnichannel/mac/check'], () => getMacLimit());
 
-	useEffect(() => {
-		return notifyLogged(`mac.limit`, ({ limitReached }) => {
-			limitReached && queryClient.invalidateQueries(['/v1/omnichannel/mac/check']);
-		});
-	}, [notifyLogged, queryClient]);
-
 	return !!isOverMacLimit;
 };

apps/meteor/client/hooks/omnichannel/useIsRoomActive.tsx

@@ -1,15 +1,18 @@
 import type { IOmnichannelGenericRoom } from '@rocket.chat/core-typings';
 import { useMemo } from 'react';
 
+import { useIsOverMacLimit } from './useIsOverMacLimit';
+
 const getPeriod = (date: Date) => `${date.getFullYear()}-${String(date.getMonth() + 1).padStart(2, '0')}`;
 
 export const useIsRoomActive = (room: IOmnichannelGenericRoom) => {
+	const isOverMacLimit = useIsOverMacLimit();
 	const { activity = [] } = room.v;
 
 	const isContactActive = useMemo(() => {
 		const currentPeriod = getPeriod(new Date());
-		return activity.includes(currentPeriod);
-	}, [activity]);
+		return !isOverMacLimit || activity.includes(currentPeriod);
+	}, [activity, isOverMacLimit]);
 
 	return isContactActive;
 };

apps/meteor/client/providers/OmnichannelProvider.tsx

@@ -83,6 +83,12 @@ const OmnichannelProvider: FC = ({ children }) => {
 		});
 	}, [isPrioritiesEnabled, queryClient, subscribe]);
 
+	useEffect(() => {
+		return subscribe(`mac.limit`, ({ limitReached }) => {
+			limitReached && queryClient.invalidateQueries(['/v1/omnichannel/mac/check']);
+		});
+	}, [subscribe, queryClient]);
+
 	useEffect(() => {
 		if (!accessible) {
 			return;