Chore: Small fix on callProvider

apps/meteor/client/contexts/CallContext.ts

@@ -1,6 +1,6 @@
 import type { IVoipRoom } from '@rocket.chat/core-typings';
 import { ICallerInfo, VoIpCallerInfo } from '@rocket.chat/core-typings';
-import { createContext, useCallback, useContext } from 'react';
+import { createContext, useCallback, useContext, useRef } from 'react';
 import { useSyncExternalStore } from 'use-sync-external-store/shim';
 
 import { VoIPUser } from '../lib/voip/VoIPUser';
@@ -62,23 +62,19 @@ export const useIsCallEnabled = (): boolean => {
 	return enabled;
 };
 
-let callerInfo: VoIpCallerInfo;
-
 export const useIsCallReady = (): boolean => {
-	const context = useContext(CallContext);
-
-	if (isCallContextReady(context)) {
-		callerInfo = context.voipClient.callerInfo;
-	}
+	const { ready } = useContext(CallContext);
 
-	return !!context.ready;
+	return !!ready;
 };
 
 export const useIsCallError = (): boolean => {
 	const context = useContext(CallContext);
 	return Boolean(isCallContextError(context));
 };
 
+export const useCallContext = (): CallContextValue => useContext(CallContext);
+
 export const useCallActions = (): CallActionsType => {
 	const context = useContext(CallContext);
 
@@ -94,19 +90,30 @@ export const useCallerInfo = (): VoIpCallerInfo => {
 	if (!isCallContextReady(context)) {
 		throw new Error('useCallerInfo only if Calls are enabled and ready');
 	}
+
 	const { voipClient } = context;
+
+	const ref = useRef<VoIpCallerInfo>(voipClient.callerInfo);
+
 	const subscribe = useCallback(
 		(callback: () => void): (() => void) => {
-			voipClient.on('stateChanged', callback);
+			ref.current = voipClient.callerInfo;
+
+			const handleSubscribe = (): void => {
+				ref.current = voipClient.callerInfo;
+				callback();
+			};
+
+			voipClient.on('stateChanged', handleSubscribe);
 
 			return (): void => {
-				voipClient.off('stateChanged', callback);
+				voipClient.off('stateChanged', handleSubscribe);
 			};
 		},
 		[voipClient],
 	);
 
-	const getSnapshot = (): VoIpCallerInfo => callerInfo;
+	const getSnapshot = (): VoIpCallerInfo => ref.current;
 
 	return useSyncExternalStore(subscribe, getSnapshot);
 };
@@ -147,6 +154,7 @@ export const useCallClient = (): VoIPUser => {
 	if (!isCallContextReady(context)) {
 		throw new Error('useClient only if Calls are enabled and ready');
 	}
+
 	return context.voipClient;
 };
 

apps/meteor/client/contexts/VoipAgentContext.ts

@@ -0,0 +1,23 @@
+import { createContext, Dispatch, SetStateAction } from 'react';
+
+export type VoipAgentContextValue = {
+	agentEnabled: boolean;
+	registered: boolean;
+	networkStatus: 'online' | 'offline';
+	voipButtonEnabled: boolean;
+	setAgentEnabled: Dispatch<SetStateAction<boolean>>;
+	setRegistered: Dispatch<SetStateAction<boolean>>;
+	setNetworkStatus: Dispatch<SetStateAction<'online' | 'offline'>>;
+	setVoipButtonEnabled: Dispatch<SetStateAction<boolean>>;
+};
+
+export const VoipAgentContext = createContext<VoipAgentContextValue>({
+	agentEnabled: false,
+	registered: false,
+	networkStatus: 'offline',
+	voipButtonEnabled: false,
+	setAgentEnabled: () => undefined,
+	setRegistered: () => undefined,
+	setNetworkStatus: () => undefined,
+	setVoipButtonEnabled: () => undefined,
+});

apps/meteor/client/lib/voip/VoIPUser.ts

@@ -750,7 +750,7 @@ export class VoIPUser extends Emitter<VoipEvents> {
 		return this.queueInfo;
 	}
 
-	getRegistrarState(): string | undefined {
+	getRegisterState(): string | undefined {
 		return this.registerer?.state.toString().toLocaleLowerCase();
 	}
 

apps/meteor/client/providers/CallProvider/CallProvider.tsx

@@ -21,9 +21,10 @@ import { OutgoingByeRequest } from 'sip.js/lib/core';
 import { CustomSounds } from '../../../app/custom-sounds/client';
 import { getUserPreference } from '../../../app/utils/client';
 import { WrapUpCallModal } from '../../components/voip/modal/WrapUpCallModal';
-import { CallContext, CallContextValue, useCallCloseRoom } from '../../contexts/CallContext';
+import { CallContext, CallContextValue } from '../../contexts/CallContext';
 import { roomCoordinator } from '../../lib/rooms/roomCoordinator';
 import { QueueAggregator } from '../../lib/voip/QueueAggregator';
+import VoipAgentProvider from '../VoipAgentProvider';
 import { useVoipClient } from './hooks/useVoipClient';
 
 const startRingback = (user: IUser): void => {
@@ -44,6 +45,9 @@ export const CallProvider: FC = ({ children }) => {
 	const voipEnabled = useSetting('VoIP_Enabled');
 	const subscribeToNotifyUser = useStream('notify-user');
 	const dispatchEvent = useEndpoint('POST', '/v1/voip/events');
+	const visitorEndpoint = useEndpoint('POST', '/v1/livechat/visitor');
+	const voipEndpoint = useEndpoint('GET', '/v1/voip/room');
+	const voipCloseRoomEndpoint = useEndpoint('POST', '/v1/voip/room.close');
 	const setModal = useSetModal();
 
 	const result = useVoipClient();
@@ -54,10 +58,29 @@ export const CallProvider: FC = ({ children }) => {
 
 	const [queueCounter, setQueueCounter] = useState(0);
 	const [queueName, setQueueName] = useState('');
+	const [roomInfo, setRoomInfo] = useState<{ v: { token?: string }; rid: string }>();
+
+	const closeRoom = useCallback(
+		async (data): Promise<void> => {
+			roomInfo &&
+				(await voipCloseRoomEndpoint({
+					rid: roomInfo.rid,
+					token: roomInfo.v.token || '',
+					options: { comment: data?.comment, tags: data?.tags },
+				}));
+			homeRoute.push({});
+
+			const queueAggregator = result.voipClient?.getAggregator();
+			if (queueAggregator) {
+				queueAggregator.callEnded();
+			}
+		},
+		[homeRoute, result?.voipClient, roomInfo, voipCloseRoomEndpoint],
+	);
 
 	const openWrapUpModal = useCallback((): void => {
-		setModal(() => <WrapUpCallModal closeRoom={useCallCloseRoom} />);
-	}, [setModal]);
+		setModal(() => <WrapUpCallModal closeRoom={closeRoom} />);
+	}, [closeRoom, setModal]);
 
 	const [queueAggregator, setQueueAggregator] = useState<QueueAggregator>();
 
@@ -234,12 +257,6 @@ export const CallProvider: FC = ({ children }) => {
 		};
 	}, [onNetworkConnected, onNetworkDisconnected, result.voipClient]);
 
-	const visitorEndpoint = useEndpoint('POST', '/v1/livechat/visitor');
-	const voipEndpoint = useEndpoint('GET', '/v1/voip/room');
-	const voipCloseRoomEndpoint = useEndpoint('POST', '/v1/voip/room.close');
-
-	const [roomInfo, setRoomInfo] = useState<{ v: { token?: string }; rid: string }>();
-
 	const openRoom = (rid: IVoipRoom['_id']): void => {
 		roomCoordinator.openRouteLink('v', { rid });
 	};
@@ -319,34 +336,17 @@ export const CallProvider: FC = ({ children }) => {
 				}
 				return '';
 			},
