[FIX] Call button visible even when chat is queued (#22943)

RocketChat · Nov 16, 2021 · 1109e86 · 1109e86
1 parent 4c1f1fc
commit 1109e86
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/app/webrtc/client/tabBar.tsx b/app/webrtc/client/tabBar.tsx
@@ -5,7 +5,7 @@ import { addAction } from '../../../client/views/room/lib/Toolbox';
 import { APIClient } from '../../utils/client';
 
 addAction('webRTCVideo', ({ room }) => {
-	const enabled = useSetting('WebRTC_Enabled') && (useSetting('Omnichannel_call_provider') === 'WebRTC');
+	const enabled = useSetting('WebRTC_Enabled') && (useSetting('Omnichannel_call_provider') === 'WebRTC') && room.servedBy;
 
 	const handleClick = useCallback(async (): Promise<void> => {
 		if (!room.callStatus || room.callStatus === 'declined' || room.callStatus === 'ended') {

diff --git a/definition/IRoom.ts b/definition/IRoom.ts
@@ -34,6 +34,9 @@ export interface IRoom extends IRocketChatRecord {
 	usersCount: number;
 	jitsiTimeout: Date;
 	callStatus?: CallStatus;
+	servedBy?: {
+		_id: string;
+	};
 
 	streamingOptions?: {
 		id?: string;