15 files changed, 29 insertions, 55 deletions

diff --git a/.vscode/settings.json b/.vscode/settings.json
index ac616e418..5060e4994 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -10,8 +10,8 @@
   "editor.detectIndentation": false,
   "editor.guides.bracketPairs": "active",
   "editor.codeActionsOnSave": {
-    "source.fixAll": true,
-    "source.fixAll.eslint": true
+    "source.fixAll": "explicit",
+    "source.fixAll.eslint": "explicit"
   },
 
   // "explorer.confirmDelete": false,
diff --git a/src/api/server/ServerApi.ts b/src/api/server/ServerApi.ts
index 6e4485cfb..1530dd478 100644
--- a/src/api/server/ServerApi.ts
+++ b/src/api/server/ServerApi.ts
@@ -506,7 +506,7 @@ export default class ServerApi {
     try {
       const config = readJsonSync(file);
 
-      if (Object.prototype.hasOwnProperty.call(config, 'services')) {
+      if (Object.hasOwn(config, 'services')) {
         const services = await Promise.all(
           config.services.map(async (s: { service: any }) => {
             const service = s;
diff --git a/src/components/services/content/ServiceView.tsx b/src/components/services/content/ServiceView.tsx
index 37dcafbe4..d89cd0610 100644
--- a/src/components/services/content/ServiceView.tsx
+++ b/src/components/services/content/ServiceView.tsx
@@ -64,7 +64,7 @@ class ServiceView extends Component<IProps, IState> {
 
   componentWillUnmount() {
     this.autorunDisposer!();
-    clearTimeout(this.forceRepaintTimeout!);
+    clearTimeout(this.forceRepaintTimeout);
     // clearTimeout(this.hibernationTimer); // TODO: [TS DEBT] class property not reassigned, need to find its purpose
   }
 
diff --git a/src/components/settings/settings/EditSettingsForm.tsx b/src/components/settings/settings/EditSettingsForm.tsx
index 210c8d9e9..1672a1411 100644
--- a/src/components/settings/settings/EditSettingsForm.tsx
+++ b/src/components/settings/settings/EditSettingsForm.tsx
@@ -397,7 +397,7 @@ class EditSettingsForm extends Component<IProps, IState> {
         debug('cacheSize:', cacheSize);
         notCleared =
           this.state.clearCacheButtonClicked &&
-          isClearingAllCache === false &&
+          !isClearingAllCache &&
           cacheSizeBytes !== 0;
       } else {
         cacheSize = '…';
diff --git a/src/components/ui/AppLoader/index.tsx b/src/components/ui/AppLoader/index.tsx
index 64c840aaa..4b5828ef4 100644
--- a/src/components/ui/AppLoader/index.tsx
+++ b/src/components/ui/AppLoader/index.tsx
@@ -61,7 +61,7 @@ class AppLoader extends Component<IProps, IState> {
         className={classes.component}
         spinnerColor={theme.colorAppLoaderSpinner}
       >
-        {texts?.map((text, i) => (
+        {texts.map((text, i) => (
           <span
             key={text}
             className={classnames({
diff --git a/src/components/ui/input/scorePassword.ts b/src/components/ui/input/scorePassword.ts
index 59502e2b0..4a9f67265 100644
--- a/src/components/ui/input/scorePassword.ts
+++ b/src/components/ui/input/scorePassword.ts
@@ -33,7 +33,7 @@ export function scorePasswordFunc(password: string): number {
 
   let variationCount = 0;
   for (const key of Object.keys(variations)) {
-    variationCount += variations[key] === true ? 1 : 0;
+    variationCount += variations[key] ? 1 : 0;
   }
 
   score += (variationCount - 1) * 10;
diff --git a/src/components/ui/select/index.tsx b/src/components/ui/select/index.tsx
index c06ac59b0..0d8520f58 100644
--- a/src/components/ui/select/index.tsx
+++ b/src/components/ui/select/index.tsx
@@ -282,23 +282,23 @@ class SelectComponent extends Component<IProps, IState> {
 
     if (!open) return;
 
-    if (e.keyCode === 38 || e.keyCode === 40) {
+    if (e.key === 'ArrowUp' || e.key === 'ArrowDown') {
       e.preventDefault();
     }
 
     if (this.componentRef?.current) {
-      if (e.keyCode === 38 && selected > 0) {
+      if (e.key === 'ArrowUp' && selected > 0) {
         this.setState((state: IState) => ({
           selected: state.selected - 1,
         }));
       } else if (
-        e.keyCode === 40 &&
+        e.key === 'ArrowDown' &&
         selected < Object.keys(options!).length - 1
       ) {
         this.setState((state: IState) => ({
           selected: state.selected + 1,
         }));
-      } else if (e.keyCode === 13) {
+      } else if (e.key === 'Enter') {
         this.select(Object.keys(options!)[selected]);
       }
 
@@ -311,19 +311,6 @@ class SelectComponent extends Component<IProps, IState> {
         this.scrollContainerRef.current.scrollTop = topOffset - 35;
       }
     }
-
-    switch (e.keyCode) {
-      case 37:
-      case 39:
-      case 38:
-      case 40: // Arrow keys
-      case 32: {
-        break;
-      } // Space
-      default: {
-        break;
-      } // do not block other keys
-    }
   }
 
   render(): ReactElement {
diff --git a/src/containers/settings/EditServiceScreen.tsx b/src/containers/settings/EditServiceScreen.tsx
index ff2076fed..946ec09d3 100644
--- a/src/containers/settings/EditServiceScreen.tsx
+++ b/src/containers/settings/EditServiceScreen.tsx
@@ -261,7 +261,7 @@ class EditServiceScreen extends Component<IProps> {
         },
         customIcon: {
           label: intl.formatMessage(messages.icon),
-          value: service?.hasCustomUploadedIcon ? service?.icon : null,
+          value: service?.hasCustomUploadedIcon ? service.icon : null,
           type: 'file',
         },
         isDarkModeEnabled: {
@@ -276,21 +276,21 @@ class EditServiceScreen extends Component<IProps> {
         darkReaderBrightness: {
           label: intl.formatMessage(messages.darkReaderBrightness),
           value: service?.darkReaderSettings
-            ? service?.darkReaderSettings.brightness
+            ? service.darkReaderSettings.brightness
             : DEFAULT_SERVICE_SETTINGS.darkReaderBrightness,
           default: DEFAULT_SERVICE_SETTINGS.darkReaderBrightness,
         },
         darkReaderContrast: {
           label: intl.formatMessage(messages.darkReaderContrast),
           value: service?.darkReaderSettings
-            ? service?.darkReaderSettings.contrast
+            ? service.darkReaderSettings.contrast
             : DEFAULT_SERVICE_SETTINGS.darkReaderContrast,
           default: DEFAULT_SERVICE_SETTINGS.darkReaderContrast,
         },
         darkReaderSepia: {
           label: intl.formatMessage(messages.darkReaderSepia),
           value: service?.darkReaderSettings
-            ? service?.darkReaderSettings.sepia
+            ? service.darkReaderSettings.sepia
             : DEFAULT_SERVICE_SETTINGS.darkReaderSepia,
           default: DEFAULT_SERVICE_SETTINGS.darkReaderSepia,
         },
diff --git a/src/features/quickSwitch/Component.tsx b/src/features/quickSwitch/Component.tsx
index ab07e5d4d..7f6ad6432 100644
--- a/src/features/quickSwitch/Component.tsx
+++ b/src/features/quickSwitch/Component.tsx
@@ -88,14 +88,6 @@ interface IState {
 @inject('stores', 'actions')
 @observer
 class QuickSwitchModal extends Component<IProps, IState> {
-  ARROW_DOWN = 40;
-
-  ARROW_UP = 38;
-
-  ENTER = 13;
-
-  TAB = 9;
-
   inputRef = createRef<HTMLDivElement>();
 
   serviceElements = {};
@@ -214,12 +206,12 @@ class QuickSwitchModal extends Component<IProps, IState> {
   // Handle global key presses to change the selection
   _handleKeyDown(event: KeyboardEvent): void {
     if (ModalState.isModalVisible) {
-      switch (event.keyCode) {
-        case this.ARROW_DOWN: {
+      switch (event.key) {
+        case 'ArrowDown': {
           this.changeSelected(1);
           break;
         }
-        case this.TAB: {
+        case 'Tab': {
           if (event.shiftKey) {
             this.changeSelected(-1);
           } else {
@@ -227,11 +219,11 @@ class QuickSwitchModal extends Component<IProps, IState> {
           }
           break;
         }
-        case this.ARROW_UP: {
+        case 'ArrowUp': {
           this.changeSelected(-1);
           break;
         }
-        case this.ENTER: {
+        case 'Enter': {
           this.openService(this.state.selected);
           break;
         }
diff --git a/src/helpers/service-helpers.ts b/src/helpers/service-helpers.ts
index 678d5024f..f27d53285 100644
--- a/src/helpers/service-helpers.ts
+++ b/src/helpers/service-helpers.ts
@@ -12,7 +12,7 @@ export function removeServicePartitionDirectory(
   const servicePartition = getServicePartitionsDirectory(
     `${addServicePrefix ? 'service-' : ''}${id}`,
   );
-  return removeSync(servicePartition);
+  removeSync(servicePartition);
 }
 
 export async function getServiceIdsFromPartitions() {
diff --git a/src/helpers/update-helpers.ts b/src/helpers/update-helpers.ts
index 9a36850fc..ca541c4b0 100644
--- a/src/helpers/update-helpers.ts
+++ b/src/helpers/update-helpers.ts
@@ -5,7 +5,7 @@ export function getFerdiumVersion(
   currentLocation: string,
   ferdiumVersion: string,
 ): string {
-  const matches = currentLocation?.match(/version=([^&]*)/);
+  const matches = currentLocation.match(/version=([^&]*)/);
   if (matches !== null) {
     return `v${matches[1]}`;
   }
diff --git a/src/helpers/userAgent-helpers.ts b/src/helpers/userAgent-helpers.ts
index bc99fbc52..42e3a9851 100644
--- a/src/helpers/userAgent-helpers.ts
+++ b/src/helpers/userAgent-helpers.ts
@@ -13,7 +13,7 @@ import {
 function macOS() {
   const version = macosVersion() ?? '';
   let cpuName = cpus()[0].model.split(' ')[0];
-  if (cpuName && /\(/.test(cpuName)) {
+  if (cpuName.includes('(')) {
     // eslint-disable-next-line prefer-destructuring
     cpuName = cpuName.split('(')[0];
   }
diff --git a/src/lib/Tray.ts b/src/lib/Tray.ts
index c8f113346..d83f91478 100644
--- a/src/lib/Tray.ts
+++ b/src/lib/Tray.ts
@@ -153,16 +153,13 @@ export default class TrayIcon {
 
   _toggleWindow(): void {
     const [mainWindow] = BrowserWindow.getAllWindows();
-    if (!mainWindow) {
-      return;
-    }
 
     if (mainWindow.isMinimized()) {
       mainWindow.restore();
     } else if (mainWindow.isVisible() && mainWindow.isFocused()) {
       if (isMac && mainWindow.isFullScreen()) {
-        mainWindow.once('show', () => mainWindow?.setFullScreen(true));
-        mainWindow.once('leave-full-screen', () => mainWindow?.hide());
+        mainWindow.once('show', () => mainWindow.setFullScreen(true));
+        mainWindow.once('leave-full-screen', () => mainWindow.hide());
         mainWindow.setFullScreen(false);
       } else {
         mainWindow.hide();
diff --git a/src/stores/ServicesStore.ts b/src/stores/ServicesStore.ts
index 9c0072586..95aae6ccb 100644
--- a/src/stores/ServicesStore.ts
+++ b/src/stores/ServicesStore.ts
@@ -966,7 +966,8 @@ export default class ServicesStore extends TypedStore {
     service.lostRecipeConnection = false;
 
     if (service.isTodosService) {
-      return this.actions.todos.reload();
+      this.actions.todos.reload();
+      return;
     }
 
     if (!service.webview) return;
diff --git a/src/webview/contextMenuBuilder.ts b/src/webview/contextMenuBuilder.ts
index 93dfbebb6..ee55fbe62 100644
--- a/src/webview/contextMenuBuilder.ts
+++ b/src/webview/contextMenuBuilder.ts
@@ -101,7 +101,7 @@ function translatePopup(res, isError: boolean = false) {
 
   document.addEventListener('click', e => {
     if (div !== e.target && !childOf(e.target, div)) {
-      div?.remove();
+      div.remove();
     }
   });
 }
@@ -253,10 +253,7 @@ export class ContextMenuBuilder {
       return this.buildMenuForVideo(info);
     }
 
-    if (
-      info.isEditable ||
-      (info.inputFieldType && info.inputFieldType !== 'none')
-    ) {
+    if (info.isEditable || info.inputFieldType !== 'none') {
       return this.buildMenuForTextInput(info);
     }