From c7e9f1ce1449313adb2f3ef82661b8c70c222d95 Mon Sep 17 00:00:00 2001
From: Robin <robin@robin.town>
Date: Mon, 15 Dec 2025 15:09:46 -0500
Subject: [PATCH] Explicitly pass the MatrixRTC mode to CallViewModel

---
 src/room/InCallView.tsx                           | 2 ++
 src/state/CallViewModel/CallViewModelTestUtils.ts | 2 +-
 src/utils/test-viewmodel.ts                       | 2 ++
 3 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/room/InCallView.tsx b/src/room/InCallView.tsx
index add8154a..41582039 100644
--- a/src/room/InCallView.tsx
+++ b/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$,
diff --git a/src/state/CallViewModel/CallViewModelTestUtils.ts b/src/state/CallViewModel/CallViewModelTestUtils.ts
index e9996a41..377c6771 100644
--- a/src/state/CallViewModel/CallViewModelTestUtils.ts
+++ b/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$,
diff --git a/src/utils/test-viewmodel.ts b/src/utils/test-viewmodel.ts
index 98c45d86..0745be72 100644
--- a/src/utils/test-viewmodel.ts
+++ b/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$,