Merge branch 'develop' into midhun/new-memberlist

2025-01-05 19:11:58 +05:30
parent c40b823f98 3fb10baedf
commit f52d7a8e20
48 changed files with 4573 additions and 350 deletions
--- a/playwright/e2e/crypto/event-shields.spec.ts
+++ b/playwright/e2e/crypto/event-shields.spec.ts
@@ -53,6 +53,8 @@ test.describe("Cryptography", function () {

            // Even though Alice has seen Bob's join event, Bob may not have done so yet. Wait for the sync to arrive.
            await bob.awaitRoomMembership(testRoomId);
+
+            await app.client.network.setupRoute();
        });

        test("should show the correct shield on e2e events", async ({