Skip to content

fix: Missing margin in E2EE room header toolbox items #35614

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kodiakhq merged 4 commits into from
Mar 27, 2025
Merged

fix: Missing margin in E2EE room header toolbox items #35614

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7906efe
fix: missing margin in toolbox
dougfabris Mar 25, 2025
a44ab77
chore: changeset
dougfabris Mar 25, 2025
b01d38f
fix: review
dougfabris Mar 26, 2025
a697cbc
Merge branch 'develop' into fix/room-toolbox-e2eSetup
kodiakhq[bot] Mar 27, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changeset/sweet-ravens-refuse.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@rocket.chat/meteor': patch
---

Fixes an issue where header toolbox items are missing the proper margin in e2ee setup room header
9 changes: 8 additions & 1 deletion apps/meteor/client/views/room/Header/RoomToolbox/RoomToolboxE2EESetup.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
import type { Box } from '@rocket.chat/fuselage';
import { useStableArray } from '@rocket.chat/fuselage-hooks';
import type { ComponentProps } from 'react';
import { useTranslation } from 'react-i18next';

import { HeaderToolbarAction } from '../../../../components/Header';
Expand All @@ -8,7 +10,11 @@ import type { RoomToolboxActionConfig } from '../../contexts/RoomToolboxContext'
import { useRoomToolbox } from '../../contexts/RoomToolboxContext';
import { getRoomGroup } from '../../lib/getRoomGroup';

const RoomToolboxE2EESetup = () => {
type RoomToolboxE2EESetupProps = {
className?: ComponentProps<typeof Box>['className'];
};

const RoomToolboxE2EESetup = ({ className }: RoomToolboxE2EESetupProps) => {
const { t } = useTranslation();
const toolbox = useRoomToolbox();
const room = useRoom();
Expand All @@ -29,6 +35,7 @@ const RoomToolboxE2EESetup = () => {
{actions.map(({ id, icon, title, action, disabled, tooltip }, index) => (
<HeaderToolbarAction
key={id}
className={className}
index={index}
id={id}
icon={icon}
Expand Down
9 changes: 8 additions & 1 deletion apps/meteor/client/views/room/HeaderV2/RoomToolbox/RoomToolboxE2EESetup.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,18 @@
import type { Box } from '@rocket.chat/fuselage';
import { useStableArray } from '@rocket.chat/fuselage-hooks';
import type { ComponentProps } from 'react';
import { useTranslation } from 'react-i18next';

import { HeaderToolbarAction } from '../../../../components/Header';
import { roomActionHooksForE2EESetup } from '../../../../ui';
import type { RoomToolboxActionConfig } from '../../contexts/RoomToolboxContext';
import { useRoomToolbox } from '../../contexts/RoomToolboxContext';

const RoomToolboxE2EESetup = () => {
type RoomToolboxE2EESetupProps = {
className?: ComponentProps<typeof Box>['className'];
};

const RoomToolboxE2EESetup = ({ className }: RoomToolboxE2EESetupProps) => {
const { t } = useTranslation();
const toolbox = useRoomToolbox();

Expand All @@ -23,6 +29,7 @@ const RoomToolboxE2EESetup = () => {
{actions.map(({ id, icon, title, action, disabled, tooltip }, index) => (
<HeaderToolbarAction
key={id}
className={className}
index={index}
id={id}
icon={icon}
Expand Down
Loading