diff --git a/.changeset/hungry-wasps-remember.md b/.changeset/hungry-wasps-remember.md new file mode 100644 index 00000000000..7cb6cdd3f77 --- /dev/null +++ b/.changeset/hungry-wasps-remember.md @@ -0,0 +1,7 @@ +--- +'@rocket.chat/ui-client': minor +'@rocket.chat/meteor': minor +--- + +Removes the avatar in the room header +> This change is being tested under `Enhanced navigation experience` feature preview, in order to check it you need to enabled it diff --git a/apps/meteor/client/views/room/HeaderV2/HeaderSkeleton.tsx b/apps/meteor/client/views/room/HeaderV2/HeaderSkeleton.tsx index 1839a64fb24..25d78f46602 100644 --- a/apps/meteor/client/views/room/HeaderV2/HeaderSkeleton.tsx +++ b/apps/meteor/client/views/room/HeaderV2/HeaderSkeleton.tsx @@ -1,13 +1,10 @@ import { Skeleton } from '@rocket.chat/fuselage'; -import { Header, HeaderAvatar, HeaderContent, HeaderContentRow } from '../../../components/Header'; +import { Header, HeaderContent, HeaderContentRow } from '../../../components/Header'; const HeaderSkeleton = () => { return (
- - - diff --git a/apps/meteor/client/views/room/HeaderV2/RoomHeader.tsx b/apps/meteor/client/views/room/HeaderV2/RoomHeader.tsx index 1683873a7c5..87afd65918d 100644 --- a/apps/meteor/client/views/room/HeaderV2/RoomHeader.tsx +++ b/apps/meteor/client/views/room/HeaderV2/RoomHeader.tsx @@ -1,6 +1,5 @@ import type { IRoom } from '@rocket.chat/core-typings'; import { isRoomFederated } from '@rocket.chat/core-typings'; -import { RoomAvatar } from '@rocket.chat/ui-avatar'; import type { ReactNode } from 'react'; import { Suspense } from 'react'; import { useTranslation } from 'react-i18next'; @@ -13,7 +12,7 @@ import RoomToolbox from './RoomToolbox'; import Encrypted from './icons/Encrypted'; import Favorite from './icons/Favorite'; import Translate from './icons/Translate'; -import { Header, HeaderAvatar, HeaderContent, HeaderContentRow, HeaderToolbar } from '../../../components/Header'; +import { Header, HeaderContent, HeaderContentRow, HeaderToolbar } from '../../../components/Header'; export type RoomHeaderProps = { room: IRoom; @@ -38,9 +37,6 @@ const RoomHeader = ({ room, slots = {}, roomToolbox }: RoomHeaderProps) => { return (
{slots?.start} - - - {slots?.preContent} diff --git a/apps/meteor/tests/e2e/feature-preview.spec.ts b/apps/meteor/tests/e2e/feature-preview.spec.ts index c2c39701d01..55f51ea62b1 100644 --- a/apps/meteor/tests/e2e/feature-preview.spec.ts +++ b/apps/meteor/tests/e2e/feature-preview.spec.ts @@ -171,6 +171,13 @@ test.describe.serial('feature preview', () => { await page.goto(embeddedLayoutURL); await expect(page.locator('role=navigation[name="header"]')).not.toBeVisible(); }); + + test('should not display avatar in room header', async ({ page }) => { + await page.goto('/home'); + + await poHomeChannel.sidebar.openChat(targetChannel); + await expect(page.locator('main').locator('header').getByRole('figure')).not.toBeVisible(); + }); }); test.describe('Sidepanel', () => { diff --git a/packages/ui-client/src/components/HeaderV2/Header.tsx b/packages/ui-client/src/components/HeaderV2/Header.tsx index 4ee887e93cf..ee5580b4b74 100644 --- a/packages/ui-client/src/components/HeaderV2/Header.tsx +++ b/packages/ui-client/src/components/HeaderV2/Header.tsx @@ -12,7 +12,7 @@ const Header = (props: HeaderProps) => { return (