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

Merge branch 'travis/dispatcher-types' into travis/room-list-2

Browse Source
This commit is contained in:
Travis Ralston
2020-05-14 13:40:37 -06:00
parent 8e047c3731 e4835c4b03
commit 2b4c19e9ba
140 changed files with 666 additions and 481 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
test/components/views/rooms/RoomList-test.js
View File

@@ -9,7 +9,7 @@ import {MatrixClientPeg} from '../../../../src/MatrixClientPeg';
import sdk from '../../../skinned-sdk';
import { DragDropContext } from 'react-beautiful-dnd';
import dis from '../../../../src/dispatcher';
import dis from '../../../../src/dispatcher/dispatcher';
import DMRoomMap from '../../../../src/utils/DMRoomMap.js';
import GroupStore from '../../../../src/stores/GroupStore.js';

2
test/test-utils.js
View File

@@ -2,7 +2,7 @@
import React from 'react';
import {MatrixClientPeg as peg} from '../src/MatrixClientPeg';
import dis from '../src/dispatcher';
import dis from '../src/dispatcher/dispatcher';
import {makeType} from "../src/utils/TypeUtils";
import {ValidatedServerConfig} from "../src/utils/AutoDiscoveryUtils";
import ShallowRenderer from 'react-test-renderer/shallow';