Fix import merge conflicts, removing any that aren't needed anymore

Many imports were removed as part of refactoring work, so here we are.

src/async-components/views/dialogs/EncryptedEventDialog.js

@@ -14,28 +14,18 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-<<<<<<< HEAD
 import React from "react";
-=======
-import {Key} from "../../../Keyboard";
-
-const React = require("react");
->>>>>>> develop
 import createReactClass from 'create-react-class';
 import PropTypes from 'prop-types';
 import { _t } from '../../../languageHandler';
 import {MatrixClientPeg} from "../../../MatrixClientPeg";
+import {Key} from "../../../Keyboard";
+import * as sdk from "../../../index";
 
-const sdk = require('../../../index');
-
-<<<<<<< HEAD
-export default createReactClass({
-=======
 // XXX: This component is not cross-signing aware.
 // https://github.com/vector-im/riot-web/issues/11752 tracks either updating this
 // component or taking it out to pasture.
-module.exports = createReactClass({
+export default createReactClass({
->>>>>>> develop
     displayName: 'EncryptedEventDialog',
 
     propTypes: {

src/async-components/views/dialogs/keybackup/CreateKeyBackupDialog.js

@@ -17,15 +17,9 @@ limitations under the License.
 
 import React from 'react';
 import FileSaver from 'file-saver';
-<<<<<<< HEAD
 import * as sdk from '../../../../index';
 import {MatrixClientPeg} from '../../../../MatrixClientPeg';
-=======
 import PropTypes from 'prop-types';
-
-import sdk from '../../../../index';
-import MatrixClientPeg from '../../../../MatrixClientPeg';
->>>>>>> develop
 import { scorePassword } from '../../../../utils/PasswordScorer';
 import { _t } from '../../../../languageHandler';
 import { accessSecretStorage } from '../../../../CrossSigningManager';

src/components/structures/EmbeddedPage.js

@@ -25,12 +25,7 @@ import { _t } from '../../languageHandler';
 import sanitizeHtml from 'sanitize-html';
 import * as sdk from '../../index';
 import dis from '../../dispatcher';
-<<<<<<< HEAD
 import {MatrixClientPeg} from '../../MatrixClientPeg';
-import { MatrixClient } from 'matrix-js-sdk';
-=======
-import MatrixClientPeg from '../../MatrixClientPeg';
->>>>>>> develop
 import classnames from 'classnames';
 import MatrixClientContext from "../../contexts/MatrixClientContext";
 

src/components/structures/LeftPanel.js

@@ -22,12 +22,7 @@ import classNames from 'classnames';
 import { Key } from '../../Keyboard';
 import * as sdk from '../../index';
 import dis from '../../dispatcher';
-<<<<<<< HEAD
 import * as VectorConferenceHandler from '../../VectorConferenceHandler';
-import TagPanelButtons from './TagPanelButtons';
-=======
-import VectorConferenceHandler from '../../VectorConferenceHandler';
->>>>>>> develop
 import SettingsStore from '../../settings/SettingsStore';
 import {_t} from "../../languageHandler";
 import Analytics from "../../Analytics";

src/components/structures/MyGroups.js

@@ -17,13 +17,7 @@ limitations under the License.
 
 import React from 'react';
 import createReactClass from 'create-react-class';
-<<<<<<< HEAD
-import PropTypes from 'prop-types';
-import { MatrixClient } from 'matrix-js-sdk';
 import * as sdk from '../../index';
-=======
-import sdk from '../../index';
->>>>>>> develop
 import { _t } from '../../languageHandler';
 import dis from '../../dispatcher';
 import AccessibleButton from '../views/elements/AccessibleButton';

src/components/structures/RoomDirectory.js

@@ -27,11 +27,7 @@ import PropTypes from 'prop-types';
 import { _t } from '../../languageHandler';
 import { instanceForInstanceId, protocolNameForInstanceId } from '../../utils/DirectoryUtils';
 import Analytics from '../../Analytics';
-<<<<<<< HEAD
 import {getHttpUriForMxc} from "matrix-js-sdk/src/content-repo";
-=======
-import MatrixClientContext from "../../contexts/MatrixClientContext";
->>>>>>> develop
 
 const MAX_NAME_LENGTH = 80;
 const MAX_TOPIC_LENGTH = 160;

src/components/structures/RoomView.js

@@ -53,11 +53,8 @@ import SettingsStore, {SettingLevel} from "../../settings/SettingsStore";
 import WidgetUtils from '../../utils/WidgetUtils';
 import AccessibleButton from "../views/elements/AccessibleButton";
 import RightPanelStore from "../../stores/RightPanelStore";
-<<<<<<< HEAD
 import {haveTileForEvent} from "../views/rooms/EventTile";
-=======
 import RoomContext from "../../contexts/RoomContext";
->>>>>>> develop
 
 const DEBUG = false;
 let debuglog = function() {};

src/components/structures/TimelinePanel.js

@@ -25,22 +25,13 @@ import PropTypes from 'prop-types';
 import {EventTimeline} from "matrix-js-sdk";
 import * as Matrix from "matrix-js-sdk";
 import { _t } from '../../languageHandler';
-<<<<<<< HEAD
 import {MatrixClientPeg} from "../../MatrixClientPeg";
 import * as ObjectUtils from "../../ObjectUtils";
 import UserActivity from "../../UserActivity";
 import Modal from "../../Modal";
 import dis from "../../dispatcher";
 import * as sdk from "../../index";
-import { KeyCode } from '../../Keyboard';
+import { Key } from '../../Keyboard';
-=======
-const MatrixClientPeg = require("../../MatrixClientPeg");
-const dis = require("../../dispatcher");
-const ObjectUtils = require('../../ObjectUtils');
-const Modal = require("../../Modal");
-const UserActivity = require("../../UserActivity");
-import {Key} from '../../Keyboard';
->>>>>>> develop
 import Timer from '../../utils/Timer';
 import shouldHideEvent from '../../shouldHideEvent';
 import EditorStateTransfer from '../../utils/EditorStateTransfer';

src/components/views/avatars/BaseAvatar.js

@@ -20,12 +20,7 @@ limitations under the License.
 import React from 'react';
 import PropTypes from 'prop-types';
 import createReactClass from 'create-react-class';
-<<<<<<< HEAD
-import { MatrixClient } from 'matrix-js-sdk';
 import * as AvatarLogic from '../../../Avatar';
-=======
-import AvatarLogic from '../../../Avatar';
->>>>>>> develop
 import SettingsStore from "../../../settings/SettingsStore";
 import AccessibleButton from '../elements/AccessibleButton';
 import MatrixClientContext from "../../../contexts/MatrixClientContext";

src/components/views/dialogs/DevtoolsDialog.js

@@ -16,18 +16,10 @@ limitations under the License.
 
 import React from 'react';
 import PropTypes from 'prop-types';
-<<<<<<< HEAD
 import * as sdk from '../../../index';
 import SyntaxHighlight from '../elements/SyntaxHighlight';
 import { _t } from '../../../languageHandler';
-import {MatrixClientPeg} from '../../../MatrixClientPeg';
-=======
 import { Room } from "matrix-js-sdk";
-
-import sdk from '../../../index';
-import SyntaxHighlight from '../elements/SyntaxHighlight';
-import { _t } from '../../../languageHandler';
->>>>>>> develop
 import Field from "../elements/Field";
 import MatrixClientContext from "../../../contexts/MatrixClientContext";
 

src/components/views/dialogs/RoomSettingsDialog.js

@@ -24,14 +24,9 @@ import RolesRoomSettingsTab from "../settings/tabs/room/RolesRoomSettingsTab";
 import GeneralRoomSettingsTab from "../settings/tabs/room/GeneralRoomSettingsTab";
 import SecurityRoomSettingsTab from "../settings/tabs/room/SecurityRoomSettingsTab";
 import NotificationSettingsTab from "../settings/tabs/room/NotificationSettingsTab";
-<<<<<<< HEAD
+import BridgeSettingsTab from "../settings/tabs/room/BridgeSettingsTab";
 import * as sdk from "../../../index";
 import {MatrixClientPeg} from "../../../MatrixClientPeg";
-=======
-import BridgeSettingsTab from "../settings/tabs/room/BridgeSettingsTab";
-import sdk from "../../../index";
-import MatrixClientPeg from "../../../MatrixClientPeg";
->>>>>>> develop
 import dis from "../../../dispatcher";
 import SettingsStore from "../../../settings/SettingsStore";
 

src/components/views/dialogs/keybackup/RestoreKeyBackupDialog.js

@@ -16,15 +16,9 @@ limitations under the License.
 */
 
 import React from 'react';
-<<<<<<< HEAD
 import * as sdk from '../../../../index';
 import {MatrixClientPeg} from '../../../../MatrixClientPeg';
-=======
 import { MatrixClient } from 'matrix-js-sdk';
-
-import sdk from '../../../../index';
-import MatrixClientPeg from '../../../../MatrixClientPeg';
->>>>>>> develop
 import Modal from '../../../../Modal';
 import { _t } from '../../../../languageHandler';
 import {Key} from "../../../../Keyboard";

src/components/views/elements/ImageView.js

@@ -22,14 +22,11 @@ import PropTypes from 'prop-types';
 import {MatrixClientPeg} from "../../../MatrixClientPeg";
 import {formatDate} from '../../../DateUtils';
 import { _t } from '../../../languageHandler';
-<<<<<<< HEAD
 import filesize from "filesize";
 import AccessibleButton from "./AccessibleButton";
 import Modal from "../../../Modal";
 import * as sdk from "../../../index";
-=======
 import {Key} from "../../../Keyboard";
->>>>>>> develop
 
 export default class ImageView extends React.Component {
     static propTypes = {

src/components/views/elements/TagTile.js

@@ -20,12 +20,7 @@ import React, {createRef} from 'react';
 import PropTypes from 'prop-types';
 import createReactClass from 'create-react-class';
 import classNames from 'classnames';
-<<<<<<< HEAD
-import { MatrixClient } from 'matrix-js-sdk';
 import * as sdk from '../../../index';
-=======
-import sdk from '../../../index';
->>>>>>> develop
 import dis from '../../../dispatcher';
 import { isOnlyCtrlOrCmdIgnoreShiftKeyEvent } from '../../../Keyboard';
 import * as FormattingUtils from '../../../utils/FormattingUtils';

src/components/views/groups/GroupInviteTile.js

@@ -19,12 +19,7 @@ limitations under the License.
 import React from 'react';
 import PropTypes from 'prop-types';
 import createReactClass from 'create-react-class';
-<<<<<<< HEAD
-import { MatrixClient } from 'matrix-js-sdk';
 import * as sdk from '../../../index';
-=======
-import sdk from '../../../index';
->>>>>>> develop
 import dis from '../../../dispatcher';
 import {_t} from '../../../languageHandler';
 import classNames from 'classnames';

src/components/views/groups/GroupMemberTile.js

@@ -19,12 +19,7 @@ limitations under the License.
 import React from 'react';
 import PropTypes from 'prop-types';
 import createReactClass from 'create-react-class';
-<<<<<<< HEAD
-import { MatrixClient } from 'matrix-js-sdk';
 import * as sdk from '../../../index';
-=======
-import sdk from '../../../index';
->>>>>>> develop
 import dis from '../../../dispatcher';
 import { GroupMemberType } from '../../../groups';
 import MatrixClientContext from "../../../contexts/MatrixClientContext";

src/components/views/groups/GroupRoomTile.js

@@ -17,12 +17,7 @@ limitations under the License.
 import React from 'react';
 import PropTypes from 'prop-types';
 import createReactClass from 'create-react-class';
-<<<<<<< HEAD
-import {MatrixClient} from 'matrix-js-sdk';
 import * as sdk from '../../../index';
-=======
-import sdk from '../../../index';
->>>>>>> develop
 import dis from '../../../dispatcher';
 import { GroupRoomType } from '../../../groups';
 import MatrixClientContext from "../../../contexts/MatrixClientContext";

src/components/views/groups/GroupUserSettings.js

@@ -16,12 +16,7 @@ limitations under the License.
 
 import React from 'react';
 import createReactClass from 'create-react-class';
-<<<<<<< HEAD
 import * as sdk from '../../../index';
-import { MatrixClient } from 'matrix-js-sdk';
-=======
-import sdk from '../../../index';
->>>>>>> develop
 import { _t } from '../../../languageHandler';
 import MatrixClientContext from "../../../contexts/MatrixClientContext";
 

src/components/views/room_settings/AliasSettings.js

@@ -15,25 +15,15 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-<<<<<<< HEAD
-import React from "react";
-=======
 import EditableItemList from "../elements/EditableItemList";
-
 import React, {createRef} from 'react';
->>>>>>> develop
 import PropTypes from 'prop-types';
 import {MatrixClientPeg} from "../../../MatrixClientPeg";
 import * as sdk from "../../../index";
 import { _t } from '../../../languageHandler';
 import Field from "../elements/Field";
 import ErrorDialog from "../dialogs/ErrorDialog";
-<<<<<<< HEAD
-import Modal from "../../../Modal";
-=======
 import AccessibleButton from "../elements/AccessibleButton";
-const Modal = require("../../../Modal");
->>>>>>> develop
 
 class EditableAliasesList extends EditableItemList {
     constructor(props) {

src/components/views/room_settings/RelatedGroupSettings.js

@@ -16,13 +16,8 @@ limitations under the License.
 
 import React from 'react';
 import PropTypes from 'prop-types';
-<<<<<<< HEAD
-import {MatrixEvent, MatrixClient} from 'matrix-js-sdk';
-import * as sdk from '../../../index';
-=======
 import {MatrixEvent} from 'matrix-js-sdk';
-import sdk from '../../../index';
+import * as sdk from '../../../index';
->>>>>>> develop
 import { _t } from '../../../languageHandler';
 import Modal from '../../../Modal';
 import ErrorDialog from "../dialogs/ErrorDialog";

src/components/views/rooms/EventTile.js

@@ -23,30 +23,17 @@ import PropTypes from 'prop-types';
 import createReactClass from 'create-react-class';
 import classNames from "classnames";
 import { _t, _td } from '../../../languageHandler';
-<<<<<<< HEAD
 import * as TextForEvent from "../../../TextForEvent";
-import Modal from "../../../Modal";
 import * as sdk from "../../../index";
-=======
-
-const sdk = require('../../../index');
-const TextForEvent = require('../../../TextForEvent');
-
->>>>>>> develop
 import dis from '../../../dispatcher';
 import SettingsStore from "../../../settings/SettingsStore";
 import {EventStatus} from 'matrix-js-sdk';
 import {formatTime} from "../../../DateUtils";
 import {MatrixClientPeg} from '../../../MatrixClientPeg';
 import {ALL_RULE_TYPES} from "../../../mjolnir/BanList";
-<<<<<<< HEAD
 import * as ObjectUtils from "../../../ObjectUtils";
-=======
 import MatrixClientContext from "../../../contexts/MatrixClientContext";
 
-const ObjectUtils = require('../../../ObjectUtils');
->>>>>>> develop
-
 const eventTileTypes = {
     'm.room.message': 'messages.MessageEvent',
     'm.sticker': 'messages.MessageEvent',

src/components/views/rooms/LinkPreviewWidget.js

@@ -21,14 +21,11 @@ import createReactClass from 'create-react-class';
 import { AllHtmlEntities } from 'html-entities';
 import {linkifyElement} from '../../../HtmlUtils';
 import SettingsStore from "../../../settings/SettingsStore";
-<<<<<<< HEAD
 import {MatrixClientPeg} from "../../../MatrixClientPeg";
 import * as sdk from "../../../index";
 import Modal from "../../../Modal";
 import * as ImageUtils from "../../../ImageUtils";
-=======
 import { _t } from "../../../languageHandler";
->>>>>>> develop
 
 export default createReactClass({
     displayName: 'LinkPreviewWidget',

src/components/views/rooms/MemberInfo.js

@@ -46,13 +46,8 @@ import MultiInviter from "../../../utils/MultiInviter";
 import SettingsStore from "../../../settings/SettingsStore";
 import E2EIcon from "./E2EIcon";
 import AutoHideScrollbar from "../../structures/AutoHideScrollbar";
-<<<<<<< HEAD
 import {MatrixClientPeg} from "../../../MatrixClientPeg";
-import {EventTimeline} from "matrix-js-sdk";
-=======
-import MatrixClientPeg from "../../../MatrixClientPeg";
 import MatrixClientContext from "../../../contexts/MatrixClientContext";
->>>>>>> develop
 
 export default createReactClass({
     displayName: 'MemberInfo',

src/components/views/settings/KeyBackupPanel.js

@@ -21,12 +21,7 @@ import * as sdk from '../../../index';
 import {MatrixClientPeg} from '../../../MatrixClientPeg';
 import { _t } from '../../../languageHandler';
 import Modal from '../../../Modal';
-<<<<<<< HEAD
-import SettingsStore from '../../../../src/settings/SettingsStore';
-import { accessSecretStorage } from '../../../CrossSigningManager';
-=======
 import SettingsStore from '../../../settings/SettingsStore';
->>>>>>> develop
 
 export default class KeyBackupPanel extends React.PureComponent {
     constructor(props) {

src/components/views/settings/tabs/room/GeneralRoomSettingsTab.js

@@ -18,12 +18,7 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import {_t} from "../../../../../languageHandler";
 import RoomProfileSettings from "../../../room_settings/RoomProfileSettings";
-<<<<<<< HEAD
-import {MatrixClientPeg} from "../../../../../MatrixClientPeg";
 import * as sdk from "../../../../..";
-=======
-import sdk from "../../../../..";
->>>>>>> develop
 import AccessibleButton from "../../../elements/AccessibleButton";
 import dis from "../../../../../dispatcher";
 import LabelledToggleSwitch from "../../../elements/LabelledToggleSwitch";

src/components/views/settings/tabs/user/FlairUserSettingsTab.js

@@ -17,12 +17,6 @@ limitations under the License.
 import React from 'react';
 import {_t} from "../../../../../languageHandler";
 import GroupUserSettings from "../../../groups/GroupUserSettings";
-<<<<<<< HEAD
-import {MatrixClientPeg} from "../../../../../MatrixClientPeg";
-import PropTypes from "prop-types";
-import {MatrixClient} from "matrix-js-sdk";
-=======
->>>>>>> develop
 
 export default class FlairUserSettingsTab extends React.Component {
     render() {