From 4969cfe9deef2ebefcbeaff0e9ca6acb2525ad5c Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Tue, 28 Jul 2020 16:37:09 -0600
Subject: [PATCH] Appease the linter

---
 src/CallHandler.js                                  | 2 +-
 src/components/structures/MatrixChat.tsx            | 2 +-
 src/settings/WatchManager.ts                        | 2 +-
 src/settings/controllers/NotificationControllers.ts | 1 +
 src/settings/watchers/ThemeWatcher.ts               | 2 +-
 5 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/CallHandler.js b/src/CallHandler.js
index 810b2895d8..d5e058ef1e 100644
--- a/src/CallHandler.js
+++ b/src/CallHandler.js
@@ -62,7 +62,7 @@ import Matrix from 'matrix-js-sdk';
 import dis from './dispatcher/dispatcher';
 import WidgetUtils from './utils/WidgetUtils';
 import WidgetEchoStore from './stores/WidgetEchoStore';
-import SettingsStore  from './settings/SettingsStore';
+import SettingsStore from './settings/SettingsStore';
 import {generateHumanReadableId} from "./utils/NamingUtils";
 import {Jitsi} from "./widgets/Jitsi";
 import {WidgetType} from "./widgets/WidgetType";
diff --git a/src/components/structures/MatrixChat.tsx b/src/components/structures/MatrixChat.tsx
index 7fba18f4e5..a66d4c043f 100644
--- a/src/components/structures/MatrixChat.tsx
+++ b/src/components/structures/MatrixChat.tsx
@@ -51,7 +51,7 @@ import { getHomePageUrl } from '../../utils/pages';
 
 import createRoom from "../../createRoom";
 import {_t, _td, getCurrentLanguage} from '../../languageHandler';
-import SettingsStore  from "../../settings/SettingsStore";
+import SettingsStore from "../../settings/SettingsStore";
 import ThemeController from "../../settings/controllers/ThemeController";
 import { startAnyRegistrationFlow } from "../../Registration.js";
 import { messageForSyncError } from '../../utils/ErrorUtils';
diff --git a/src/settings/WatchManager.ts b/src/settings/WatchManager.ts
index 18179c2fd5..d51439459c 100644
--- a/src/settings/WatchManager.ts
+++ b/src/settings/WatchManager.ts
@@ -18,7 +18,7 @@ import { SettingLevel } from "./SettingLevel";
 
 export type CallbackFn = (changedInRoomId: string, atLevel: SettingLevel, newValAtLevel: any) => void;
 
-const IRRELEVANT_ROOM: symbol = Symbol("any room");
+const IRRELEVANT_ROOM = Symbol("any room");
 
 interface RoomWatcherMap {
     // @ts-ignore - TS wants string-only keys but we know better - https://github.com/Microsoft/TypeScript/issues/1863
diff --git a/src/settings/controllers/NotificationControllers.ts b/src/settings/controllers/NotificationControllers.ts
index 23b753fc11..ff38f41b7e 100644
--- a/src/settings/controllers/NotificationControllers.ts
+++ b/src/settings/controllers/NotificationControllers.ts
@@ -39,6 +39,7 @@ function isPushNotifyDisabled(): boolean {
 }
 
 function getNotifier(): any { // TODO: [TS] Formal type that doesn't cause a cyclical reference.
+    // eslint-disable-next-line @typescript-eslint/no-var-requires
     let Notifier = require('../../Notifier'); // avoids cyclical references
     if (Notifier.default) Notifier = Notifier.default; // correct for webpack require() weirdness
     return Notifier;
diff --git a/src/settings/watchers/ThemeWatcher.ts b/src/settings/watchers/ThemeWatcher.ts
index c297181490..4330a15f57 100644
--- a/src/settings/watchers/ThemeWatcher.ts
+++ b/src/settings/watchers/ThemeWatcher.ts
@@ -15,7 +15,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import SettingsStore  from '../SettingsStore';
+import SettingsStore from '../SettingsStore';
 import dis from '../../dispatcher/dispatcher';
 import { Action } from '../../dispatcher/actions';
 import ThemeController from "../controllers/ThemeController";