7 files changed, 28 insertions, 24 deletions

diff --git a/src/components/auth/Welcome.tsx b/src/components/auth/Welcome.tsx
index 047512ea4..259e3c335 100644
--- a/src/components/auth/Welcome.tsx
+++ b/src/components/auth/Welcome.tsx
@@ -91,6 +91,7 @@ class Welcome extends Component<IProps> {
             className="settings__hr-sections"
             style={{ marginTop: 24, marginBottom: 24, borderStyle: 'solid' }}
           />
+          {/* eslint-disable-next-line react/button-has-type */}
           <button
             className="button"
             onClick={this.useLocalServer.bind(this)}
diff --git a/src/components/services/content/ServiceView.tsx b/src/components/services/content/ServiceView.tsx
index 19dcdd07a..37dcafbe4 100644
--- a/src/components/services/content/ServiceView.tsx
+++ b/src/components/services/content/ServiceView.tsx
@@ -136,6 +136,7 @@ class ServiceView extends Component<IProps, IState> {
           </>
         )}
         {service.isEnabled ? (
+          // eslint-disable-next-line react/jsx-no-useless-fragment
           <>
             {service.isHibernating ? (
               <div
@@ -173,6 +174,7 @@ class ServiceView extends Component<IProps, IState> {
             )}
           </>
         ) : (
+          // eslint-disable-next-line react/jsx-no-useless-fragment
           <>
             {service.isActive && (
               <ServiceDisabled
diff --git a/src/components/services/content/ServiceWebview.tsx b/src/components/services/content/ServiceWebview.tsx
index 008e1b227..50b5d478f 100644
--- a/src/components/services/content/ServiceWebview.tsx
+++ b/src/components/services/content/ServiceWebview.tsx
@@ -2,7 +2,7 @@ import { Component, ReactElement } from 'react';
 import { observer } from 'mobx-react';
 import { action, makeObservable, observable, reaction } from 'mobx';
 import ElectronWebView from 'react-electron-web-view';
-import { join } from 'path';
+import { join } from 'node:path';
 import ServiceModel from '../../../models/Service';
 
 const debug = require('../../../preload-safe-debug')('Ferdium:Services');
diff --git a/src/components/settings/settings/EditSettingsForm.tsx b/src/components/settings/settings/EditSettingsForm.tsx
index 099a27ebe..0b5d4374d 100644
--- a/src/components/settings/settings/EditSettingsForm.tsx
+++ b/src/components/settings/settings/EditSettingsForm.tsx
@@ -386,8 +386,8 @@ class EditSettingsForm extends Component<IProps, IState> {
     const { lockingFeatureEnabled, scheduledDNDEnabled, reloadAfterResume } =
       window['ferdium'].stores.settings.all.app;
 
-    let cacheSize: string;
-    let notCleared: boolean;
+    let cacheSize;
+    let notCleared;
 
     if (this.state.activeSetttingsTab === 'advanced') {
       const cacheSizeBytes = getCacheSize();
diff --git a/src/components/ui/Tabs/TabItem.tsx b/src/components/ui/Tabs/TabItem.tsx
index 815dced8c..55dee42c6 100644
--- a/src/components/ui/Tabs/TabItem.tsx
+++ b/src/components/ui/Tabs/TabItem.tsx
@@ -12,8 +12,8 @@ export interface IProps {
   title?: string; // it is used on Tabs.tsx
 }
 
-function TabItem({ children, title = '' }: IProps): ReactElement {
+const TabItem = ({ children, title = '' }: IProps): ReactElement => {
   return <Fragment key={title}>{children}</Fragment>;
-}
+};
 
 export default TabItem;
diff --git a/src/components/ui/button/index.tsx b/src/components/ui/button/index.tsx
index 3c31ca952..c37a88afa 100644
--- a/src/components/ui/button/index.tsx
+++ b/src/components/ui/button/index.tsx
@@ -237,6 +237,7 @@ class ButtonComponent extends Component<IProps, IState> {
     ) : (
       <button
         id={id}
+        // eslint-disable-next-line react/button-has-type
         type={type}
         onClick={onClick}
         className={classnames({
diff --git a/src/components/ui/select/index.tsx b/src/components/ui/select/index.tsx
index 902eb7748..650600fb3 100644
--- a/src/components/ui/select/index.tsx
+++ b/src/components/ui/select/index.tsx
@@ -191,12 +191,23 @@ class SelectComponent extends Component<IProps, IState> {
     this.arrowKeysHandler = this.arrowKeysHandler.bind(this);
   }
 
-  componentDidUpdate(): void {
-    const { open } = this.state;
+  UNSAFE_componentWillMount(): void {
+    const { value } = this.props;
 
-    if (this.searchInputRef?.current && open) {
-      this.searchInputRef.current.focus();
+    if (this.componentRef?.current) {
+      this.componentRef.current.removeEventListener(
+        'keydown',
+        this.keyListener,
+      );
     }
+
+    if (value) {
+      this.setState({
+        value,
+      });
+    }
+
+    this.setFilter();
   }
 
   componentDidMount(): void {
@@ -212,23 +223,12 @@ class SelectComponent extends Component<IProps, IState> {
     window.addEventListener('keydown', this.arrowKeysHandler, false);
   }
 
-  UNSAFE_componentWillMount(): void {
-    const { value } = this.props;
-
-    if (this.componentRef?.current) {
-      this.componentRef.current.removeEventListener(
-        'keydown',
-        this.keyListener,
-      );
-    }
+  componentDidUpdate(): void {
+    const { open } = this.state;
 
-    if (value) {
-      this.setState({
-        value,
-      });
+    if (this.searchInputRef?.current && open) {
+      this.searchInputRef.current.focus();
     }
-
-    this.setFilter();
   }
 
   componentWillUnmount(): void {