-			closeRoom: async ({ comment, tags }: { comment?: string; tags?: string[] }): Promise<void> => {
-				roomInfo && (await voipCloseRoomEndpoint({ rid: roomInfo.rid, token: roomInfo.v.token || '', options: { comment, tags } }));
-				homeRoute.push({});
-				const queueAggregator = voipClient.getAggregator();
-				if (queueAggregator) {
-					queueAggregator.callEnded();
-				}
-			},
+			closeRoom,
 			openWrapUpModal,
 		};
-	}, [
-		voipEnabled,
-		user,
-		result,
-		roomInfo,
-		queueCounter,
-		queueName,
-		openWrapUpModal,
-		visitorEndpoint,
-		voipEndpoint,
-		voipCloseRoomEndpoint,
-		homeRoute,
-	]);
+	}, [voipEnabled, user, result, roomInfo, queueCounter, queueName, closeRoom, openWrapUpModal, visitorEndpoint, voipEndpoint]);
 
 	return (
 		<CallContext.Provider value={contextValue}>
-			{children}
-			{contextValue.enabled && createPortal(<audio ref={remoteAudioMediaRef} />, document.body)}
+			<VoipAgentProvider>
+				{children}
+				{contextValue.enabled && createPortal(<audio ref={remoteAudioMediaRef} />, document.body)}
+			</VoipAgentProvider>
 		</CallContext.Provider>
 	);
 };

apps/meteor/client/providers/VoipAgentProvider.tsx

@@ -0,0 +1,28 @@
+import React, { FC, useState } from 'react';
+
+import { VoipAgentContext } from '../contexts/VoipAgentContext';
+
+const VoipAgentProvider: FC = ({ children }) => {
+	const [agentEnabled, setAgentEnabled] = useState(false);
+	const [registered, setRegistered] = useState(false);
+	const [networkStatus, setNetworkStatus] = useState<'online' | 'offline'>('online');
+	const [voipButtonEnabled, setVoipButtonEnabled] = useState(false);
+
+	return (
+		<VoipAgentContext.Provider
+			children={children}
+			value={{
+				agentEnabled,
+				registered,
+				networkStatus,
+				voipButtonEnabled,
+				setAgentEnabled,
+				setRegistered,
+				setNetworkStatus,
+				setVoipButtonEnabled,
+			}}
+		/>
+	);
+};
+
+export default VoipAgentProvider;

apps/meteor/client/sidebar/footer/voip/VoipFooter.tsx

@@ -130,7 +130,6 @@ export const VoipFooter = ({
 								small
 								square
 								danger
-								primary
 								onClick={(e): unknown => {
 									e.stopPropagation();
 									toggleMic(false);
@@ -152,7 +151,6 @@ export const VoipFooter = ({
 								small
 								square
 								success
-								primary
 								onClick={async (): Promise<void> => {
 									callActions.pickUp();
 									const rid = await createRoom(caller);