Regression: Discussions inside direct messages not rendering (#20652)

RocketChat · Feb 9, 2021 · 02190a1 · 02190a1
1 parent f0073e7
commit 02190a1
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/client/views/room/Header/Header.js b/client/views/room/Header/Header.js
@@ -12,7 +12,7 @@ import { useLayout } from '../../../contexts/LayoutContext';
 import Burger from './Burger';
 import MarkdownText from '../../../components/MarkdownText';
 import { roomTypes } from '../../../../app/utils';
-import { useUserRoom, useUserId } from '../../../contexts/UserContext';
+import { useUserSubscription, useUserId } from '../../../contexts/UserContext';
 import { useUserData } from '../../../hooks/useUserData';
 
 export default React.memo(({ room }) => {
@@ -35,14 +35,14 @@ const HeaderIcon = ({ room }) => {
 };
 
 const RoomTitle = ({ room }) => {
-	const prevRoom = useUserRoom(room.prid);
-	const prevRoomHref = prevRoom ? roomTypes.getRouteLink(prevRoom.t, prevRoom) : null;
+	const prevSubscription = useUserSubscription(room.prid);
+	const prevRoomHref = prevSubscription ? roomTypes.getRouteLink(prevSubscription.t, prevSubscription) : null;
 
 	return <Breadcrumbs>
-		{room.prid && prevRoom && <>
+		{room.prid && prevSubscription && <>
 			<Breadcrumbs.Item>
-				<HeaderIcon room={prevRoom}/>
-				<Breadcrumbs.Link href={prevRoomHref}>{prevRoom.name}</Breadcrumbs.Link>
+				<HeaderIcon room={prevSubscription}/>
+				<Breadcrumbs.Link href={prevRoomHref}>{prevSubscription.name}</Breadcrumbs.Link>
 			</Breadcrumbs.Item>
 			<Breadcrumbs.Separator />
 		</>}