Skip to content

regression: Respect UI_Use_Real_Name setting in parent room button tooltip #41937

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
dionisio-bot merged 5 commits into from
Aug 27, 2026
Merged

regression: Respect UI_Use_Real_Name setting in parent room button tooltip #41937

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
eb784df
respect ui_userealname setting in tooltip for DMs
yash-rajpal Aug 25, 2026
de74b34
fix review
yash-rajpal Aug 25, 2026
fb2269b
fix confusion between room and subscription in component props
yash-rajpal Aug 26, 2026
e753115
TS complications: federated room support
yash-rajpal Aug 26, 2026
b2855ca
some help to TS compiler
yash-rajpal Aug 26, 2026
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
9 changes: 6 additions & 3 deletions apps/meteor/client/views/room/Header/ParentRoom/ParentDiscussion/ParentDiscussion.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import type { IRoom } from '@rocket.chat/core-typings';
import { isRoomFederated } from '@rocket.chat/core-typings';
import { useRoomRoute } from '@rocket.chat/ui-client';
import { useSetting } from '@rocket.chat/ui-contexts';
import { useRoomRoute, useUserDisplayName } from '@rocket.chat/ui-client';
import { useSetting, useUserSubscription } from '@rocket.chat/ui-contexts';
import { useTranslation } from 'react-i18next';

import ParentRoomButton from '../ParentRoomButton';
Expand All @@ -23,7 +23,10 @@ const ParentDiscussion = ({ loading = false, room }: ParentDiscussionProps) => {
const { t } = useTranslation();
const goToRoom = useRoomRoute();
const allowSpecialChars = useSetting('UI_Allow_room_names_with_special_chars', false);
const roomName = room.t === 'c' || room.t === 'p' ? getChannelRoomName(room, allowSpecialChars) : room.fname || room.name || '';
const parentRoom = useUserSubscription(room._id) ?? room;
Comment thread
cubic-dev-ai[bot] marked this conversation as resolved.
Outdated
const userDisplayName = useUserDisplayName({ name: parentRoom.fname, username: parentRoom.name });
const roomName =
parentRoom.t === 'c' || parentRoom.t === 'p' ? getChannelRoomName(parentRoom, allowSpecialChars) : (userDisplayName ?? '');

const handleRedirect = (): void => {
goToRoom({ rid: room._id, t: room.t, name: room.name });
Expand Down
2 changes: 1 addition & 1 deletion apps/meteor/client/views/room/Header/ParentRoom/ParentDiscussion/ParentDiscussionRoute.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ const ParentDiscussionRoute = ({ room }: ParentDiscussionRouteProps) => {
const subscription = useUserSubscription(prid);

if (subscription) {
return <ParentDiscussion room={subscription} />;
return <ParentDiscussion room={{ ...subscription, _id: subscription.rid }} />;
}

return <ParentDiscussionWithData rid={prid} />;
Expand Down
Loading