Merge branch 'develop' into improved-forwarding-ui

2021-05-19 12:39:48 -04:00 · 2021-05-19 12:39:48 -04:00 · 678b298bab
commit 678b298bab
parent e798b36f1d aa4984019c
67 changed files with 2134 additions and 567 deletions
--- a/test/components/views/rooms/MemberList-test.js
+++ b/test/components/views/rooms/MemberList-test.js
@ -88,6 +88,7 @@ describe('MemberList', () => {
        };
        memberListRoom.currentState = {
            members: {},
+            getMember: jest.fn(),
            getStateEvents: (eventType, stateKey) => stateKey === undefined ? [] : null, // ignore 3pid invites
        };
        for (const member of [...adminUsers, ...moderatorUsers, ...defaultUsers]) {