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

src/components/views/settings/AvatarSetting.tsx

@@ -15,9 +15,10 @@ limitations under the License.
 */
 
 import React, { useState } from "react";
+import classNames from "classnames";
+
 import { _t } from "../../../languageHandler";
 import AccessibleButton from "../elements/AccessibleButton";
-import classNames from "classnames";
 
 interface IProps {
     avatarUrl?: string;

src/components/views/settings/BridgeTile.tsx

@@ -16,19 +16,19 @@ limitations under the License.
 
 import React from 'react';
 import PropTypes from 'prop-types';
+import { MatrixEvent } from "matrix-js-sdk/src/models/event";
+import { Room } from "matrix-js-sdk/src/models/room";
+import { logger } from "matrix-js-sdk/src/logger";
+
 import { _t } from "../../../languageHandler";
 import Pill from "../elements/Pill";
 import { makeUserPermalink } from "../../../utils/permalinks/Permalinks";
 import BaseAvatar from "../avatars/BaseAvatar";
 import SettingsStore from "../../../settings/SettingsStore";
-import { MatrixEvent } from "matrix-js-sdk/src/models/event";
-import { Room } from "matrix-js-sdk/src/models/room";
 import { isUrlPermitted } from '../../../HtmlUtils';
 import { replaceableComponent } from "../../../utils/replaceableComponent";
 import { mediaFromMxc } from "../../../customisations/Media";
 
-import { logger } from "matrix-js-sdk/src/logger";
-
 interface IProps {
     ev: MatrixEvent;
     room: Room;

src/components/views/settings/ChangeAvatar.tsx

@@ -17,6 +17,7 @@ limitations under the License.
 import React from 'react';
 import { MatrixEvent } from 'matrix-js-sdk/src/models/event';
 import { Room } from 'matrix-js-sdk/src/models/room';
+
 import { MatrixClientPeg } from "../../../MatrixClientPeg";
 import { _t } from '../../../languageHandler';
 import Spinner from '../elements/Spinner';

src/components/views/settings/ChangeDisplayName.tsx

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

src/components/views/settings/ChangePassword.tsx

@@ -15,8 +15,10 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import Field from "../elements/Field";
 import React, { ComponentType } from 'react';
+import { MatrixClient } from "matrix-js-sdk/src/client";
+
+import Field from "../elements/Field";
 import { MatrixClientPeg } from "../../../MatrixClientPeg";
 import AccessibleButton from '../elements/AccessibleButton';
 import Spinner from '../elements/Spinner';
@@ -27,7 +29,6 @@ import PassphraseField from "../auth/PassphraseField";
 import CountlyAnalytics from "../../../CountlyAnalytics";
 import { replaceableComponent } from "../../../utils/replaceableComponent";
 import { PASSWORD_MIN_SCORE } from '../auth/RegistrationForm';
-import { MatrixClient } from "matrix-js-sdk/src/client";
 import SetEmailDialog from "../dialogs/SetEmailDialog";
 import QuestionDialog from "../dialogs/QuestionDialog";
 

src/components/views/settings/CrossSigningPanel.tsx

@@ -15,6 +15,8 @@ limitations under the License.
 */
 
 import React from 'react';
+import { MatrixEvent } from 'matrix-js-sdk/src';
+import { logger } from "matrix-js-sdk/src/logger";
 
 import { MatrixClientPeg } from '../../../MatrixClientPeg';
 import { _t } from '../../../languageHandler';
@@ -23,11 +25,8 @@ import Spinner from '../elements/Spinner';
 import InteractiveAuthDialog from '../dialogs/InteractiveAuthDialog';
 import ConfirmDestroyCrossSigningDialog from '../dialogs/security/ConfirmDestroyCrossSigningDialog';
 import { replaceableComponent } from "../../../utils/replaceableComponent";
-import { MatrixEvent } from 'matrix-js-sdk/src';
 import SetupEncryptionDialog from '../dialogs/security/SetupEncryptionDialog';
 import { accessSecretStorage } from '../../../SecurityManager';
-
-import { logger } from "matrix-js-sdk/src/logger";
 import AccessibleButton from "../elements/AccessibleButton";
 
 interface IState {

src/components/views/settings/DevicesPanel.tsx

@@ -17,6 +17,8 @@ limitations under the License.
 import React from 'react';
 import classNames from 'classnames';
 import { IMyDevice } from "matrix-js-sdk/src/client";
+import { logger } from "matrix-js-sdk/src/logger";
+import { CrossSigningInfo } from "matrix-js-sdk/src/crypto/CrossSigning";
 
 import { MatrixClientPeg } from '../../../MatrixClientPeg';
 import { _t } from '../../../languageHandler';
@@ -27,9 +29,6 @@ import InteractiveAuthDialog from "../dialogs/InteractiveAuthDialog";
 import DevicesPanelEntry from "./DevicesPanelEntry";
 import Spinner from "../elements/Spinner";
 import AccessibleButton from "../elements/AccessibleButton";
-import { CrossSigningInfo } from "matrix-js-sdk/src/crypto/CrossSigning";
-
-import { logger } from "matrix-js-sdk/src/logger";
 
 interface IProps {
     className?: string;

src/components/views/settings/DevicesPanelEntry.tsx

@@ -16,6 +16,7 @@ limitations under the License.
 
 import React from 'react';
 import { IMyDevice } from 'matrix-js-sdk/src/client';
+import { logger } from "matrix-js-sdk/src/logger";
 
 import { _t } from '../../../languageHandler';
 import { MatrixClientPeg } from '../../../MatrixClientPeg';
@@ -31,8 +32,6 @@ import SetupEncryptionDialog from '../dialogs/security/SetupEncryptionDialog';
 import VerificationRequestDialog from '../../views/dialogs/VerificationRequestDialog';
 import LogoutDialog from '../dialogs/LogoutDialog';
 
-import { logger } from "matrix-js-sdk/src/logger";
-
 interface IProps {
     device: IMyDevice;
     isOwnDevice: boolean;

src/components/views/settings/FontScalingPanel.tsx

@@ -14,9 +14,10 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
+import React, { ChangeEvent } from 'react';
+
 import EventTilePreview from '../elements/EventTilePreview';
 import Field from '../elements/Field';
-import React, { ChangeEvent } from 'react';
 import SettingsFlag from '../elements/SettingsFlag';
 import SettingsStore from "../../../settings/SettingsStore";
 import Slider from "../elements/Slider";

src/components/views/settings/ImageSizePanel.tsx

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

src/components/views/settings/IntegrationManager.tsx

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

src/components/views/settings/LayoutSwitcher.tsx

@@ -18,6 +18,7 @@ limitations under the License.
 
 import React from "react";
 import classNames from "classnames";
+
 import SettingsStore from "../../../settings/SettingsStore";
 import EventTilePreview from "../elements/EventTilePreview";
 import StyledRadioButton from "../elements/StyledRadioButton";

src/components/views/settings/Notifications.tsx

@@ -15,9 +15,12 @@ limitations under the License.
 */
 
 import React from "react";
+import { IAnnotatedPushRule, IPusher, PushRuleAction, PushRuleKind, RuleId } from "matrix-js-sdk/src/@types/PushRules";
+import { IThreepid, ThreepidMedium } from "matrix-js-sdk/src/@types/threepids";
+import { logger } from "matrix-js-sdk/src/logger";
+
 import Spinner from "../elements/Spinner";
 import { MatrixClientPeg } from "../../../MatrixClientPeg";
-import { IAnnotatedPushRule, IPusher, PushRuleAction, PushRuleKind, RuleId } from "matrix-js-sdk/src/@types/PushRules";
 import {
     ContentRules,
     IContentRules,
@@ -26,7 +29,6 @@ import {
     VectorState,
 } from "../../../notifications";
 import { _t, TranslatedString } from "../../../languageHandler";
-import { IThreepid, ThreepidMedium } from "matrix-js-sdk/src/@types/threepids";
 import LabelledToggleSwitch from "../elements/LabelledToggleSwitch";
 import SettingsStore from "../../../settings/SettingsStore";
 import StyledRadioButton from "../elements/StyledRadioButton";
@@ -39,8 +41,6 @@ import TagComposer from "../elements/TagComposer";
 import { objectClone } from "../../../utils/objects";
 import { arrayDiff } from "../../../utils/arrays";
 
-import { logger } from "matrix-js-sdk/src/logger";
-
 // TODO: this "view" component still has far too much application logic in it,
 // which should be factored out to other files.
 

src/components/views/settings/ProfileSettings.tsx

@@ -15,6 +15,8 @@ limitations under the License.
 */
 
 import React, { createRef } from 'react';
+import { logger } from "matrix-js-sdk/src/logger";
+
 import { _t } from "../../../languageHandler";
 import { MatrixClientPeg } from "../../../MatrixClientPeg";
 import Field from "../elements/Field";
@@ -27,9 +29,7 @@ import { mediaFromMxc } from "../../../customisations/Media";
 import AccessibleButton from '../elements/AccessibleButton';
 import AvatarSetting from './AvatarSetting';
 
-import { logger } from "matrix-js-sdk/src/logger";
 import ExternalLink from '../elements/ExternalLink';
-
 interface IState {
     userId?: string;
     originalDisplayName?: string;

src/components/views/settings/SecureBackupPanel.tsx

@@ -16,6 +16,9 @@ limitations under the License.
 */
 
 import React, { ComponentType } from 'react';
+import { IKeyBackupInfo } from "matrix-js-sdk/src/crypto/keybackup";
+import { TrustInfo } from "matrix-js-sdk/src/crypto/backup";
+import { logger } from "matrix-js-sdk/src/logger";
 
 import { MatrixClientPeg } from '../../../MatrixClientPeg';
 import { _t } from '../../../languageHandler';
@@ -27,8 +30,6 @@ import QuestionDialog from '../dialogs/QuestionDialog';
 import RestoreKeyBackupDialog from '../dialogs/security/RestoreKeyBackupDialog';
 import { accessSecretStorage } from '../../../SecurityManager';
 import { replaceableComponent } from "../../../utils/replaceableComponent";
-import { IKeyBackupInfo } from "matrix-js-sdk/src/crypto/keybackup";
-import { TrustInfo } from "matrix-js-sdk/src/crypto/backup";
 
 interface IState {
     loading: boolean;
@@ -43,8 +44,6 @@ interface IState {
     sessionsRemaining: number;
 }
 
-import { logger } from "matrix-js-sdk/src/logger";
-
 @replaceableComponent("views.settings.SecureBackupPanel")
 export default class SecureBackupPanel extends React.PureComponent<{}, IState> {
     private unmounted = false;

src/components/views/settings/SetIdServer.tsx

@@ -16,6 +16,8 @@ limitations under the License.
 
 import url from 'url';
 import React from 'react';
+import { logger } from "matrix-js-sdk/src/logger";
+
 import { _t } from "../../../languageHandler";
 import { MatrixClientPeg } from "../../../MatrixClientPeg";
 import Modal from '../../../Modal';
@@ -32,8 +34,6 @@ import AccessibleButton from '../elements/AccessibleButton';
 import Field from '../elements/Field';
 import QuestionDialog from "../dialogs/QuestionDialog";
 
-import { logger } from "matrix-js-sdk/src/logger";
-
 // We'll wait up to this long when checking for 3PID bindings on the IS.
 const REACHABILITY_TIMEOUT = 10000; // ms
 

src/components/views/settings/SetIntegrationManager.tsx

@@ -15,6 +15,8 @@ limitations under the License.
 */
 
 import React from 'react';
+import { logger } from "matrix-js-sdk/src/logger";
+
 import { _t } from "../../../languageHandler";
 import { IntegrationManagers } from "../../../integrations/IntegrationManagers";
 import { IntegrationManagerInstance } from "../../../integrations/IntegrationManagerInstance";
@@ -23,8 +25,6 @@ import { SettingLevel } from "../../../settings/SettingLevel";
 import { replaceableComponent } from "../../../utils/replaceableComponent";
 import ToggleSwitch from "../elements/ToggleSwitch";
 
-import { logger } from "matrix-js-sdk/src/logger";
-
 interface IProps {
 
 }

src/components/views/settings/SpellCheckSettings.tsx

@@ -15,6 +15,7 @@ limitations under the License.
 */
 
 import React from 'react';
+
 import SpellCheckLanguagesDropdown from "../../../components/views/elements/SpellCheckLanguagesDropdown";
 import AccessibleButton from "../../../components/views/elements/AccessibleButton";
 import { _t } from "../../../languageHandler";

src/components/views/settings/ThemeChoicePanel.tsx

@@ -15,6 +15,8 @@ limitations under the License.
 */
 
 import React from 'react';
+import { logger } from "matrix-js-sdk/src/logger";
+
 import { _t } from "../../../languageHandler";
 import SettingsStore from "../../../settings/SettingsStore";
 import { findHighContrastTheme, findNonHighContrastTheme, getOrderedThemes, isHighContrastTheme } from "../../../theme";
@@ -29,8 +31,6 @@ import StyledRadioGroup from "../elements/StyledRadioGroup";
 import { SettingLevel } from "../../../settings/SettingLevel";
 import { replaceableComponent } from "../../../utils/replaceableComponent";
 
-import { logger } from "matrix-js-sdk/src/logger";
-
 interface IProps {
 }
 

src/components/views/settings/account/EmailAddresses.tsx

@@ -16,6 +16,9 @@ limitations under the License.
 */
 
 import React from 'react';
+import { IThreepid, ThreepidMedium } from "matrix-js-sdk/src/@types/threepids";
+import { logger } from "matrix-js-sdk/src/logger";
+
 import { _t } from "../../../../languageHandler";
 import { MatrixClientPeg } from "../../../../MatrixClientPeg";
 import Field from "../../elements/Field";
@@ -25,9 +28,6 @@ import AddThreepid from "../../../../AddThreepid";
 import Modal from '../../../../Modal';
 import { replaceableComponent } from "../../../../utils/replaceableComponent";
 import ErrorDialog from "../../dialogs/ErrorDialog";
-import { IThreepid, ThreepidMedium } from "matrix-js-sdk/src/@types/threepids";
-
-import { logger } from "matrix-js-sdk/src/logger";
 
 /*
 TODO: Improve the UX for everything in here.

src/components/views/settings/account/PhoneNumbers.tsx

@@ -16,6 +16,9 @@ limitations under the License.
 */
 
 import React from 'react';
+import { IThreepid, ThreepidMedium } from "matrix-js-sdk/src/@types/threepids";
+import { logger } from "matrix-js-sdk/src/logger";
+
 import { _t } from "../../../../languageHandler";
 import { MatrixClientPeg } from "../../../../MatrixClientPeg";
 import Field from "../../elements/Field";
@@ -24,12 +27,9 @@ import AddThreepid from "../../../../AddThreepid";
 import CountryDropdown from "../../auth/CountryDropdown";
 import Modal from '../../../../Modal';
 import { replaceableComponent } from "../../../../utils/replaceableComponent";
-import { IThreepid, ThreepidMedium } from "matrix-js-sdk/src/@types/threepids";
 import ErrorDialog from "../../dialogs/ErrorDialog";
 import { PhoneNumberCountryDefinition } from "../../../../phonenumber";
 
-import { logger } from "matrix-js-sdk/src/logger";
-
 /*
 TODO: Improve the UX for everything in here.
 This is a copy/paste of EmailAddresses, mostly.

src/components/views/settings/discovery/EmailAddresses.tsx

@@ -16,18 +16,17 @@ limitations under the License.
 */
 
 import React from 'react';
+import { IThreepid } from "matrix-js-sdk/src/@types/threepids";
+import { logger } from "matrix-js-sdk/src/logger";
 
 import { _t } from "../../../../languageHandler";
 import { MatrixClientPeg } from "../../../../MatrixClientPeg";
 import Modal from '../../../../Modal';
 import AddThreepid from '../../../../AddThreepid';
 import { replaceableComponent } from "../../../../utils/replaceableComponent";
-import { IThreepid } from "matrix-js-sdk/src/@types/threepids";
 import ErrorDialog from "../../dialogs/ErrorDialog";
 import AccessibleButton from "../../elements/AccessibleButton";
 
-import { logger } from "matrix-js-sdk/src/logger";
-
 /*
 TODO: Improve the UX for everything in here.
 It's very much placeholder, but it gets the job done. The old way of handling

src/components/views/settings/discovery/PhoneNumbers.tsx

@@ -16,19 +16,18 @@ limitations under the License.
 */
 
 import React from 'react';
+import { IThreepid } from "matrix-js-sdk/src/@types/threepids";
+import { logger } from "matrix-js-sdk/src/logger";
 
 import { _t } from "../../../../languageHandler";
 import { MatrixClientPeg } from "../../../../MatrixClientPeg";
 import Modal from '../../../../Modal';
 import AddThreepid from '../../../../AddThreepid';
 import { replaceableComponent } from "../../../../utils/replaceableComponent";
-import { IThreepid } from "matrix-js-sdk/src/@types/threepids";
 import ErrorDialog from "../../dialogs/ErrorDialog";
 import Field from "../../elements/Field";
 import AccessibleButton from "../../elements/AccessibleButton";
 
-import { logger } from "matrix-js-sdk/src/logger";
-
 /*
 TODO: Improve the UX for everything in here.
 This is a copy/paste of EmailAddresses, mostly.

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

@@ -15,6 +15,7 @@ limitations under the License.
 */
 
 import React, { ContextType } from 'react';
+
 import { _t } from "../../../../../languageHandler";
 import RoomProfileSettings from "../../../room_settings/RoomProfileSettings";
 import AccessibleButton from "../../../elements/AccessibleButton";

src/components/views/settings/tabs/room/NotificationSettingsTab.tsx

@@ -15,6 +15,8 @@ limitations under the License.
 */
 
 import React, { createRef } from 'react';
+import { logger } from "matrix-js-sdk/src/logger";
+
 import { _t } from "../../../../../languageHandler";
 import { MatrixClientPeg } from "../../../../../MatrixClientPeg";
 import AccessibleButton from "../../../elements/AccessibleButton";
@@ -22,8 +24,6 @@ import Notifier from "../../../../../Notifier";
 import SettingsStore from '../../../../../settings/SettingsStore';
 import { SettingLevel } from "../../../../../settings/SettingLevel";
 import { replaceableComponent } from "../../../../../utils/replaceableComponent";
-
-import { logger } from "matrix-js-sdk/src/logger";
 import { RoomEchoChamber } from "../../../../../stores/local-echo/RoomEchoChamber";
 import { EchoChamber } from '../../../../../stores/local-echo/EchoChamber';
 import MatrixClientContext from "../../../../../contexts/MatrixClientContext";

src/components/views/settings/tabs/room/RolesRoomSettingsTab.tsx

@@ -15,21 +15,21 @@ limitations under the License.
 */
 
 import React from 'react';
+import { EventType } from "matrix-js-sdk/src/@types/event";
+import { RoomMember } from "matrix-js-sdk/src/models/room-member";
+import { MatrixEvent } from "matrix-js-sdk/src/models/event";
+import { RoomState } from "matrix-js-sdk/src/models/room-state";
+import { logger } from "matrix-js-sdk/src/logger";
+
 import { _t, _td } from "../../../../../languageHandler";
 import { MatrixClientPeg } from "../../../../../MatrixClientPeg";
 import AccessibleButton from "../../../elements/AccessibleButton";
 import Modal from "../../../../../Modal";
 import { replaceableComponent } from "../../../../../utils/replaceableComponent";
-import { EventType } from "matrix-js-sdk/src/@types/event";
-import { RoomMember } from "matrix-js-sdk/src/models/room-member";
-import { MatrixEvent } from "matrix-js-sdk/src/models/event";
-import { RoomState } from "matrix-js-sdk/src/models/room-state";
 import { compare } from "../../../../../utils/strings";
 import ErrorDialog from '../../../dialogs/ErrorDialog';
 import PowerSelector from "../../../elements/PowerSelector";
 import SettingsFieldset from '../../SettingsFieldset';
-
-import { logger } from "matrix-js-sdk/src/logger";
 import SettingsStore from "../../../../../settings/SettingsStore";
 
 interface IEventShowOpts {

src/components/views/settings/tabs/room/SecurityRoomSettingsTab.tsx

@@ -18,6 +18,7 @@ import React from 'react';
 import { GuestAccess, HistoryVisibility, JoinRule, RestrictedAllowType } from "matrix-js-sdk/src/@types/partials";
 import { MatrixEvent } from "matrix-js-sdk/src/models/event";
 import { EventType } from 'matrix-js-sdk/src/@types/event';
+import { logger } from "matrix-js-sdk/src/logger";
 
 import { _t } from "../../../../../languageHandler";
 import { MatrixClientPeg } from "../../../../../MatrixClientPeg";
@@ -37,8 +38,6 @@ import JoinRuleSettings from "../../JoinRuleSettings";
 import ErrorDialog from "../../../dialogs/ErrorDialog";
 import SettingsFieldset from '../../SettingsFieldset';
 
-import { logger } from "matrix-js-sdk/src/logger";
-
 interface IProps {
     roomId: string;
     closeSettingsFn: () => void;

src/components/views/settings/tabs/user/AppearanceUserSettingsTab.tsx

@@ -16,6 +16,7 @@ limitations under the License.
 */
 
 import React from 'react';
+
 import { _t } from "../../../../../languageHandler";
 import SdkConfig from "../../../../../SdkConfig";
 import { MatrixClientPeg } from '../../../../../MatrixClientPeg';
@@ -28,7 +29,6 @@ import { UIFeature } from "../../../../../settings/UIFeature";
 import { Layout } from "../../../../../settings/enums/Layout";
 import { replaceableComponent } from "../../../../../utils/replaceableComponent";
 import LayoutSwitcher from "../../LayoutSwitcher";
-
 import FontScalingPanel from '../../FontScalingPanel';
 import ThemeChoicePanel from '../../ThemeChoicePanel';
 import ImageSizePanel from "../../ImageSizePanel";

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

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

src/components/views/settings/tabs/user/GeneralUserSettingsTab.tsx

@@ -17,6 +17,10 @@ limitations under the License.
 */
 
 import React from 'react';
+import { SERVICE_TYPES } from "matrix-js-sdk/src/service-types";
+import { IThreepid } from "matrix-js-sdk/src/@types/threepids";
+import { logger } from "matrix-js-sdk/src/logger";
+
 import { _t } from "../../../../../languageHandler";
 import ProfileSettings from "../../ProfileSettings";
 import * as languageHandler from "../../../../../languageHandler";
@@ -30,7 +34,6 @@ import { MatrixClientPeg } from "../../../../../MatrixClientPeg";
 import Modal from "../../../../../Modal";
 import dis from "../../../../../dispatcher/dispatcher";
 import { Policies, Service, startTermsFlow } from "../../../../../Terms";
-import { SERVICE_TYPES } from "matrix-js-sdk/src/service-types";
 import IdentityAuthClient from "../../../../../IdentityAuthClient";
 import { abbreviateUrl } from "../../../../../utils/UrlUtils";
 import { getThreepidsWithBindStatus } from '../../../../../boundThreepids';
@@ -38,7 +41,6 @@ import Spinner from "../../../elements/Spinner";
 import { SettingLevel } from "../../../../../settings/SettingLevel";
 import { UIFeature } from "../../../../../settings/UIFeature";
 import { replaceableComponent } from "../../../../../utils/replaceableComponent";
-import { IThreepid } from "matrix-js-sdk/src/@types/threepids";
 import { ActionPayload } from "../../../../../dispatcher/payloads";
 import ErrorDialog from "../../../dialogs/ErrorDialog";
 import AccountPhoneNumbers from "../../account/PhoneNumbers";
@@ -50,8 +52,6 @@ import InlineTermsAgreement from "../../../terms/InlineTermsAgreement";
 import SetIdServer from "../../SetIdServer";
 import SetIntegrationManager from "../../SetIntegrationManager";
 
-import { logger } from "matrix-js-sdk/src/logger";
-
 interface IProps {
     closeSettingsFn: () => void;
 }

src/components/views/settings/tabs/user/HelpUserSettingsTab.tsx

@@ -15,6 +15,8 @@ limitations under the License.
 */
 
 import React from 'react';
+import { logger } from "matrix-js-sdk/src/logger";
+
 import AccessibleButton, { ButtonEvent } from "../../../elements/AccessibleButton";
 import { _t, getCurrentLanguage } from "../../../../../languageHandler";
 import { MatrixClientPeg } from "../../../../../MatrixClientPeg";
@@ -32,8 +34,6 @@ import { toRightOf } from "../../../../structures/ContextMenu";
 import BugReportDialog from '../../../dialogs/BugReportDialog';
 import GenericTextContextMenu from "../../../context_menus/GenericTextContextMenu";
 
-import { logger } from "matrix-js-sdk/src/logger";
-
 interface IProps {
     closeSettingsFn: () => void;
 }

src/components/views/settings/tabs/user/MjolnirUserSettingsTab.tsx

@@ -15,6 +15,8 @@ limitations under the License.
 */
 
 import React from 'react';
+import { logger } from "matrix-js-sdk/src/logger";
+
 import { _t } from "../../../../../languageHandler";
 import SdkConfig from "../../../../../SdkConfig";
 import { Mjolnir } from "../../../../../mjolnir/Mjolnir";
@@ -28,8 +30,6 @@ import QuestionDialog from "../../../dialogs/QuestionDialog";
 import AccessibleButton from "../../../elements/AccessibleButton";
 import Field from "../../../elements/Field";
 
-import { logger } from "matrix-js-sdk/src/logger";
-
 interface IState {
     busy: boolean;
     newPersonalRule: string;

src/components/views/settings/tabs/user/NotificationUserSettingsTab.tsx

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

src/components/views/settings/tabs/user/SecurityUserSettingsTab.tsx

@@ -17,6 +17,8 @@ limitations under the License.
 
 import React from 'react';
 import { sleep } from "matrix-js-sdk/src/utils";
+import { Room } from "matrix-js-sdk/src/models/room";
+import { logger } from "matrix-js-sdk/src/logger";
 
 import { _t } from "../../../../../languageHandler";
 import { MatrixClientPeg } from "../../../../../MatrixClientPeg";
@@ -32,7 +34,6 @@ import E2eAdvancedPanel, { isE2eAdvancedPanelPossible } from "../../E2eAdvancedP
 import CountlyAnalytics from "../../../../../CountlyAnalytics";
 import { replaceableComponent } from "../../../../../utils/replaceableComponent";
 import { ActionPayload } from "../../../../../dispatcher/payloads";
-import { Room } from "matrix-js-sdk/src/models/room";
 import CryptographyPanel from "../../CryptographyPanel";
 import DevicesPanel from "../../DevicesPanel";
 import SettingsFlag from "../../../elements/SettingsFlag";
@@ -40,8 +41,6 @@ import CrossSigningPanel from "../../CrossSigningPanel";
 import EventIndexPanel from "../../EventIndexPanel";
 import InlineSpinner from "../../../elements/InlineSpinner";
 import { PosthogAnalytics } from "../../../../../PosthogAnalytics";
-
-import { logger } from "matrix-js-sdk/src/logger";
 import { showDialog as showAnalyticsLearnMoreDialog } from "../../../dialogs/AnalyticsLearnMoreDialog";
 
 interface IIgnoredUserProps {

src/components/views/settings/tabs/user/VoiceUserSettingsTab.tsx

@@ -16,6 +16,8 @@ limitations under the License.
 */
 
 import React from 'react';
+import { logger } from "matrix-js-sdk/src/logger";
+
 import { _t } from "../../../../../languageHandler";
 import SdkConfig from "../../../../../SdkConfig";
 import MediaDeviceHandler, { IMediaDevices, MediaDeviceKindEnum } from "../../../../../MediaDeviceHandler";
@@ -28,8 +30,6 @@ import { replaceableComponent } from "../../../../../utils/replaceableComponent"
 import SettingsFlag from '../../../elements/SettingsFlag';
 import ErrorDialog from '../../../dialogs/ErrorDialog';
 
-import { logger } from "matrix-js-sdk/src/logger";
-
 const getDefaultDevice = (devices: Array<Partial<MediaDeviceInfo>>) => {
     // Note we're looking for a device with deviceId 'default' but adding a device
     // with deviceId == the empty string: this is because Chrome gives us a device