Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/17686

Conflicts: src/components/views/avatars/RoomAvatar.tsx test/stores/SpaceStore-test.ts test/test-utils.js
2021-07-19 16:47:31 +01:00 · 2021-07-19 16:47:31 +01:00 · de42a00ca4
commit de42a00ca4
parent 5986609731 676d2aa187
104 changed files with 2492 additions and 2123 deletions
--- a/test/test-utils.js
+++ b/test/test-utils.js
@ -96,6 +96,7 @@ export function createTestClient() {
            },
        },
        decryptEventIfNeeded: () => Promise.resolve(),
+        isUserIgnored: jest.fn().mockReturnValue(false),
        getCapabilities: jest.fn().mockResolvedValue({}),
    };
 }