Merge branch 'develop' of https://github.com/vector-im/element-web into t3chguy/fix/20721

2024-11-27 14:53:20 +00:00 · 2024-11-27 14:53:20 +00:00 · 1bee3becfb
commit 1bee3becfb
parent a478463b75 bfac727307
69 changed files with 1357 additions and 599 deletions
--- a/test/unit-tests/components/views/rooms/RoomHeader-test.tsx
+++ b/test/unit-tests/components/views/rooms/RoomHeader-test.tsx
@ -589,7 +589,7 @@ describe("RoomHeader", () => {
                state_key: "",
                room_id: room.roomId,
            });
-            room.addLiveEvents([joinRuleEvent]);
+            room.addLiveEvents([joinRuleEvent], { addToState: true });

            render(<RoomHeader room={room} />, getWrapper());