Explicitly pass the MatrixRTC mode to CallViewModel

src/room/InCallView.tsx

@@ -88,6 +88,7 @@ import { ReactionsOverlay } from "./ReactionsOverlay";
 import { CallEventAudioRenderer } from "./CallEventAudioRenderer";
 import {
   debugTileLayout as debugTileLayoutSetting,
+  matrixRTCMode as matrixRTCModeSetting,
   useSetting,
 } from "../settings/settings";
 import { ReactionsReader } from "../reactions/ReactionsReader";
@@ -144,6 +145,7 @@ export const ActiveCall: FC<ActiveCallProps> = (props) => {
         encryptionSystem: props.e2eeSystem,
         autoLeaveWhenOthersLeft,
         waitForCallPickup: waitForCallPickup && sendNotificationType === "ring",
+        matrixRTCMode$: matrixRTCModeSetting.value$,
       },
       reactionsReader.raisedHands$,
       reactionsReader.reactions$,

src/state/CallViewModel/CallViewModelTestUtils.ts

@@ -105,6 +105,7 @@ export function withCallViewModel(mode: MatrixRTCMode) {
     options: CallViewModelOptions = {
       encryptionSystem: { kind: E2eeType.PER_PARTICIPANT },
       autoLeaveWhenOthersLeft: false,
+      matrixRTCMode$: constant(mode),
     },
   ): void => {
     let syncState = initialSyncState;
@@ -184,7 +185,6 @@ export function withCallViewModel(mode: MatrixRTCMode) {
           }),
         connectionState$,
         windowSize$,
-        matrixRTCMode$: constant(mode),
       },
       raisedHands$,
       reactions$,

src/utils/test-viewmodel.ts

@@ -37,6 +37,7 @@ import {
 import { aliceRtcMember, localRtcMember } from "./test-fixtures";
 import { type RaisedHandInfo, type ReactionInfo } from "../reactions";
 import { constant } from "../state/Behavior";
+import { MatrixRTCMode } from "../settings/settings";
 
 mockConfig({ livekit: { livekit_service_url: "https://example.com" } });
 
@@ -162,6 +163,7 @@ export function getBasicCallViewModelEnvironment(
           setE2EEEnabled: async () => Promise.resolve(),
         }),
       connectionState$: constant(ConnectionState.Connected),
+      matrixRTCMode$: constant(MatrixRTCMode.Legacy),
       ...callViewModelOptions,
     },
     handRaisedSubject$,