RocketChat · kodiakhq · Sep 23, 2022 · Sep 21, 2022 · Sep 21, 2022 · Sep 22, 2022
diff --git a/apps/meteor/app/ui-cached-collection/client/models/CachedCollection.js b/apps/meteor/app/ui-cached-collection/client/models/CachedCollection.js
@@ -275,7 +275,6 @@ export class CachedCollection extends Emitter {
 	}
 
 	async setupListener(eventType, eventName) {
-		const { RoomManager } = await import('../../../ui-utils');
 		const { ChatRoom, CachedChatRoom } = await import('../../../models');
 		Notifications[eventType || this.eventType](eventName || this.eventName, (t, record) => {
 			this.log('record received', t, record);
@@ -292,10 +291,6 @@ export class CachedCollection extends Emitter {
 						_id: record._id,
 					});
 				}
-				if (room) {
-					room.name && RoomManager.close(room.t + room.name);
-					!room.name && RoomManager.close(room.t + room._id);
-				}
 				this.collection.remove(record._id);
 			} else {
 				const { _id, ...recordData } = record;

diff --git a/apps/meteor/app/ui-message/client/messageBox/messageBox.ts b/apps/meteor/app/ui-message/client/messageBox/messageBox.ts
@@ -298,7 +298,9 @@ Template.messageBox.helpers({
 	isFederatedRoom() {
 		const { rid } = Template.currentData();
 
-		return isRoomFederated(ChatRoom.findOne(rid));
+		const room = ChatRoom.findOne(rid);
+
+		return room && isRoomFederated(room);
 	},
 });
 

@@ -9,6 +9,7 @@ import { openRoom } from '../../../app/ui-utils/client/lib/openRoom';
 import { RoomSettingsEnum, RoomMemberActions, UiTextContext } from '../../../definition/IRoomTypeConfig';
 import type { IRoomTypeConfig, IRoomTypeClientDirectives, RoomIdentification } from '../../../definition/IRoomTypeConfig';
 import { RoomCoordinator } from '../../../lib/rooms/coordinator';
+import { ToolboxContextValue } from '../../views/room/lib/Toolbox/ToolboxContext';
 import { roomExit } from './roomExit';
 
 class RoomCoordinatorClient extends RoomCoordinator {
@@ -26,7 +27,11 @@ class RoomCoordinatorClient extends RoomCoordinator {
 			isGroupChat(_room: Partial<IRoom>): boolean {
 				return false;
 			},
-			openCustomProfileTab(_instance: any, _room: IRoom, _username: string): boolean {
+			openCustomProfileTab<
+				T extends {
+					tabBar: ToolboxContextValue;
+				},
+			>(_instance: T, _room: IRoom, _username: string): boolean {
 				return false;
 			},
 			getUiText(_context: ValueOf<typeof UiTextContext>): string {

@@ -1,21 +1,18 @@
 import { IMessage, isRoomFederated, IUser } from '@rocket.chat/core-typings';
 import { MessageToolbox, MessageToolboxItem } from '@rocket.chat/fuselage';
-import { useUser, useUserRoom, useUserSubscription, useSettings, useTranslation } from '@rocket.chat/ui-contexts';
+import { useUser, useUserSubscription, useSettings, useTranslation } from '@rocket.chat/ui-contexts';
 import React, { FC, memo, useMemo } from 'react';
 
 import { MessageAction } from '../../../../../../app/ui-utils/client/lib/MessageAction';
+import { useRoom } from '../../../contexts/RoomContext';
 import { getTabBarContext } from '../../../lib/Toolbox/ToolboxContext';
 import { useIsSelecting } from '../../contexts/SelectedMessagesContext';
 import { MessageActionMenu } from './MessageActionMenu';
 
 export const Toolbox: FC<{ message: IMessage }> = ({ message }) => {
 	const t = useTranslation();
 
-	const room = useUserRoom(message.rid);
-
-	if (!room) {
-		throw new Error('Room not found');
-	}
+	const room = useRoom();
 
 	const subscription = useUserSubscription(message.rid);
 	const settings = useSettings();

@@ -6,12 +6,13 @@ import {
 	MessageAttachment,
 	isThreadMainMessage,
 } from '@rocket.chat/core-typings';
-import { useLayout, useUser, useUserPreference, useUserSubscription, useSetting, useEndpoint, useUserRoom } from '@rocket.chat/ui-contexts';
+import { useLayout, useUser, useUserPreference, useUserSubscription, useSetting, useEndpoint } from '@rocket.chat/ui-contexts';
 import React, { useMemo, FC, memo } from 'react';
 
 import { AutoTranslate } from '../../../../../app/autotranslate/client';
 import { EmojiPicker } from '../../../../../app/emoji/client';
 import { getRegexHighlight, getRegexHighlightUrl } from '../../../../../app/highlight-words/client/helper';
+import { useRoom } from '../../contexts/RoomContext';
 import ToolboxProvider from '../../providers/ToolboxProvider';
 import { MessageListContext, MessageListContextValue } from '../contexts/MessageListContext';
 import { useAutotranslateLanguage } from '../hooks/useAutotranslateLanguage';
@@ -166,7 +167,7 @@ export const MessageListProvider: FC<{
 		],
 	);
 
-	const room = useUserRoom(rid);
+	const room = useRoom();
 
 	if (!room) {
 		throw new Error('Room not found');

@@ -276,11 +276,12 @@ const RoomBody = (): ReactElement => {
 				return;
 			}
 
-			if (room && isOmnichannelRoom(room)) {
-				roomCoordinator.getRoomDirectives(room.t)?.openCustomProfileTab(null, room, room.v.username);
+			if (room && isOmnichannelRoom(room) && !tabBar.activeTabBar) {
+				roomCoordinator.getRoomDirectives(room.t)?.openCustomProfileTab({ tabBar }, room, room.v.username);
 			}
 		});
-	}, [openedRoom, room, room._id]);
+		// eslint-disable-next-line react-hooks/exhaustive-deps
+	}, [openedRoom, room._id]);
 
 	const debouncedReadMessageRead = useMemo(
 		() =>

@@ -8,6 +8,7 @@ import { ComposerJoinWithPassword } from './ComposerJoinWithPassword';
 import ComposerMessage, { ComposerMessageProps } from './ComposerMessage';
 import { ComposerOmnichannel } from './ComposerOmnichannel/ComposerOmnichannel';
 import { ComposerReadOnly } from './ComposerReadOnly';
+import ComposerVoIP from './ComposerVoIP';
 import { useMessageComposerIsAnonymous } from './hooks/useMessageComposerIsAnonymous';
 import { useMessageComposerIsBlocked } from './hooks/useMessageComposerIsBlocked';
 import { useMessageComposerIsReadOnly } from './hooks/useMessageComposerIsReadOnly';
@@ -23,12 +24,18 @@ const ComposerContainer = (props: ComposerMessageProps): ReactElement => {
 
 	const isReadOnly = useMessageComposerIsReadOnly(props.rid, props.subscription);
 
-	const isOmnichannel = isOmnichannelRoom(room) || isVoipRoom(room);
+	const isOmnichannel = isOmnichannelRoom(room);
+
+	const isVoip = isVoipRoom(room);
 
 	if (isOmnichannel) {
 		return <ComposerOmnichannel {...props} />;
 	}
 
+	if (isVoip) {
+		return <ComposerVoIP />;
+	}
+
 	if (isAnonymous) {
 		return (
 			<footer className='rc-message-box footer'>

@@ -0,0 +1,15 @@
+import { MessageFooterCallout } from '@rocket.chat/ui-composer';
+import { useTranslation } from '@rocket.chat/ui-contexts';
+import React, { ReactElement } from 'react';
+
+const ComposerVoIP = (): ReactElement => {
+	const t = useTranslation();
+
+	return (
+		<footer className='rc-message-box footer'>
+			<MessageFooterCallout>{t('Composer_not_available_phone_calls')}</MessageFooterCallout>
+		</footer>
+	);
+};
+
+export default ComposerVoIP;
@@ -91,6 +91,7 @@ const ToolboxProvider = ({ children, room }: { children: ReactNode; room: IRoom
 		setActiveTabBar([list.get(tab as string) as ToolboxActionConfig, context]);
 	}, [tab, list, currentRoom, context]);
 
+	// TODO: make the object stable, preventing re-renders
 	const contextValue = useMemo(
 		() => ({
 			listen,