fix reviews

Author: diegolmello

app/containers/MediaCallHeader/MediaCallHeader.test.tsx

@@ -89,12 +89,8 @@ describe('MediaCallHeader', () => {
 		expect(queryByTestId('media-call-header-end')).toBeNull();
 	});
 
-	it('should render empty placeholder when only callId is set (native accepted call, before answerCall completes)', () => {
-		useCallStore.setState({
-			call: null,
-			callId: 'e3246c4d-d23a-412f-8a8b-37ec9f29ef1a',
-			callState: 'none'
-		});
+	it('should render empty placeholder when native accepted but call not bound yet (before answerCall completes)', () => {
+		useCallStore.getState().setNativeAcceptedCallId('e3246c4d-d23a-412f-8a8b-37ec9f29ef1a');
 		const { getByTestId, queryByTestId } = render(
 			<Wrapper>
 				<MediaCallHeader />

app/lib/services/voip/MediaSessionInstance.test.ts

@@ -6,7 +6,6 @@ const mockCallStoreReset = jest.fn();
 const mockUseCallStoreGetState = jest.fn(() => ({
 	reset: mockCallStoreReset,
 	setCall: jest.fn(),
-	setCallId: jest.fn(),
 	resetNativeCallId: jest.fn(),
 	call: null as unknown,
 	callId: null as string | null,
@@ -98,14 +97,17 @@ jest.mock('@rocket.chat/media-signaling', () => ({
 		})
 }));
 
+const STREAM_NOTIFY_USER = 'stream-notify-user';
+
 function getStreamNotifyHandler(): (ddpMessage: IDDPMessage) => void {
 	const calls = mockOnStreamData.mock.calls as unknown as [string, (m: IDDPMessage) => void][];
-	const last = calls[calls.length - 1];
-	const handler = last?.[1];
-	if (typeof handler !== 'function') {
-		throw new Error('stream-notify-user handler not registered');
+	for (let i = calls.length - 1; i >= 0; i--) {
+		const [eventName, handler] = calls[i];
+		if (eventName === STREAM_NOTIFY_USER && typeof handler === 'function') {
+			return handler;
+		}
 	}
-	return handler;
+	throw new Error('stream-notify-user handler not registered');
 }
 
 describe('MediaSessionInstance', () => {
@@ -115,7 +117,6 @@ describe('MediaSessionInstance', () => {
 		mockUseCallStoreGetState.mockReturnValue({
 			reset: mockCallStoreReset,
 			setCall: jest.fn(),
-			setCallId: jest.fn(),
 			resetNativeCallId: jest.fn(),
 			call: null,
 			callId: null,
@@ -197,40 +198,8 @@ describe('MediaSessionInstance', () => {
 	});
 
 	describe('stream-notify-user (notification/accepted gated)', () => {
-		it('does not call answerCall when store has no native-accepted callId', async () => {
-			const answerSpy = jest.spyOn(mediaSessionInstance, 'answerCall').mockResolvedValue(undefined);
-			mediaSessionInstance.init('user-1');
-			const streamHandler = getStreamNotifyHandler();
-			streamHandler({
-				msg: 'changed',
-				fields: {
-					eventName: 'uid/media-signal',
-					args: [
-						{
-							type: 'notification',
-							notification: 'accepted',
-							signedContractId: 'test-device-id',
-							callId: 'from-signal'
-						}
-					]
-				}
-			});
-			await Promise.resolve();
-			expect(answerSpy).not.toHaveBeenCalled();
-			answerSpy.mockRestore();
-		});
-
-		it('does not call answerCall when transient callId matches signal but nativeAcceptedCallId does not', async () => {
+		it('does not call answerCall when nativeAcceptedCallId is null', async () => {
 			const answerSpy = jest.spyOn(mediaSessionInstance, 'answerCall').mockResolvedValue(undefined);
-			mockUseCallStoreGetState.mockReturnValue({
-				reset: mockCallStoreReset,
-				setCall: jest.fn(),
-				setCallId: jest.fn(),
-				resetNativeCallId: jest.fn(),
-				call: null,
-				callId: 'from-signal',
-				nativeAcceptedCallId: null
-			});
 			mediaSessionInstance.init('user-1');
 			const streamHandler = getStreamNotifyHandler();
 			streamHandler({
@@ -257,7 +226,6 @@ describe('MediaSessionInstance', () => {
 			mockUseCallStoreGetState.mockReturnValue({
 				reset: mockCallStoreReset,
 				setCall: jest.fn(),
-				setCallId: jest.fn(),
 				resetNativeCallId: jest.fn(),
 				call: null,
 				callId: null,
@@ -289,7 +257,6 @@ describe('MediaSessionInstance', () => {
 			mockUseCallStoreGetState.mockReturnValue({
 				reset: mockCallStoreReset,
 				setCall: jest.fn(),
-				setCallId: jest.fn(),
 				resetNativeCallId: jest.fn(),
 				call: null,
 				callId: null,
@@ -321,7 +288,6 @@ describe('MediaSessionInstance', () => {
 			mockUseCallStoreGetState.mockReturnValue({
 				reset: mockCallStoreReset,
 				setCall: jest.fn(),
-				setCallId: jest.fn(),
 				resetNativeCallId: jest.fn(),
 				call: { callId: 'from-signal' } as any,
 				callId: 'from-signal',

app/lib/services/voip/useCallStore.ts

@@ -10,7 +10,7 @@ const STALE_NATIVE_MS = 15_000;
 
 let callListenersCleanup: (() => void) | null = null;
 let staleNativeTimer: ReturnType<typeof setTimeout> | null = null;
-/** Id this timer may clear; must match `nativeAcceptedCallId` at fire time. */
+/** Id the stale-native timer was armed for; must match `nativeAcceptedCallId` at fire time. Timer clears only this field, not `callId`. */
 let staleNativeScheduledId: string | null = null;
 
 export function cleanupCallListeners(): void {
@@ -26,6 +26,14 @@ function cancelStaleNativeTimer(): void {
 	staleNativeScheduledId = null;
 }
 
+function clearStaleNativeIfStillUnbound(get: () => CallStore, scheduled: string): void {
+	const st = get();
+	if (st.call != null || st.nativeAcceptedCallId !== scheduled) {
+		return;
+	}
+	useCallStore.setState({ nativeAcceptedCallId: null });
+}
+
 function armStaleNativeTimer(get: () => CallStore): void {
 	cancelStaleNativeTimer();
 	const scheduledId = get().nativeAcceptedCallId;
@@ -37,17 +45,9 @@ function armStaleNativeTimer(get: () => CallStore): void {
 		staleNativeTimer = null;
 		const scheduled = staleNativeScheduledId;
 		staleNativeScheduledId = null;
-		const st = get();
-		if (st.call != null) {
-			return;
-		}
-		if (st.nativeAcceptedCallId !== scheduled) {
-			return;
+		if (scheduled != null) {
+			clearStaleNativeIfStillUnbound(get, scheduled);
 		}
-		useCallStore.setState({
-			nativeAcceptedCallId: null,
-			callId: null
-		});
 	}, STALE_NATIVE_MS);
 }
 
@@ -75,7 +75,6 @@ interface CallStoreState {
 }
 
 interface CallStoreActions {
-	setCallId: (callId: string | null) => void;
 	/** Native accept paths: sets sticky id only; starts/restarts stale-native timer. */
 	setNativeAcceptedCallId: (callId: string) => void;
 	/** Clears sticky native id (+ transient `callId` when unbound); cancels stale timer. */
@@ -112,10 +111,6 @@ const initialState: CallStoreState = {
 export const useCallStore = create<CallStore>((set, get) => ({
 	...initialState,
 
-	setCallId: (callId: string | null) => {
-		set({ callId });
-	},
-
 	setNativeAcceptedCallId: (callId: string) => {
 		cancelStaleNativeTimer();
 		set({ nativeAcceptedCallId: callId });