Skip to content

chore: Stop hardcoding tooltips on message actions #37127

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 2 commits into from
Oct 3, 2025
Merged

chore: Stop hardcoding tooltips on message actions #37127

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ba8617e
chore: Stop hardcoding tooltips on message actions
MartinSchoeler Oct 2, 2025
3729ac0
Merge branch 'develop' into fix/disabled-encrypted
kodiakhq[bot] Oct 3, 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
1 change: 1 addition & 0 deletions apps/meteor/app/ui-utils/client/lib/MessageAction.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ export type MessageActionConfig = {
icon: IconName;
variant?: 'danger' | 'success' | 'warning';
label: TranslationKey;
tooltip?: string;
order: number;
group: MessageActionGroup;
context?: MessageActionContext[];
Expand Down
3 changes: 1 addition & 2 deletions apps/meteor/client/components/message/toolbar/MessageToolbarActionMenu.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,9 +99,8 @@ const MessageToolbarActionMenu = ({ message, context, room, subscription, onChan
content: t(option.label),
onClick: option.action,
type: option.type,
...(option.tooltip && { tooltip: option.tooltip }),
...(typeof option.disabled === 'boolean' && { disabled: option.disabled }),
...(typeof option.disabled === 'boolean' &&
option.disabled && { tooltip: t('Action_not_available_encrypted_content', { action: t(option.label) }) }),
}))
.reduce((acc, option) => {
const group = option.type ? option.type : '';
Expand Down
3 changes: 1 addition & 2 deletions apps/meteor/client/components/message/toolbar/MessageToolbarStarsActionMenu.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,9 +37,8 @@ const MessageToolbarStarsActionMenu = ({ message, context, onChangeMenuVisibilit
content: t(option.label),
onClick: option.action,
type: option.type,
...(option.tooltip && { tooltip: option.tooltip }),
...(typeof option.disabled === 'boolean' && { disabled: option.disabled }),
...(typeof option.disabled === 'boolean' &&
option.disabled && { tooltip: t('Action_not_available_encrypted_content', { action: t(option.label) }) }),
};

const group = option.type || '';
Expand Down
1 change: 1 addition & 0 deletions apps/meteor/client/components/message/toolbar/usePermalinkAction.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,5 +34,6 @@ export const usePermalinkAction = (
order,
group: 'menu',
disabled: encrypted,
...(encrypted && { tooltip: t('Action_not_available_encrypted_content', { action: t('Copy_link') }) }),
};
};
3 changes: 3 additions & 0 deletions apps/meteor/client/components/message/toolbar/useReplyInDMAction.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import { type IMessage, type ISubscription, type IRoom, isE2EEMessage } from '@rocket.chat/core-typings';
import { usePermission, useRouter, useUser } from '@rocket.chat/ui-contexts';
import { useCallback, useMemo } from 'react';
import { useTranslation } from 'react-i18next';
import { useShallow } from 'zustand/shallow';

import type { MessageActionConfig } from '../../../../app/ui-utils/client/lib/MessageAction';
Expand All @@ -17,6 +18,7 @@ export const useReplyInDMAction = (
const encrypted = isE2EEMessage(message);
const canCreateDM = usePermission('create-d');
const isLayoutEmbedded = useEmbeddedLayout();
const { t } = useTranslation();

const roomPredicate = useCallback(
(record: IRoom): boolean => {
Expand Down Expand Up @@ -70,5 +72,6 @@ export const useReplyInDMAction = (
order: 0,
group: 'menu',
disabled: encrypted,
...(encrypted && { tooltip: t('Action_not_available_encrypted_content', { action: t('Reply_in_direct_message') }) }),
};
};
Loading