Merge branch 'develop' into andybalaam/stas-demydiuk-membership-type3

2024-03-20 17:25:23 +00:00 · 2024-03-20 17:25:23 +00:00 · d7bdbee8d2
commit d7bdbee8d2
parent 5cd7743fcb 2cbf92860b
124 changed files with 2399 additions and 1052 deletions
--- a/test/components/views/rooms/LegacyRoomHeader-test.tsx
+++ b/test/components/views/rooms/LegacyRoomHeader-test.tsx
@ -24,6 +24,7 @@ import {
    RoomStateEvent,
    PendingEventOrdering,
    ISearchResults,
+    IContent,
 } from "matrix-js-sdk/src/matrix";
 import { KnownMembership } from "matrix-js-sdk/src/types";
 import { CallType } from "matrix-js-sdk/src/webrtc/call";
@ -112,7 +113,7 @@ describe("LegacyRoomHeader", () => {
                room: roomId,
                user: alice.userId,
                skey: stateKey,
-                content,
+                content: content as IContent,
            });
            room.addLiveEvents([event]);
            return { event_id: event.getId()! };