From 480ef638414527023f2d6467217dd22b157ddd19 Mon Sep 17 00:00:00 2001 From: dougfabris Date: Wed, 27 Aug 2025 16:31:27 -0300 Subject: [PATCH 1/2] fix: priorities not being translated --- .../omnichannel/hooks/useOmnichannelPrioritiesMenu.tsx | 4 ++-- apps/meteor/client/sidebar/hooks/useRoomMenuActions.ts | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/apps/meteor/client/omnichannel/hooks/useOmnichannelPrioritiesMenu.tsx b/apps/meteor/client/omnichannel/hooks/useOmnichannelPrioritiesMenu.tsx index 3ccfd5d12bea0..09d3dc632c124 100644 --- a/apps/meteor/client/omnichannel/hooks/useOmnichannelPrioritiesMenu.tsx +++ b/apps/meteor/client/omnichannel/hooks/useOmnichannelPrioritiesMenu.tsx @@ -37,7 +37,7 @@ export const useOmnichannelPrioritiesMenu = (rid: IRoom['_id']) => { }; const options = priorities.map(({ _id: priorityId, name, i18n, dirty, sortItem }) => { - const label = dirty && name ? name : i18n; + const label = dirty && name ? name : t(i18n); return { id: priorityId, @@ -49,5 +49,5 @@ export const useOmnichannelPrioritiesMenu = (rid: IRoom['_id']) => { }); return priorities.length ? [unprioritizedOption, ...options] : []; - }, [t, priorities, updateRoomPriority, removeRoomPriority, queryClient, rid]); + }, [t, priorities, updateRoomPriority, removeRoomPriority, queryClient, rid, dispatchToastMessage]); }; diff --git a/apps/meteor/client/sidebar/hooks/useRoomMenuActions.ts b/apps/meteor/client/sidebar/hooks/useRoomMenuActions.ts index f43569310b9d8..9c10b16ecfeb9 100644 --- a/apps/meteor/client/sidebar/hooks/useRoomMenuActions.ts +++ b/apps/meteor/client/sidebar/hooks/useRoomMenuActions.ts @@ -58,7 +58,7 @@ export const useRoomMenuActions = ({ const menuOptions = useMemo( () => !hideDefaultOptions - ? [ + ? ([ !isOmnichannelRoom && { id: 'hideRoom', icon: 'eye-off', @@ -83,7 +83,7 @@ export const useRoomMenuActions = ({ content: t('Leave_room'), onClick: handleLeave, }, - ] + ].filter(Boolean) as GenericMenuItemProps[]) : [], [ hideDefaultOptions, @@ -102,10 +102,10 @@ export const useRoomMenuActions = ({ if (isOmnichannelRoom && prioritiesMenu.length > 0) { return [ - { title: '', items: menuOptions.filter(Boolean) as GenericMenuItemProps[] }, - { title: t('Priorities'), items: prioritiesMenu }, + ...(menuOptions.length > 0 ? [{ title: '', items: menuOptions }] : []), + ...(prioritiesMenu.length > 0 ? [{ title: t('Priorities'), items: prioritiesMenu }] : []), ]; } - return [{ title: '', items: menuOptions.filter(Boolean) as GenericMenuItemProps[] }]; + return menuOptions.length > 0 ? [{ title: '', items: menuOptions }] : []; }; From cb2b675a0b558392a519fd489c6e4b07fe65078c Mon Sep 17 00:00:00 2001 From: dougfabris Date: Wed, 27 Aug 2025 16:33:07 -0300 Subject: [PATCH 2/2] chore: changeset --- .changeset/metal-jobs-learn.md | 5 +++++ .changeset/slow-ants-divide.md | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) create mode 100644 .changeset/metal-jobs-learn.md diff --git a/.changeset/metal-jobs-learn.md b/.changeset/metal-jobs-learn.md new file mode 100644 index 0000000000000..89116e9001d58 --- /dev/null +++ b/.changeset/metal-jobs-learn.md @@ -0,0 +1,5 @@ +--- +'@rocket.chat/meteor': patch +--- + +Fixes an issue where the omnichannel default priorities are not being translated in the sidebar room menu diff --git a/.changeset/slow-ants-divide.md b/.changeset/slow-ants-divide.md index 7986d8e81e5d3..1fb4533c72e81 100644 --- a/.changeset/slow-ants-divide.md +++ b/.changeset/slow-ants-divide.md @@ -2,4 +2,4 @@ '@rocket.chat/meteor': patch --- -Fixes an issue where the omnichannel default priorities are not being translated +Fixes an issue where the omnichannel default priorities are not being translated in priorities list