matrix/matrix-react-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-react-sdk.git synced 2025-08-09 08:42:50 +03:00
Code Activity

Merge branch 'develop' into sort-imports

Browse Source 
Signed-off-by: Aaron Raimist <aaron@raim.ist>
This commit is contained in:
Aaron Raimist
2021-12-09 08:34:20 +00:00
parent d9e94737f2 2b52e17a80
commit 7b94e13a84
642 changed files with 30052 additions and 8035 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
test/components/views/rooms/RoomHeader-test.tsx
View File

@@ -155,7 +155,6 @@ function render(room: Room): HTMLDivElement {
<RoomHeader
room={room}
inRoom={true}
onSettingsClick={() => {}}
onSearchClick={() => {}}
onForgetClick={() => {}}
onCallPlaced={(_type: PlaceCallType) => {}}

2
test/components/views/rooms/SendMessageComposer-test.tsx
View File

@@ -35,7 +35,7 @@ import { MatrixClientPeg } from "../../../../src/MatrixClientPeg";
import SpecPermalinkConstructor from "../../../../src/utils/permalinks/SpecPermalinkConstructor";
import defaultDispatcher from "../../../../src/dispatcher/dispatcher";
import DocumentOffset from '../../../../src/editor/offset';
import { Layout } from '../../../../src/settings/Layout';
import { Layout } from '../../../../src/settings/enums/Layout';
jest.mock("../../../../src/stores/RoomViewStore");