post-merge fixes

src/components/structures/ThreadPanel.tsx

@@ -37,7 +37,7 @@ import SdkConfig from '../../SdkConfig';
 import Modal from '../../Modal';
 import BetaFeedbackDialog from '../views/dialogs/BetaFeedbackDialog';
 import { Action } from '../../dispatcher/actions';
-import { UserTab } from '../views/dialogs/UserSettingsDialog';
+import { UserTab } from '../views/dialogs/UserTab';
 import dis from '../../dispatcher/dispatcher';
 
 interface IProps {

src/components/views/dialogs/CreateRoomDialog.tsx

@@ -24,7 +24,7 @@ import SdkConfig from '../../../SdkConfig';
 import withValidation, { IFieldState } from '../elements/Validation';
 import { _t } from '../../../languageHandler';
 import { MatrixClientPeg } from '../../../MatrixClientPeg';
-import { IOpts, privateShouldBeEncrypted } from "../../../createRoom";
+import { IOpts } from "../../../createRoom";
 import Field from "../elements/Field";
 import RoomAliasField from "../elements/RoomAliasField";
 import LabelledToggleSwitch from "../elements/LabelledToggleSwitch";

src/components/views/messages/MessageActionBar.tsx

@@ -43,7 +43,7 @@ import { showThread } from "../../../dispatcher/dispatch-actions/threads";
 import { shouldDisplayReply } from '../../../utils/Reply';
 import { Key } from "../../../Keyboard";
 import { ALTERNATE_KEY_NAME } from "../../../accessibility/KeyboardShortcuts";
-import { UserTab } from '../dialogs/UserSettingsDialog';
+import { UserTab } from '../dialogs/UserTab';
 import { Action } from '../../../dispatcher/actions';
 
 interface IOptionsButtonProps {

src/components/views/rooms/RoomTile.tsx

@@ -199,7 +199,7 @@ export default class RoomTile extends React.PureComponent<IProps, IState> {
             this.onRoomPreviewChanged,
         );
         this.props.room.off(RoomEvent.Name, this.onRoomNameUpdate);
-        this.props.room.currentState.off(RoomStateEvent.Events, this.updateVoiceMembers);
+        this.props.room.currentState.off(RoomStateEvent.Events, this.updateVideoMembers);
         defaultDispatcher.unregister(this.dispatcherRef);
         this.notificationState.off(NotificationStateEvents.Update, this.onNotificationUpdate);
         this.roomProps.off(PROPERTY_UPDATED, this.onRoomPropertyUpdate);

test/components/views/rooms/RoomTile-test.tsx

@@ -26,9 +26,8 @@ import {
     mockStateEventImplementation,
     mkRoom,
     mkEvent,
-    stubVoiceChannelStore,
+    stubVideoChannelStore,
 } from "../../../test-utils";
-import { stubVideoChannelStore } from "../../../test-utils/video";
 import RoomTile from "../../../../src/components/views/rooms/RoomTile";
 import SettingsStore from "../../../../src/settings/SettingsStore";
 import { DefaultTagID } from "../../../../src/stores/room-list/models";

test/stores/VideoChannelStore-test.ts

@@ -16,7 +16,6 @@ limitations under the License.
 
 import { ClientWidgetApi, MatrixWidgetType } from "matrix-widget-api";
 
-import "../skinned-sdk";
 import { stubClient, mkRoom } from "../test-utils";
 import { MatrixClientPeg } from "../../src/MatrixClientPeg";
 import WidgetStore from "../../src/stores/WidgetStore";