diff --git a/.changeset/bright-boats-speak.md b/.changeset/bright-boats-speak.md new file mode 100644 index 0000000000000..90f03d9b12a7f --- /dev/null +++ b/.changeset/bright-boats-speak.md @@ -0,0 +1,5 @@ +--- +'@rocket.chat/meteor': patch +--- + +Removes deprecated search federated rooms diff --git a/apps/meteor/client/NavBarV2/NavBarPagesGroup/hooks/useCreateNewMenu.tsx b/apps/meteor/client/NavBarV2/NavBarPagesGroup/hooks/useCreateNewMenu.tsx index 28d9b84cdedf7..633b193c48398 100644 --- a/apps/meteor/client/NavBarV2/NavBarPagesGroup/hooks/useCreateNewMenu.tsx +++ b/apps/meteor/client/NavBarV2/NavBarPagesGroup/hooks/useCreateNewMenu.tsx @@ -2,9 +2,6 @@ import { useAtLeastOnePermission } from '@rocket.chat/ui-contexts'; import { useTranslation } from 'react-i18next'; import { useCreateNewItems } from './useCreateNewItems'; -import { useMatrixFederationItems } from './useMatrixFederationItems'; -import { useIsEnterprise } from '../../../hooks/useIsEnterprise'; -import { useIsFederationEnabled } from '../../../hooks/useIsFederationEnabled'; const CREATE_ROOM_PERMISSIONS = ['create-c', 'create-p', 'create-d', 'start-discussion', 'start-discussion-other-user']; @@ -12,16 +9,9 @@ export const useCreateNewMenu = () => { const { t } = useTranslation(); const showCreate = useAtLeastOnePermission(CREATE_ROOM_PERMISSIONS); - const { data } = useIsEnterprise(); - const isMatrixEnabled = useIsFederationEnabled() && data?.isEnterprise; - const createRoomItems = useCreateNewItems(); - const matrixFederationSearchItems = useMatrixFederationItems({ isMatrixEnabled }); - const sections = [ - { title: t('Create_new'), items: createRoomItems, permission: showCreate }, - { title: t('Explore'), items: matrixFederationSearchItems, permission: showCreate && isMatrixEnabled }, - ]; + const sections = [{ title: t('Create_new'), items: createRoomItems, permission: showCreate }]; return sections.filter((section) => section.permission); }; diff --git a/apps/meteor/client/sidebar/header/actions/hooks/useCreateRoomMenu.tsx b/apps/meteor/client/sidebar/header/actions/hooks/useCreateRoomMenu.tsx index d8b180b29c7c6..4c8eeb1981dd0 100644 --- a/apps/meteor/client/sidebar/header/actions/hooks/useCreateRoomMenu.tsx +++ b/apps/meteor/client/sidebar/header/actions/hooks/useCreateRoomMenu.tsx @@ -2,9 +2,6 @@ import { useAtLeastOnePermission } from '@rocket.chat/ui-contexts'; import { useTranslation } from 'react-i18next'; import { useCreateRoomItems } from './useCreateRoomItems'; -import { useMatrixFederationItems } from './useMatrixFederationItems'; -import { useIsEnterprise } from '../../../../hooks/useIsEnterprise'; -import { useIsFederationEnabled } from '../../../../hooks/useIsFederationEnabled'; const CREATE_ROOM_PERMISSIONS = ['create-c', 'create-p', 'create-d', 'start-discussion', 'start-discussion-other-user']; @@ -12,16 +9,9 @@ export const useCreateRoom = () => { const { t } = useTranslation(); const showCreate = useAtLeastOnePermission(CREATE_ROOM_PERMISSIONS); - const { data } = useIsEnterprise(); - const isMatrixEnabled = useIsFederationEnabled() && data?.isEnterprise; - const createRoomItems = useCreateRoomItems(); - const matrixFederationSearchItems = useMatrixFederationItems({ isMatrixEnabled }); - const sections = [ - { title: t('Create_new'), items: createRoomItems, permission: showCreate }, - { title: t('Explore'), items: matrixFederationSearchItems, permission: showCreate && isMatrixEnabled }, - ]; + const sections = [{ title: t('Create_new'), items: createRoomItems, permission: showCreate }]; return sections.filter((section) => section.permission); };