Appease early linters

Author: turt2live

src/components/views/dialogs/ModuleUiDialog.tsx

@@ -15,12 +15,12 @@ limitations under the License.
 */
 
 import React, { createRef } from "react";
+import { DialogContent, DialogProps } from "@matrix-org/react-sdk-module-api/lib/components/DialogContent";
+import { logger } from "matrix-js-sdk/src/logger";
 
 import ScrollableBaseModal, { IScrollableBaseState } from "./ScrollableBaseModal";
 import { IDialogProps } from "./IDialogProps";
-import { DialogContent, DialogProps } from "@matrix-org/react-sdk-module-api/lib/components/DialogContent";
 import { _t } from "../../../languageHandler";
-import { logger } from "matrix-js-sdk/src/logger";
 
 interface IProps extends IDialogProps {
     contentFactory: (props: DialogProps, ref: React.Ref<DialogContent>) => React.ReactNode;

src/components/views/rooms/RoomPreviewBar.tsx

@@ -21,6 +21,10 @@ import { EventType, RoomType } from "matrix-js-sdk/src/@types/event";
 import { IJoinRuleEventContent, JoinRule } from "matrix-js-sdk/src/@types/partials";
 import { RoomMember } from "matrix-js-sdk/src/models/room-member";
 import classNames from 'classnames';
+import {
+    RoomPreviewOpts,
+    RoomViewLifecycle,
+} from "@matrix-org/react-sdk-module-api/lib/lifecycles/RoomViewLifecycle";
 
 import { MatrixClientPeg } from '../../../MatrixClientPeg';
 import dis from '../../../dispatcher/dispatcher';
@@ -35,10 +39,6 @@ import RoomAvatar from "../avatars/RoomAvatar";
 import SettingsStore from "../../../settings/SettingsStore";
 import { UIFeature } from "../../../settings/UIFeature";
 import { ModuleRunner } from "../../../modules/ModuleRunner";
-import {
-    RoomPreviewOpts,
-    RoomViewLifecycle,
-} from "@matrix-org/react-sdk-module-api/lib/lifecycles/RoomViewLifecycle";
 
 const MemberEventHtmlReasonField = "io.element.html_reason";
 
@@ -320,7 +320,8 @@ export default class RoomPreviewBar extends React.Component<IProps, IState> {
             case MessageCase.NotLoggedIn: {
                 const opts: RoomPreviewOpts = { canJoin: false };
                 if (this.props.room?.roomId) {
-                    ModuleRunner.instance.invoke(RoomViewLifecycle.PreviewRoomNotLoggedIn, opts, this.props.room.roomId);
+                    ModuleRunner.instance
+                        .invoke(RoomViewLifecycle.PreviewRoomNotLoggedIn, opts, this.props.room.roomId);
                 }
                 if (opts.canJoin) {
                     title = _t("Join the room to participate");

src/languageHandler.tsx

@@ -28,10 +28,10 @@ import PlatformPeg from "./PlatformPeg";
 import { SettingLevel } from "./settings/SettingLevel";
 import { retry } from "./utils/promise";
 import SdkConfig from "./SdkConfig";
+import { ModuleRunner } from "./modules/ModuleRunner";
 
 // @ts-ignore - $webapp is a webpack resolve alias pointing to the output directory, see webpack config
 import webpackLangJsonUrl from "$webapp/i18n/languages.json";
-import { ModuleRunner } from "./modules/ModuleRunner";
 
 const i18nFolder = 'i18n/';
 

src/modules/ProxiedModuleApi.ts

@@ -67,7 +67,13 @@ export class ProxiedModuleApi implements ModuleApi {
     /**
      * @override
      */
-    public openDialog<M extends object, P extends DialogProps = DialogProps, C extends React.Component = React.Component>(title: string, body: (props: P, ref: React.RefObject<C>) => React.ReactNode): Promise<{ didOkOrSubmit: boolean, model: M }> {
+    public openDialog<
+        M extends object,
+        P extends DialogProps = DialogProps,
+        C extends React.Component = React.Component>(
+            title: string,
+            body: (props: P, ref: React.RefObject<C>) => React.ReactNode,
+    ): Promise<{ didOkOrSubmit: boolean, model: M }> {
         return new Promise<{ didOkOrSubmit: boolean, model: M }>((resolve) => {
             Modal.createDialog(ModuleUiDialog, {
                 title: title,
@@ -84,13 +90,19 @@ export class ProxiedModuleApi implements ModuleApi {
     /**
      * @override
      */
-    public async registerSimpleAccount(username: string, password: string, displayName?: string): Promise<AccountAuthInfo> {
+    public async registerSimpleAccount(
+        username: string,
+        password: string,
+        displayName?: string,
+    ): Promise<AccountAuthInfo> {
         const hsUrl = SdkConfig.get("validated_server_config").hsUrl;
         const client = Matrix.createClient({ baseUrl: hsUrl });
+        const deviceName = SdkConfig.get("default_device_display_name")
+            || PlatformPeg.get().getDefaultDeviceDisplayName();
         const req = {
             username,
             password,
-            initial_device_display_name: SdkConfig.get("default_device_display_name") || PlatformPeg.get().getDefaultDeviceDisplayName(),
+            initial_device_display_name: deviceName,
             auth: undefined,
             inhibit_login: false,
         };

test/modules/MockModule.ts

@@ -16,6 +16,7 @@ limitations under the License.
 
 import { RuntimeModule } from "@matrix-org/react-sdk-module-api/lib/RuntimeModule";
 import { ModuleApi } from "@matrix-org/react-sdk-module-api/lib/ModuleApi";
+
 import { ModuleRunner } from "../../src/modules/ModuleRunner";
 
 export class MockModule extends RuntimeModule {