OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity

post-merge fixes

pull/21833/head
Travis Ralston 2022-04-05 10:57:16 -06:00
parent 4057833036
commit 0280c27bfd
6 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/components/structures/ThreadPanel.tsx
View File

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

2
src/components/views/dialogs/CreateRoomDialog.tsx
View File

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

2
src/components/views/messages/MessageActionBar.tsx
View File

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

2
src/components/views/rooms/RoomTile.tsx
View File

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

3
test/components/views/rooms/RoomTile-test.tsx
View File

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

1
test/stores/VideoChannelStore-test.ts
View File

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