Merge remote-tracking branch 'aaronraimist/sort-imports' into develop

src/components/views/dialogs/AddExistingToSpaceDialog.tsx

@@ -19,6 +19,7 @@ import classNames from "classnames";
 import { Room } from "matrix-js-sdk/src/models/room";
 import { sleep } from "matrix-js-sdk/src/utils";
 import { EventType } from "matrix-js-sdk/src/@types/event";
+import { logger } from "matrix-js-sdk/src/logger";
 
 import { _t } from '../../../languageHandler';
 import BaseDialog from "./BaseDialog";
@@ -41,8 +42,6 @@ import TruncatedList from "../elements/TruncatedList";
 import EntityTile from "../rooms/EntityTile";
 import BaseAvatar from "../avatars/BaseAvatar";
 
-import { logger } from "matrix-js-sdk/src/logger";
-
 interface IProps {
     space: Room;
     onCreateRoomClick(): void;

src/components/views/dialogs/AddressPickerDialog.tsx

@@ -19,6 +19,7 @@ limitations under the License.
 
 import React, { createRef } from 'react';
 import { sleep } from "matrix-js-sdk/src/utils";
+import { logger } from "matrix-js-sdk/src/logger";
 
 import { _t, _td } from '../../../languageHandler';
 import { MatrixClientPeg } from '../../../MatrixClientPeg';
@@ -37,8 +38,6 @@ import AddressTile from '../elements/AddressTile';
 import BaseDialog from "./BaseDialog";
 import DialogButtons from "../elements/DialogButtons";
 
-import { logger } from "matrix-js-sdk/src/logger";
-
 const TRUNCATE_QUERY_LIST = 40;
 const QUERY_USER_DIRECTORY_DEBOUNCE_MS = 200;
 

src/components/views/dialogs/AnalyticsLearnMoreDialog.tsx

@@ -14,10 +14,11 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
+import React from "react";
+
 import BaseDialog from "./BaseDialog";
 import { _t } from "../../../languageHandler";
 import DialogButtons from "../elements/DialogButtons";
-import React from "react";
 import Modal from "../../../Modal";
 import SdkConfig from "../../../SdkConfig";
 

src/components/views/dialogs/AskInviteAnywayDialog.tsx

@@ -15,6 +15,7 @@ limitations under the License.
 */
 
 import React from 'react';
+
 import { _t } from '../../../languageHandler';
 import SettingsStore from "../../../settings/SettingsStore";
 import { SettingLevel } from "../../../settings/SettingLevel";

src/components/views/dialogs/BaseDialog.tsx

@@ -19,6 +19,7 @@ limitations under the License.
 import React from 'react';
 import FocusLock from 'react-focus-lock';
 import classNames from 'classnames';
+import { MatrixClient } from "matrix-js-sdk/src/client";
 
 import { Key } from '../../../Keyboard';
 import AccessibleButton, { ButtonEvent } from '../elements/AccessibleButton';
@@ -26,7 +27,6 @@ import { MatrixClientPeg } from '../../../MatrixClientPeg';
 import { _t } from "../../../languageHandler";
 import MatrixClientContext from "../../../contexts/MatrixClientContext";
 import { replaceableComponent } from "../../../utils/replaceableComponent";
-import { MatrixClient } from "matrix-js-sdk/src/client";
 import { IDialogProps } from "./IDialogProps";
 
 interface IProps extends IDialogProps {

src/components/views/dialogs/BugReportDialog.tsx

@@ -18,6 +18,7 @@ limitations under the License.
 */
 
 import React from 'react';
+
 import SdkConfig from '../../../SdkConfig';
 import Modal from '../../../Modal';
 import { _t } from '../../../languageHandler';

src/components/views/dialogs/ChangelogDialog.tsx

@@ -17,6 +17,7 @@ Copyright 2019 Michael Telatynski <7t3chguy@gmail.com>
 
 import React from 'react';
 import request from 'browser-request';
+
 import { _t } from '../../../languageHandler';
 import QuestionDialog from "./QuestionDialog";
 import Spinner from "../elements/Spinner";

src/components/views/dialogs/CommunityPrototypeInviteDialog.tsx

@@ -15,6 +15,9 @@ limitations under the License.
 */
 
 import React, { ChangeEvent, FormEvent } from 'react';
+import { RoomMember } from "matrix-js-sdk/src/models/room-member";
+import { logger } from "matrix-js-sdk/src/logger";
+
 import BaseDialog from "./BaseDialog";
 import { _t } from "../../../languageHandler";
 import { IDialogProps } from "./IDialogProps";
@@ -23,7 +26,6 @@ import AccessibleButton from "../elements/AccessibleButton";
 import { MatrixClientPeg } from "../../../MatrixClientPeg";
 import { arrayFastClone } from "../../../utils/arrays";
 import SdkConfig from "../../../SdkConfig";
-import { RoomMember } from "matrix-js-sdk/src/models/room-member";
 import InviteDialog from "./InviteDialog";
 import BaseAvatar from "../avatars/BaseAvatar";
 import { inviteMultipleToRoom, showAnyInviteErrors } from "../../../RoomInvite";
@@ -33,8 +35,6 @@ import ErrorDialog from "./ErrorDialog";
 import { replaceableComponent } from "../../../utils/replaceableComponent";
 import { mediaFromMxc } from "../../../customisations/Media";
 
-import { logger } from "matrix-js-sdk/src/logger";
-
 interface IProps extends IDialogProps {
     roomId: string;
     communityName: string;

src/components/views/dialogs/ConfirmAndWaitRedactDialog.tsx

@@ -15,6 +15,7 @@ limitations under the License.
 */
 
 import React from 'react';
+
 import { _t } from '../../../languageHandler';
 import { replaceableComponent } from "../../../utils/replaceableComponent";
 import ConfirmRedactDialog from './ConfirmRedactDialog';

src/components/views/dialogs/ConfirmRedactDialog.tsx

@@ -16,6 +16,7 @@ limitations under the License.
 
 import { MatrixEvent } from 'matrix-js-sdk/src/models/event';
 import React from 'react';
+
 import { _t } from '../../../languageHandler';
 import { MatrixClientPeg } from '../../../MatrixClientPeg';
 import Modal from '../../../Modal';

src/components/views/dialogs/ConfirmSpaceUserActionDialog.tsx

@@ -15,10 +15,10 @@ limitations under the License.
 */
 
 import React, { ComponentProps, useMemo, useState } from 'react';
+import { Room } from "matrix-js-sdk/src/models/room";
 
 import ConfirmUserActionDialog from "./ConfirmUserActionDialog";
 import SpaceStore from "../../../stores/spaces/SpaceStore";
-import { Room } from "matrix-js-sdk/src/models/room";
 import SpaceChildrenPicker from "../spaces/SpaceChildrenPicker";
 
 type BaseProps = ComponentProps<typeof ConfirmUserActionDialog>;

src/components/views/dialogs/ConfirmWipeDeviceDialog.tsx

@@ -15,6 +15,7 @@ limitations under the License.
 */
 
 import React from 'react';
+
 import { _t } from "../../../languageHandler";
 import { replaceableComponent } from "../../../utils/replaceableComponent";
 import BaseDialog from "./BaseDialog";

src/components/views/dialogs/CreateCommunityPrototypeDialog.tsx

@@ -15,6 +15,8 @@ limitations under the License.
 */
 
 import React, { ChangeEvent } from 'react';
+import { logger } from "matrix-js-sdk/src/logger";
+
 import BaseDialog from "./BaseDialog";
 import { _t } from "../../../languageHandler";
 import { IDialogProps } from "./IDialogProps";
@@ -28,8 +30,6 @@ import { showCommunityRoomInviteDialog } from "../../../RoomInvite";
 import GroupStore from "../../../stores/GroupStore";
 import { replaceableComponent } from "../../../utils/replaceableComponent";
 
-import { logger } from "matrix-js-sdk/src/logger";
-
 interface IProps extends IDialogProps {
 }
 

src/components/views/dialogs/CreateGroupDialog.tsx

@@ -15,6 +15,7 @@ limitations under the License.
 */
 
 import React from 'react';
+
 import dis from '../../../dispatcher/dispatcher';
 import { _t } from '../../../languageHandler';
 import { MatrixClientPeg } from '../../../MatrixClientPeg';

src/components/views/dialogs/CreateSpaceFromCommunityDialog.tsx

@@ -18,6 +18,7 @@ import React, { useEffect, useRef, useState } from "react";
 import { JoinRule } from "matrix-js-sdk/src/@types/partials";
 import { EventType } from "matrix-js-sdk/src/@types/event";
 import { MatrixClient } from "matrix-js-sdk/src/matrix";
+import { logger } from "matrix-js-sdk/src/logger";
 
 import { _t } from '../../../languageHandler';
 import BaseDialog from "./BaseDialog";
@@ -42,8 +43,6 @@ import TagOrderActions from "../../../actions/TagOrderActions";
 import { inviteUsersToRoom } from "../../../RoomInvite";
 import ProgressBar from "../elements/ProgressBar";
 
-import { logger } from "matrix-js-sdk/src/logger";
-
 interface IProps {
     matrixClient: MatrixClient;
     groupId: string;

src/components/views/dialogs/CreateSubspaceDialog.tsx

@@ -17,6 +17,7 @@ limitations under the License.
 import React, { useRef, useState } from "react";
 import { Room } from "matrix-js-sdk/src/models/room";
 import { JoinRule } from "matrix-js-sdk/src/@types/partials";
+import { logger } from "matrix-js-sdk/src/logger";
 
 import { _t } from '../../../languageHandler';
 import BaseDialog from "./BaseDialog";
@@ -30,8 +31,6 @@ import { createSpace, SpaceCreateForm } from "../spaces/SpaceCreateMenu";
 import { SubspaceSelector } from "./AddExistingToSpaceDialog";
 import JoinRuleDropdown from "../elements/JoinRuleDropdown";
 
-import { logger } from "matrix-js-sdk/src/logger";
-
 interface IProps {
     space: Room;
     onAddExistingSpaceClick(): void;

src/components/views/dialogs/CryptoStoreTooNewDialog.tsx

@@ -16,6 +16,7 @@ limitations under the License.
 */
 
 import React from 'react';
+
 import dis from '../../../dispatcher/dispatcher';
 import { _t } from '../../../languageHandler';
 import SdkConfig from '../../../SdkConfig';

src/components/views/dialogs/DeactivateAccountDialog.tsx

@@ -17,6 +17,7 @@ limitations under the License.
 
 import React from 'react';
 import { AuthType, IAuthData } from 'matrix-js-sdk/src/interactive-auth';
+import { logger } from "matrix-js-sdk/src/logger";
 
 import Analytics from '../../../Analytics';
 import { MatrixClientPeg } from '../../../MatrixClientPeg';
@@ -28,8 +29,6 @@ import StyledCheckbox from "../elements/StyledCheckbox";
 import { replaceableComponent } from "../../../utils/replaceableComponent";
 import BaseDialog from "./BaseDialog";
 
-import { logger } from "matrix-js-sdk/src/logger";
-
 interface IProps {
     onFinished: (success: boolean) => void;
 }

src/components/views/dialogs/DevtoolsDialog.tsx

@@ -16,12 +16,6 @@ limitations under the License.
 */
 
 import React, { useState, useEffect, ChangeEvent, MouseEvent } from 'react';
-import SyntaxHighlight from '../elements/SyntaxHighlight';
-import { _t } from '../../../languageHandler';
-import Field from "../elements/Field";
-import MatrixClientContext from "../../../contexts/MatrixClientContext";
-import { useEventEmitter } from "../../../hooks/useEventEmitter";
-
 import {
     PHASE_UNSENT,
     PHASE_REQUESTED,
@@ -31,6 +25,15 @@ import {
     PHASE_CANCELLED,
     VerificationRequest,
 } from "matrix-js-sdk/src/crypto/verification/request/VerificationRequest";
+import { Room } from "matrix-js-sdk/src/models/room";
+import { MatrixEvent } from "matrix-js-sdk/src/models/event";
+import { logger } from "matrix-js-sdk/src/logger";
+
+import SyntaxHighlight from '../elements/SyntaxHighlight';
+import { _t } from '../../../languageHandler';
+import Field from "../elements/Field";
+import MatrixClientContext from "../../../contexts/MatrixClientContext";
+import { useEventEmitter } from "../../../hooks/useEventEmitter";
 import WidgetStore, { IApp } from "../../../stores/WidgetStore";
 import { UPDATE_EVENT } from "../../../stores/AsyncStore";
 import { SETTINGS } from "../../../settings/Settings";
@@ -38,14 +41,10 @@ import SettingsStore, { LEVEL_ORDER } from "../../../settings/SettingsStore";
 import Modal from "../../../Modal";
 import ErrorDialog from "./ErrorDialog";
 import { replaceableComponent } from "../../../utils/replaceableComponent";
-import { Room } from "matrix-js-sdk/src/models/room";
-import { MatrixEvent } from "matrix-js-sdk/src/models/event";
 import { SettingLevel } from '../../../settings/SettingLevel';
 import BaseDialog from "./BaseDialog";
 import TruncatedList from "../elements/TruncatedList";
 
-import { logger } from "matrix-js-sdk/src/logger";
-
 interface IGenericEditorProps {
     onBack: () => void;
 }

src/components/views/dialogs/EditCommunityPrototypeDialog.tsx

@@ -15,6 +15,8 @@ limitations under the License.
 */
 
 import React, { ChangeEvent } from 'react';
+import { logger } from "matrix-js-sdk/src/logger";
+
 import BaseDialog from "./BaseDialog";
 import { _t } from "../../../languageHandler";
 import { IDialogProps } from "./IDialogProps";
@@ -26,8 +28,6 @@ import FlairStore from "../../../stores/FlairStore";
 import { replaceableComponent } from "../../../utils/replaceableComponent";
 import { mediaFromMxc } from "../../../customisations/Media";
 
-import { logger } from "matrix-js-sdk/src/logger";
-
 interface IProps extends IDialogProps {
     communityId: string;
 }

src/components/views/dialogs/ErrorDialog.tsx

@@ -26,6 +26,7 @@ limitations under the License.
  */
 
 import React from 'react';
+
 import { _t } from '../../../languageHandler';
 import { replaceableComponent } from "../../../utils/replaceableComponent";
 import BaseDialog from "./BaseDialog";

src/components/views/dialogs/ExportDialog.tsx

@@ -16,6 +16,8 @@ limitations under the License.
 
 import React, { useRef, useState } from "react";
 import { Room } from "matrix-js-sdk/src";
+import { logger } from "matrix-js-sdk/src/logger";
+
 import { _t } from "../../../languageHandler";
 import { IDialogProps } from "./IDialogProps";
 import BaseDialog from "./BaseDialog";
@@ -38,8 +40,6 @@ import Exporter from "../../../utils/exportUtils/Exporter";
 import Spinner from "../elements/Spinner";
 import InfoDialog from "./InfoDialog";
 
-import { logger } from "matrix-js-sdk/src/logger";
-
 interface IProps extends IDialogProps {
     room: Room;
 }

src/components/views/dialogs/FeedbackDialog.tsx

@@ -15,6 +15,7 @@ limitations under the License.
 */
 
 import React, { useEffect, useRef, useState } from 'react';
+
 import QuestionDialog from './QuestionDialog';
 import { _t } from '../../../languageHandler';
 import Field from "../elements/Field";

src/components/views/dialogs/HostSignupDialog.tsx

@@ -15,12 +15,14 @@ limitations under the License.
 */
 
 import React from "react";
+import classNames from "classnames";
+import { logger } from "matrix-js-sdk/src/logger";
+
 import AccessibleButton from "../elements/AccessibleButton";
 import Modal from "../../../Modal";
 import PersistedElement from "../elements/PersistedElement";
 import QuestionDialog from './QuestionDialog';
 import SdkConfig from "../../../SdkConfig";
-import classNames from "classnames";
 import { _t } from "../../../languageHandler";
 import { MatrixClientPeg } from "../../../MatrixClientPeg";
 import { HostSignupStore } from "../../../stores/HostSignupStore";
@@ -33,8 +35,6 @@ import {
 } from "./HostSignupDialogTypes";
 import { replaceableComponent } from "../../../utils/replaceableComponent";
 
-import { logger } from "matrix-js-sdk/src/logger";
-
 const HOST_SIGNUP_KEY = "host_signup";
 
 interface IProps {}

src/components/views/dialogs/IncomingSasDialog.tsx

@@ -15,6 +15,10 @@ limitations under the License.
 */
 
 import React from 'react';
+import { IGeneratedSas, ISasEvent } from "matrix-js-sdk/src/crypto/verification/SAS";
+import { VerificationBase } from "matrix-js-sdk/src/crypto/verification/Base";
+import { logger } from "matrix-js-sdk/src/logger";
+
 import { MatrixClientPeg } from '../../../MatrixClientPeg';
 import { _t } from '../../../languageHandler';
 import { replaceableComponent } from "../../../utils/replaceableComponent";
@@ -27,10 +31,6 @@ import VerificationShowSas from "../verification/VerificationShowSas";
 import BaseDialog from "./BaseDialog";
 import DialogButtons from "../elements/DialogButtons";
 import { IDialogProps } from "./IDialogProps";
-import { IGeneratedSas, ISasEvent } from "matrix-js-sdk/src/crypto/verification/SAS";
-import { VerificationBase } from "matrix-js-sdk/src/crypto/verification/Base";
-
-import { logger } from "matrix-js-sdk/src/logger";
 
 const PHASE_START = 0;
 const PHASE_SHOW_SAS = 1;

src/components/views/dialogs/IntegrationsDisabledDialog.tsx

@@ -15,6 +15,7 @@ limitations under the License.
 */
 
 import React from 'react';
+
 import { _t } from "../../../languageHandler";
 import dis from '../../../dispatcher/dispatcher';
 import { Action } from "../../../dispatcher/actions";

src/components/views/dialogs/IntegrationsImpossibleDialog.tsx

@@ -15,6 +15,7 @@ limitations under the License.
 */
 
 import React from 'react';
+
 import { _t } from "../../../languageHandler";
 import SdkConfig from "../../../SdkConfig";
 import { replaceableComponent } from "../../../utils/replaceableComponent";

src/components/views/dialogs/InteractiveAuthDialog.tsx

@@ -17,16 +17,15 @@ limitations under the License.
 */
 
 import React from 'react';
+import { MatrixClient } from "matrix-js-sdk/src/client";
+import { IAuthData } from "matrix-js-sdk/src/interactive-auth";
 
 import { _t } from '../../../languageHandler';
-
 import AccessibleButton from '../elements/AccessibleButton';
 import InteractiveAuth, { ERROR_USER_CANCELLED } from "../../structures/InteractiveAuth";
 import { SSOAuthEntry } from "../auth/InteractiveAuthEntryComponents";
 import { replaceableComponent } from "../../../utils/replaceableComponent";
-import { MatrixClient } from "matrix-js-sdk/src/client";
 import BaseDialog from "./BaseDialog";
-import { IAuthData } from "matrix-js-sdk/src/interactive-auth";
 import { IDialogProps } from "./IDialogProps";
 
 interface IDialogAesthetics {

src/components/views/dialogs/InviteDialog.tsx

@@ -16,12 +16,16 @@ limitations under the License.
 
 import React, { createRef } from 'react';
 import classNames from 'classnames';
+import { RoomMember } from "matrix-js-sdk/src/models/room-member";
+import { Room } from "matrix-js-sdk/src/models/room";
+import { MatrixCall } from 'matrix-js-sdk/src/webrtc/call';
+import { IInvite3PID } from "matrix-js-sdk/src/@types/requests";
+import { logger } from "matrix-js-sdk/src/logger";
 
 import { _t, _td } from "../../../languageHandler";
 import { MatrixClientPeg } from "../../../MatrixClientPeg";
 import { makeRoomPermalink, makeUserPermalink } from "../../../utils/permalinks/Permalinks";
 import DMRoomMap from "../../../utils/DMRoomMap";
-import { RoomMember } from "matrix-js-sdk/src/models/room-member";
 import SdkConfig from "../../../SdkConfig";
 import * as Email from "../../../email";
 import { getDefaultIdentityServerUrl, useDefaultIdentityServer } from "../../../utils/IdentityServerUtils";
@@ -49,17 +53,13 @@ import { CommunityPrototypeStore } from "../../../stores/CommunityPrototypeStore
 import SettingsStore from "../../../settings/SettingsStore";
 import { UIFeature } from "../../../settings/UIFeature";
 import CountlyAnalytics from "../../../CountlyAnalytics";
-import { Room } from "matrix-js-sdk/src/models/room";
-import { MatrixCall } from 'matrix-js-sdk/src/webrtc/call';
 import { replaceableComponent } from "../../../utils/replaceableComponent";
 import { mediaFromMxc } from "../../../customisations/Media";
 import { getAddressType } from "../../../UserAddress";
 import BaseAvatar from '../avatars/BaseAvatar';
 import AccessibleButton, { ButtonEvent } from '../elements/AccessibleButton';
-import { compare } from '../../../utils/strings';
-import { IInvite3PID } from "matrix-js-sdk/src/@types/requests";
+import { compare, copyPlaintext, selectText } from '../../../utils/strings';
 import AccessibleTooltipButton from "../elements/AccessibleTooltipButton";
-import { copyPlaintext, selectText } from "../../../utils/strings";
 import * as ContextMenu from "../../structures/ContextMenu";
 import { toRightOf } from "../../structures/ContextMenu";
 import GenericTextContextMenu from "../context_menus/GenericTextContextMenu";
@@ -73,8 +73,6 @@ import DialPadBackspaceButton from "../elements/DialPadBackspaceButton";
 import SpaceStore from "../../../stores/spaces/SpaceStore";
 import CallHandler from "../../../CallHandler";
 
-import { logger } from "matrix-js-sdk/src/logger";
-
 // we have a number of types defined from the Matrix spec which can't reasonably be altered here.
 /* eslint-disable camelcase */
 

src/components/views/dialogs/KeySignatureUploadFailedDialog.tsx

@@ -15,6 +15,7 @@ limitations under the License.
 */
 
 import React, { useState, useCallback, useRef } from 'react';
+
 import { _t } from '../../../languageHandler';
 import SdkConfig from '../../../SdkConfig';
 import BaseDialog from "./BaseDialog";

src/components/views/dialogs/LazyLoadingDisabledDialog.tsx

@@ -16,6 +16,7 @@ limitations under the License.
 */
 
 import React from 'react';
+
 import QuestionDialog from './QuestionDialog';
 import { _t } from '../../../languageHandler';
 import SdkConfig from '../../../SdkConfig';

src/components/views/dialogs/LazyLoadingResyncDialog.tsx

@@ -16,6 +16,7 @@ limitations under the License.
 */
 
 import React from 'react';
+
 import QuestionDialog from './QuestionDialog';
 import { _t } from '../../../languageHandler';
 import SdkConfig from '../../../SdkConfig';

src/components/views/dialogs/LogoutDialog.tsx

@@ -17,14 +17,14 @@ limitations under the License.
 
 import React, { ComponentType } from 'react';
 import { IKeyBackupInfo } from "matrix-js-sdk/src/crypto/keybackup";
+import { logger } from "matrix-js-sdk/src/logger";
+
 import Modal from '../../../Modal';
 import dis from '../../../dispatcher/dispatcher';
 import { _t } from '../../../languageHandler';
 import { MatrixClientPeg } from '../../../MatrixClientPeg';
 import RestoreKeyBackupDialog from './security/RestoreKeyBackupDialog';
 import { replaceableComponent } from "../../../utils/replaceableComponent";
-
-import { logger } from "matrix-js-sdk/src/logger";
 import QuestionDialog from "./QuestionDialog";
 import BaseDialog from "./BaseDialog";
 import Spinner from "../elements/Spinner";

src/components/views/dialogs/ManualDeviceKeyVerificationDialog.tsx

@@ -19,12 +19,13 @@ limitations under the License.
 */
 
 import React from 'react';
+import { DeviceInfo } from "matrix-js-sdk/src/crypto/deviceinfo";
+
 import { MatrixClientPeg } from '../../../MatrixClientPeg';
 import * as FormattingUtils from '../../../utils/FormattingUtils';
 import { _t } from '../../../languageHandler';
 import { replaceableComponent } from "../../../utils/replaceableComponent";
 import QuestionDialog from "./QuestionDialog";
-import { DeviceInfo } from "matrix-js-sdk/src/crypto/deviceinfo";
 import { IDialogProps } from "./IDialogProps";
 
 interface IProps extends IDialogProps {

src/components/views/dialogs/MessageEditHistoryDialog.tsx

@@ -15,22 +15,22 @@ limitations under the License.
 */
 
 import React from 'react';
+import { MatrixEvent } from "matrix-js-sdk/src/models/event";
+import { EventType, RelationType } from "matrix-js-sdk/src/@types/event";
+import { defer } from "matrix-js-sdk/src/utils";
+import { logger } from "matrix-js-sdk/src/logger";
+
 import { MatrixClientPeg } from "../../../MatrixClientPeg";
 import { _t } from '../../../languageHandler';
 import { wantsDateSeparator } from '../../../DateUtils';
 import SettingsStore from '../../../settings/SettingsStore';
 import { replaceableComponent } from "../../../utils/replaceableComponent";
-import { MatrixEvent } from "matrix-js-sdk/src/models/event";
 import BaseDialog from "./BaseDialog";
 import ScrollPanel from "../../structures/ScrollPanel";
 import Spinner from "../elements/Spinner";
 import EditHistoryMessage from "../messages/EditHistoryMessage";
 import DateSeparator from "../messages/DateSeparator";
 import { IDialogProps } from "./IDialogProps";
-import { EventType, RelationType } from "matrix-js-sdk/src/@types/event";
-import { defer } from "matrix-js-sdk/src/utils";
-
-import { logger } from "matrix-js-sdk/src/logger";
 
 interface IProps extends IDialogProps {
     mxEvent: MatrixEvent;

src/components/views/dialogs/ModalWidgetDialog.tsx

@@ -15,9 +15,6 @@ limitations under the License.
 */
 
 import * as React from 'react';
-import BaseDialog from './BaseDialog';
-import { _t, getUserLanguage } from '../../../languageHandler';
-import AccessibleButton from "../elements/AccessibleButton";
 import {
     ClientWidgetApi,
     IModalWidgetCloseRequest,
@@ -33,6 +30,10 @@ import {
     WidgetApiFromWidgetAction,
     WidgetKind,
 } from "matrix-widget-api";
+
+import BaseDialog from './BaseDialog';
+import { _t, getUserLanguage } from '../../../languageHandler';
+import AccessibleButton from "../elements/AccessibleButton";
 import { StopGapWidgetDriver } from "../../../stores/widgets/StopGapWidgetDriver";
 import { MatrixClientPeg } from "../../../MatrixClientPeg";
 import { OwnProfileStore } from "../../../stores/OwnProfileStore";

src/components/views/dialogs/RegistrationEmailPromptDialog.tsx

@@ -15,10 +15,10 @@ limitations under the License.
 */
 
 import * as React from "react";
+import { useRef, useState } from "react";
 
 import { _t, _td } from '../../../languageHandler';
 import { IDialogProps } from "./IDialogProps";
-import { useRef, useState } from "react";
 import Field from "../elements/Field";
 import CountlyAnalytics from "../../../CountlyAnalytics";
 import BaseDialog from "./BaseDialog";

src/components/views/dialogs/ReportEventDialog.tsx

@@ -15,10 +15,11 @@ limitations under the License.
 */
 
 import React from 'react';
+import { MatrixEvent } from "matrix-js-sdk/src/models/event";
+
 import { _t } from '../../../languageHandler';
 import { ensureDMExists } from "../../../createRoom";
 import { IDialogProps } from "./IDialogProps";
-import { MatrixEvent } from "matrix-js-sdk/src/models/event";
 import { MatrixClientPeg } from "../../../MatrixClientPeg";
 import SdkConfig from '../../../SdkConfig';
 import Markdown from '../../../Markdown';

src/components/views/dialogs/RoomSettingsDialog.tsx

@@ -16,6 +16,7 @@ limitations under the License.
 */
 
 import React from 'react';
+
 import TabbedView, { Tab } from "../../structures/TabbedView";
 import { _t, _td } from "../../../languageHandler";
 import AdvancedRoomSettingsTab from "../settings/tabs/room/AdvancedRoomSettingsTab";

src/components/views/dialogs/ScrollableBaseModal.tsx

@@ -16,11 +16,12 @@ limitations under the License.
 
 import React, { FormEvent } from "react";
 import { MatrixClient } from "matrix-js-sdk/src/client";
+import FocusLock from "react-focus-lock";
+
 import { MatrixClientPeg } from "../../../MatrixClientPeg";
 import { Key } from "../../../Keyboard";
 import { IDialogProps } from "./IDialogProps";
 import MatrixClientContext from "../../../contexts/MatrixClientContext";
-import FocusLock from "react-focus-lock";
 import { _t } from "../../../languageHandler";
 import AccessibleButton from "../elements/AccessibleButton";
 

src/components/views/dialogs/ServerOfflineDialog.tsx

@@ -15,6 +15,7 @@ limitations under the License.
 */
 
 import * as React from 'react';
+
 import BaseDialog from './BaseDialog';
 import { _t } from '../../../languageHandler';
 import { EchoStore } from "../../../stores/local-echo/EchoStore";

src/components/views/dialogs/ServerPickerDialog.tsx

@@ -16,6 +16,7 @@ limitations under the License.
 
 import React, { createRef } from "react";
 import { AutoDiscovery } from "matrix-js-sdk/src/autodiscovery";
+import { logger } from "matrix-js-sdk/src/logger";
 
 import AutoDiscoveryUtils, { ValidatedServerConfig } from "../../../utils/AutoDiscoveryUtils";
 import BaseDialog from './BaseDialog';
@@ -28,8 +29,6 @@ import TextWithTooltip from "../elements/TextWithTooltip";
 import withValidation, { IFieldState } from "../elements/Validation";
 import { replaceableComponent } from "../../../utils/replaceableComponent";
 
-import { logger } from "matrix-js-sdk/src/logger";
-
 interface IProps {
     title?: string;
     serverConfig: ValidatedServerConfig;

src/components/views/dialogs/SeshatResetDialog.tsx

@@ -15,12 +15,11 @@ limitations under the License.
 */
 
 import React from 'react';
+
 import { _t } from "../../../languageHandler";
 import { replaceableComponent } from "../../../utils/replaceableComponent";
-
 import BaseDialog from "./BaseDialog";
 import DialogButtons from "../elements/DialogButtons";
-
 import { IDialogProps } from "./IDialogProps";
 
 @replaceableComponent("views.dialogs.SeshatResetDialog")

src/components/views/dialogs/SessionRestoreErrorDialog.tsx

@@ -17,6 +17,7 @@ limitations under the License.
 */
 
 import React from 'react';
+
 import SdkConfig from '../../../SdkConfig';
 import Modal from '../../../Modal';
 import { _t } from '../../../languageHandler';

src/components/views/dialogs/SetEmailDialog.tsx

@@ -16,6 +16,8 @@ limitations under the License.
 */
 
 import React from 'react';
+import { logger } from "matrix-js-sdk/src/logger";
+
 import * as Email from '../../../email';
 import AddThreepid from '../../../AddThreepid';
 import { _t } from '../../../languageHandler';
@@ -28,8 +30,6 @@ import BaseDialog from "./BaseDialog";
 import EditableText from "../elements/EditableText";
 import { IDialogProps } from "./IDialogProps";
 
-import { logger } from "matrix-js-sdk/src/logger";
-
 interface IProps extends IDialogProps {
     title: string;
 }

src/components/views/dialogs/ShareDialog.tsx

@@ -22,6 +22,7 @@ import { User } from "matrix-js-sdk/src/models/user";
 import { Group } from "matrix-js-sdk/src/models/group";
 import { RoomMember } from "matrix-js-sdk/src/models/room-member";
 import { MatrixEvent } from "matrix-js-sdk/src/models/event";
+
 import { _t } from '../../../languageHandler';
 import QRCode from "../elements/QRCode";
 import { RoomPermalinkCreator, makeGroupPermalink, makeUserPermalink } from "../../../utils/permalinks/Permalinks";

src/components/views/dialogs/SlashCommandHelpDialog.tsx

@@ -15,6 +15,7 @@ limitations under the License.
 */
 
 import React from 'react';
+
 import { _t } from "../../../languageHandler";
 import { CommandCategories, Commands } from "../../../SlashCommands";
 import { IDialogProps } from "./IDialogProps";

src/components/views/dialogs/StorageEvictedDialog.tsx

@@ -15,6 +15,7 @@ limitations under the License.
 */
 
 import React from 'react';
+
 import SdkConfig from '../../../SdkConfig';
 import Modal from '../../../Modal';
 import { _t } from '../../../languageHandler';

src/components/views/dialogs/TabbedIntegrationManagerDialog.tsx

@@ -15,10 +15,12 @@ limitations under the License.
 */
 
 import React from 'react';
-import { IntegrationManagers } from "../../../integrations/IntegrationManagers";
 import { Room } from "matrix-js-sdk/src/models/room";
-import { dialogTermsInteractionCallback, TermsNotSignedError } from "../../../Terms";
 import classNames from 'classnames';
+import { logger } from "matrix-js-sdk/src/logger";
+
+import { IntegrationManagers } from "../../../integrations/IntegrationManagers";
+import { dialogTermsInteractionCallback, TermsNotSignedError } from "../../../Terms";
 import * as ScalarMessaging from "../../../ScalarMessaging";
 import { replaceableComponent } from "../../../utils/replaceableComponent";
 import { IntegrationManagerInstance } from "../../../integrations/IntegrationManagerInstance";
@@ -27,8 +29,6 @@ import AccessibleButton from "../elements/AccessibleButton";
 import IntegrationManager from "../settings/IntegrationManager";
 import { IDialogProps } from "./IDialogProps";
 
-import { logger } from "matrix-js-sdk/src/logger";
-
 interface IProps extends IDialogProps {
     /**
      * Optional room where the integration manager should be open to

src/components/views/dialogs/TermsDialog.tsx

@@ -16,10 +16,10 @@ limitations under the License.
 
 import url from 'url';
 import React from 'react';
-import { _t, pickBestLanguage } from '../../../languageHandler';
-
-import { replaceableComponent } from "../../../utils/replaceableComponent";
 import { SERVICE_TYPES } from "matrix-js-sdk/src/service-types";
+
+import { _t, pickBestLanguage } from '../../../languageHandler';
+import { replaceableComponent } from "../../../utils/replaceableComponent";
 import DialogButtons from "../elements/DialogButtons";
 import BaseDialog from "./BaseDialog";
 

src/components/views/dialogs/TextInputDialog.tsx

@@ -15,6 +15,7 @@ limitations under the License.
 */
 
 import React, { ChangeEvent, createRef } from 'react';
+
 import Field from "../elements/Field";
 import { _t, _td } from '../../../languageHandler';
 import { replaceableComponent } from "../../../utils/replaceableComponent";

src/components/views/dialogs/UploadConfirmDialog.tsx

@@ -16,8 +16,9 @@ limitations under the License.
 */
 
 import React from 'react';
-import { _t } from '../../../languageHandler';
 import filesize from "filesize";
+
+import { _t } from '../../../languageHandler';
 import { replaceableComponent } from "../../../utils/replaceableComponent";
 import { getBlobSafeMimeType } from '../../../utils/blobs';
 import BaseDialog from "./BaseDialog";

src/components/views/dialogs/UploadFailureDialog.tsx

@@ -15,8 +15,8 @@ limitations under the License.
 */
 
 import filesize from 'filesize';
-
 import React from 'react';
+
 import { _t } from '../../../languageHandler';
 import ContentMessages from '../../../ContentMessages';
 import { replaceableComponent } from "../../../utils/replaceableComponent";

src/components/views/dialogs/UserSettingsDialog.tsx

@@ -16,6 +16,7 @@ limitations under the License.
 */
 
 import React from 'react';
+
 import TabbedView, { Tab } from "../../structures/TabbedView";
 import { _t, _td } from "../../../languageHandler";
 import GeneralUserSettingsTab from "../settings/tabs/user/GeneralUserSettingsTab";

src/components/views/dialogs/VerificationRequestDialog.tsx

@@ -15,13 +15,14 @@ limitations under the License.
 */
 
 import React from 'react';
+import { VerificationRequest } from "matrix-js-sdk/src/crypto/verification/request/VerificationRequest";
+import { User } from 'matrix-js-sdk/src/models/user';
+
 import { MatrixClientPeg } from '../../../MatrixClientPeg';
 import { _t } from '../../../languageHandler';
 import { replaceableComponent } from "../../../utils/replaceableComponent";
-import { VerificationRequest } from "matrix-js-sdk/src/crypto/verification/request/VerificationRequest";
 import BaseDialog from "./BaseDialog";
 import EncryptionPanel from "../right_panel/EncryptionPanel";
-import { User } from 'matrix-js-sdk/src/models/user';
 
 interface IProps {
     verificationRequest: VerificationRequest;

src/components/views/dialogs/WidgetCapabilitiesPromptDialog.tsx

@@ -15,9 +15,6 @@ limitations under the License.
 */
 
 import React from 'react';
-import BaseDialog from "./BaseDialog";
-import { _t } from "../../../languageHandler";
-import { IDialogProps } from "./IDialogProps";
 import {
     Capability,
     isTimelineCapability,
@@ -25,13 +22,17 @@ import {
     WidgetEventCapability,
     WidgetKind,
 } from "matrix-widget-api";
+import { lexicographicCompare } from "matrix-js-sdk/src/utils";
+
+import BaseDialog from "./BaseDialog";
+import { _t } from "../../../languageHandler";
+import { IDialogProps } from "./IDialogProps";
 import { objectShallowClone } from "../../../utils/objects";
 import StyledCheckbox from "../elements/StyledCheckbox";
 import DialogButtons from "../elements/DialogButtons";
 import LabelledToggleSwitch from "../elements/LabelledToggleSwitch";
 import { CapabilityText } from "../../../widgets/CapabilityText";
 import { replaceableComponent } from "../../../utils/replaceableComponent";
-import { lexicographicCompare } from "matrix-js-sdk/src/utils";
 
 interface IProps extends IDialogProps {
     requestedCapabilities: Set<Capability>;

src/components/views/dialogs/WidgetOpenIDPermissionsDialog.tsx

@@ -16,17 +16,17 @@ limitations under the License.
 */
 
 import React from 'react';
+import { Widget, WidgetKind } from "matrix-widget-api";
+import { logger } from "matrix-js-sdk/src/logger";
+
 import { _t } from "../../../languageHandler";
 import LabelledToggleSwitch from "../elements/LabelledToggleSwitch";
-import { Widget, WidgetKind } from "matrix-widget-api";
 import { OIDCState, WidgetPermissionStore } from "../../../stores/widgets/WidgetPermissionStore";
 import { replaceableComponent } from "../../../utils/replaceableComponent";
 import { IDialogProps } from "./IDialogProps";
 import BaseDialog from "./BaseDialog";
 import DialogButtons from "../elements/DialogButtons";
 
-import { logger } from "matrix-js-sdk/src/logger";
-
 interface IProps extends IDialogProps {
     widget: Widget;
     widgetKind: WidgetKind;

src/components/views/dialogs/security/AccessSecretStorageDialog.tsx

@@ -18,6 +18,7 @@ import { debounce } from "lodash";
 import classNames from 'classnames';
 import React, { ChangeEvent, FormEvent } from 'react';
 import { ISecretStorageKeyInfo } from "matrix-js-sdk/src/crypto/api";
+import { logger } from "matrix-js-sdk/src/logger";
 
 import * as sdk from '../../../../index';
 import { MatrixClientPeg } from '../../../../MatrixClientPeg';
@@ -28,8 +29,6 @@ import { IDialogProps } from "../IDialogProps";
 import { accessSecretStorage } from "../../../../SecurityManager";
 import Modal from "../../../../Modal";
 
-import { logger } from "matrix-js-sdk/src/logger";
-
 // Maximum acceptable size of a key file. It's 59 characters including the spaces we encode,
 // so this should be plenty and allow for people putting extra whitespace in the file because
 // maybe that's a thing people would do?

src/components/views/dialogs/security/ConfirmDestroyCrossSigningDialog.tsx

@@ -15,6 +15,7 @@ limitations under the License.
 */
 
 import React from 'react';
+
 import { _t } from "../../../../languageHandler";
 import { replaceableComponent } from "../../../../utils/replaceableComponent";
 import BaseDialog from "../BaseDialog";

src/components/views/dialogs/security/CreateCrossSigningDialog.tsx

@@ -17,6 +17,7 @@ limitations under the License.
 
 import React from 'react';
 import { CrossSigningKeys } from 'matrix-js-sdk/src/client';
+import { logger } from "matrix-js-sdk/src/logger";
 
 import { MatrixClientPeg } from '../../../../MatrixClientPeg';
 import { _t } from '../../../../languageHandler';
@@ -28,8 +29,6 @@ import Spinner from '../../elements/Spinner';
 import InteractiveAuthDialog from '../InteractiveAuthDialog';
 import { replaceableComponent } from "../../../../utils/replaceableComponent";
 
-import { logger } from "matrix-js-sdk/src/logger";
-
 interface IProps {
     accountPassword?: string;
     tokenLogin?: boolean;

src/components/views/dialogs/security/RestoreKeyBackupDialog.tsx

@@ -16,15 +16,16 @@ limitations under the License.
 */
 
 import React from 'react';
-import { MatrixClientPeg } from '../../../../MatrixClientPeg';
 import { MatrixClient } from 'matrix-js-sdk/src/client';
-import { _t } from '../../../../languageHandler';
-import { accessSecretStorage } from '../../../../SecurityManager';
 import { IKeyBackupInfo, IKeyBackupRestoreResult } from "matrix-js-sdk/src/crypto/keybackup";
 import { ISecretStorageKeyInfo } from "matrix-js-sdk/src/crypto/api";
+import { logger } from "matrix-js-sdk/src/logger";
+
+import { MatrixClientPeg } from '../../../../MatrixClientPeg';
+import { _t } from '../../../../languageHandler';
+import { accessSecretStorage } from '../../../../SecurityManager';
 import * as sdk from '../../../../index';
 import { IDialogProps } from "../IDialogProps";
-import { logger } from "matrix-js-sdk/src/logger";
 
 enum RestoreType {
     Passphrase = "passphrase",

src/components/views/dialogs/security/SetupEncryptionDialog.tsx

@@ -15,6 +15,7 @@ limitations under the License.
 */
 
 import React from 'react';
+
 import SetupEncryptionBody from '../../../structures/auth/SetupEncryptionBody';
 import BaseDialog from '../BaseDialog';
 import { _t } from '../../../../languageHandler';