From fc2384e33058da85e02273b4885ca5af4dfdd0e5 Mon Sep 17 00:00:00 2001
From: Valere <bill.carson@valrsoft.com>
Date: Fri, 10 Oct 2025 19:23:24 +0200
Subject: [PATCH] post merge fixes (js-sdk changes)

---
 src/home/useGroupCallRooms.ts | 4 ++--
 src/utils/test.ts             | 7 +++----
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/home/useGroupCallRooms.ts b/src/home/useGroupCallRooms.ts
index ad69b864..149af4b0 100644
--- a/src/home/useGroupCallRooms.ts
+++ b/src/home/useGroupCallRooms.ts
@@ -141,8 +141,8 @@ export function useGroupCallRooms(client: MatrixClient): GroupCallRoom[] {
         .filter(roomIsJoinable);
       const sortedRooms = sortRooms(client, rooms);
       Promise.all(
-        sortedRooms.map((room) => {
-          const session = client.matrixRTC.getRoomSession(room);
+        sortedRooms.map(async (room) => {
+          const session = await client.matrixRTC.getRoomSession(room);
           return {
             roomAlias: room.getCanonicalAlias() ?? undefined,
             roomName: room.name,
diff --git a/src/utils/test.ts b/src/utils/test.ts
index cc057532..2da8ed31 100644
--- a/src/utils/test.ts
+++ b/src/utils/test.ts
@@ -193,8 +193,10 @@ export function mockRtcMembership(
   const event = new MatrixEvent({
     sender: typeof user === "string" ? user : user.userId,
     event_id: `$-ev-${randomUUID()}:example.org`,
+    content: data,
   });
-  const cms = new CallMembership(event, data);
+
+  const cms = new CallMembership(event);
   vi.mocked(cms).getTransport = vi.fn().mockReturnValue(fociPreferred[0]);
   return cms;
 }
@@ -345,9 +347,6 @@ export class MockRTCSession extends TypedEventEmitter<
     vi.mocked(session).reemitEncryptionKeys = vi
       .fn<() => void>()
       .mockReturnValue(undefined);
-    vi.mocked(session).resolveActiveFocus = vi
-      .fn<(member?: CallMembership) => Transport | undefined>()
-      .mockReturnValue(undefined);
     vi.mocked(session).getOldestMembership = vi
       .fn<() => CallMembership | undefined>()
       .mockReturnValue(this.memberships[0]);