5 files changed, 39 insertions, 41 deletions

diff --git a/src/lib/DBus.ts b/src/lib/DBus.ts
index 530e30c85..70c8132a3 100644
--- a/src/lib/DBus.ts
+++ b/src/lib/DBus.ts
@@ -1,9 +1,9 @@
 import { ipcMain } from 'electron';
 import { comparer } from 'mobx';
 
-import { MessageBus, sessionBus } from 'dbus-next';
+import { type MessageBus, sessionBus } from 'dbus-next';
 import { isLinux } from '../environment';
-import TrayIcon from './Tray';
+import type TrayIcon from './Tray';
 import Ferdium, { type UnreadServices } from './dbus/Ferdium';
 
 export default class DBus {
diff --git a/src/lib/Form.ts b/src/lib/Form.ts
index 2b25eb193..c60506446 100644
--- a/src/lib/Form.ts
+++ b/src/lib/Form.ts
@@ -1,6 +1,6 @@
 import Form from 'mobx-react-form';
 import vjf from 'mobx-react-form/lib/validators/VJF';
-import { FormFields } from '../@types/mobx-form.types';
+import type { FormFields } from '../@types/mobx-form.types';
 
 export default class DefaultForm extends Form {
   // eslint-disable-next-line @typescript-eslint/no-useless-constructor
diff --git a/src/lib/Menu.ts b/src/lib/Menu.ts
index 12dc1e42c..f7ed3b310 100644
--- a/src/lib/Menu.ts
+++ b/src/lib/Menu.ts
@@ -1,54 +1,54 @@
 import os from 'node:os';
-import { clipboard, MenuItemConstructorOptions } from 'electron';
 import {
-  app,
   Menu,
+  app,
   dialog,
-  webContents,
-  systemPreferences,
   getCurrentWindow,
+  systemPreferences,
+  webContents,
 } from '@electron/remote';
-import { autorun, action, makeObservable, observable } from 'mobx';
-import { defineMessages, IntlShape } from 'react-intl';
-import osName from 'os-name';
+import { type MenuItemConstructorOptions, clipboard } from 'electron';
 import { fromJS } from 'immutable';
+import { action, autorun, makeObservable, observable } from 'mobx';
+import osName from 'os-name';
+import { type IntlShape, defineMessages } from 'react-intl';
 import semver from 'semver';
+import type { StoresProps } from '../@types/ferdium-components.types';
+import { importExportURL, serverBase, serverName } from '../api/apiBase';
+// @ts-expect-error Cannot find module '../buildInfo.json' or its corresponding type declarations.
+import { gitBranch, gitHashShort, timestamp } from '../buildInfo.json';
+import { CUSTOM_WEBSITE_RECIPE_ID, LIVE_API_FERDIUM_WEBSITE } from '../config';
 import {
-  isWindows,
-  cmdOrCtrlShortcutKey,
+  addNewServiceShortcutKey,
   altKey,
-  shiftKey,
-  settingsShortcutKey,
+  chromeVersion,
+  cmdOrCtrlShortcutKey,
+  downloadsShortcutKey,
+  electronVersion,
   isLinux,
   isMac,
+  isWindows,
   lockFerdiumShortcutKey,
-  todosToggleShortcutKey,
-  workspaceToggleShortcutKey,
-  addNewServiceShortcutKey,
-  splitModeToggleShortcutKey,
   muteFerdiumShortcutKey,
-  electronVersion,
-  chromeVersion,
   nodeVersion,
   osArch,
+  settingsShortcutKey,
+  shiftKey,
+  splitModeToggleShortcutKey,
+  todosToggleShortcutKey,
   toggleFullScreenKey,
-  downloadsShortcutKey,
+  workspaceToggleShortcutKey,
 } from '../environment';
-import { CUSTOM_WEBSITE_RECIPE_ID, LIVE_API_FERDIUM_WEBSITE } from '../config';
 import { ferdiumVersion } from '../environment-remote';
 import { todoActions } from '../features/todos/actions';
 import workspaceActions from '../features/workspaces/actions';
 import { workspaceStore } from '../features/workspaces/index';
-import { importExportURL, serverBase, serverName } from '../api/apiBase';
+import { onAuthGoToReleaseNotes } from '../helpers/update-helpers';
 import { openExternalUrl } from '../helpers/url-helpers';
 import globalMessages from '../i18n/globalMessages';
-import { onAuthGoToReleaseNotes } from '../helpers/update-helpers';
-// @ts-expect-error Cannot find module '../buildInfo.json' or its corresponding type declarations.
-import { timestamp, gitHashShort, gitBranch } from '../buildInfo.json';
-import Service from '../models/Service';
-import { StoresProps } from '../@types/ferdium-components.types';
-import { RealStores } from '../stores';
 import { acceleratorString } from '../jsUtils';
+import type Service from '../models/Service';
+import type { RealStores } from '../stores';
 
 const menuItems = defineMessages({
   edit: {
@@ -688,11 +688,9 @@ class FranzMenu implements StoresProps {
   }
 
   getOsName(): string {
-    let osNameParse = osName();
-    const isWin11 = semver.satisfies(os.release(), '>=10.0.22000');
-    osNameParse = isWindows && isWin11 ? 'Windows 11' : osNameParse;
-
-    return osNameParse;
+    return isWindows && semver.satisfies(os.release(), '>=10.0.22000')
+      ? 'Windows 11'
+      : osName(os.platform(), os.release());
   }
 
   _build(): void {
diff --git a/src/lib/TouchBar.ts b/src/lib/TouchBar.ts
index 417e20411..5adeb84b5 100644
--- a/src/lib/TouchBar.ts
+++ b/src/lib/TouchBar.ts
@@ -1,6 +1,6 @@
-import semver from 'semver';
 import { TouchBar, getCurrentWindow } from '@electron/remote';
 import { autorun } from 'mobx';
+import semver from 'semver';
 
 import { isMac, osRelease } from '../environment';
 
diff --git a/src/lib/Tray.ts b/src/lib/Tray.ts
index 726d32b23..447096b4c 100644
--- a/src/lib/Tray.ts
+++ b/src/lib/Tray.ts
@@ -1,17 +1,17 @@
 import { join } from 'node:path';
 import {
-  app,
+  BrowserWindow,
   Menu,
+  type NativeImage,
+  Tray,
+  app,
+  ipcMain,
   nativeImage,
   nativeTheme,
   systemPreferences,
-  Tray,
-  ipcMain,
-  BrowserWindow,
-  NativeImage,
 } from 'electron';
 import macosVersion from 'macos-version';
-import { isMac, isWindows, isLinux } from '../environment';
+import { isLinux, isMac, isWindows } from '../environment';
 
 const FILE_EXTENSION = isWindows ? 'ico' : 'png';
 const INDICATOR_TRAY_PLAIN = 'tray';