5 files changed, 41 insertions, 36 deletions

diff --git a/src/components/settings/SettingsLayout.tsx b/src/components/settings/SettingsLayout.tsx
index 17f8c3e33..a5fa13d71 100644
--- a/src/components/settings/SettingsLayout.tsx
+++ b/src/components/settings/SettingsLayout.tsx
@@ -41,7 +41,7 @@ class SettingsLayout extends Component<PropsWithChildren<IProps>> {
   }
 
   handleKeyDown(e: KeyboardEvent): void {
-    if (isEscKeyPress(e.keyCode)) {
+    if (isEscKeyPress(e.key)) {
       this.props.closeSettings();
     }
   }
diff --git a/src/components/settings/releaseNotes/ReleaseNotesDashboard.tsx b/src/components/settings/releaseNotes/ReleaseNotesDashboard.tsx
index e874b4469..e2867ab8e 100644
--- a/src/components/settings/releaseNotes/ReleaseNotesDashboard.tsx
+++ b/src/components/settings/releaseNotes/ReleaseNotesDashboard.tsx
@@ -49,6 +49,7 @@ class ReleaseNotesDashboard extends Component<IProps, IState> {
       intl,
     );
 
+    // eslint-disable-next-line @eslint-react/no-set-state-in-component-did-mount
     this.setState({
       data,
     });
diff --git a/src/components/settings/releaseNotes/ReleaseNotesLayout.tsx b/src/components/settings/releaseNotes/ReleaseNotesLayout.tsx
index 23db7141e..4fb31d053 100644
--- a/src/components/settings/releaseNotes/ReleaseNotesLayout.tsx
+++ b/src/components/settings/releaseNotes/ReleaseNotesLayout.tsx
@@ -43,8 +43,8 @@ class ReleaseNotesLayout extends Component<IProps> {
     );
   }
 
-  handleKeyDown(e) {
-    if (isEscKeyPress(e.keyCode)) {
+  handleKeyDown(e: KeyboardEvent) {
+    if (isEscKeyPress(e.key)) {
       this.props.actions!.ui.closeSettings();
     }
   }
diff --git a/src/components/settings/settings/EditSettingsForm.tsx b/src/components/settings/settings/EditSettingsForm.tsx
index 84057091d..c3e8d46a0 100644
--- a/src/components/settings/settings/EditSettingsForm.tsx
+++ b/src/components/settings/settings/EditSettingsForm.tsx
@@ -1087,34 +1087,34 @@ class EditSettingsForm extends Component<IProps, IState> {
                   <H3>
                     {intl.formatMessage(messages.subheadlineFerdiumProfile)}
                   </H3>
-                  <p>
-                    <div className="settings__open-settings-file-container">
-                      <Button
-                        buttonType="secondary"
-                        label={intl.formatMessage(
-                          messages.buttonOpenFerdiumProfileFolder,
-                        )}
-                        className="settings__open-settings-file-button"
-                        onClick={() => openPath(profileFolder)}
-                      />
-                      <Button
-                        buttonType="secondary"
-                        label={intl.formatMessage(
-                          messages.buttonOpenFerdiumServiceRecipesFolder,
-                        )}
-                        className="settings__open-settings-file-button"
-                        onClick={() => openPath(recipeFolder)}
-                      />
-                      <Button
-                        buttonType="secondary"
-                        label={intl.formatMessage(
-                          messages.buttonOpenImportExport,
-                        )}
-                        className="settings__open-settings-file-button"
-                        onClick={() => openExternalUrl(serverURL, true)}
-                      />
-                    </div>
-                  </p>
+
+                  <div className="settings__open-settings-file-container">
+                    <Button
+                      buttonType="secondary"
+                      label={intl.formatMessage(
+                        messages.buttonOpenFerdiumProfileFolder,
+                      )}
+                      className="settings__open-settings-file-button"
+                      onClick={() => openPath(profileFolder)}
+                    />
+                    <Button
+                      buttonType="secondary"
+                      label={intl.formatMessage(
+                        messages.buttonOpenFerdiumServiceRecipesFolder,
+                      )}
+                      className="settings__open-settings-file-button"
+                      onClick={() => openPath(recipeFolder)}
+                    />
+                    <Button
+                      buttonType="secondary"
+                      label={intl.formatMessage(
+                        messages.buttonOpenImportExport,
+                      )}
+                      className="settings__open-settings-file-button"
+                      onClick={() => openExternalUrl(serverURL, true)}
+                    />
+                  </div>
+
                   <p className="settings__help">
                     {intl.formatMessage(messages.serverHelp, {
                       serverURL,
diff --git a/src/components/settings/supportFerdium/SupportFerdiumDashboard.tsx b/src/components/settings/supportFerdium/SupportFerdiumDashboard.tsx
index 065690fb5..3a4592666 100644
--- a/src/components/settings/supportFerdium/SupportFerdiumDashboard.tsx
+++ b/src/components/settings/supportFerdium/SupportFerdiumDashboard.tsx
@@ -33,7 +33,7 @@ const SupportFerdiumDashboard = () => {
             <a
               href="https://twitter.com/ferdiumteam/"
               target="_blank"
-              rel="noreferrer"
+              rel="noreferrer noopener"
             >
               <img
                 alt="Twitter Follow"
@@ -43,14 +43,18 @@ const SupportFerdiumDashboard = () => {
             <a
               href="https://github.com/ferdium/ferdium-app"
               target="_blank"
-              rel="noreferrer"
+              rel="noreferrer noopener"
             >
               <img
                 alt="GitHub Stars"
                 src="https://img.shields.io/github/stars/ferdium/ferdium-app?style=social"
               />
             </a>
-            <a target="_blank" href={FERDIUM_TRANSLATION} rel="noreferrer">
+            <a
+              target="_blank"
+              href={FERDIUM_TRANSLATION}
+              rel="noreferrer noopener"
+            >
               <img
                 src="https://badges.crowdin.net/ferdium-app/localized.svg"
                 alt="Crowdin"
@@ -59,7 +63,7 @@ const SupportFerdiumDashboard = () => {
             <a
               href="https://opencollective.com/ferdium#section-contributors"
               target="_blank"
-              rel="noreferrer"
+              rel="noreferrer noopener"
             >
               <img
                 alt="Open Collective backers"
@@ -72,7 +76,7 @@ const SupportFerdiumDashboard = () => {
             <a
               href="https://github.com/ferdium/ferdium-app#contributors-"
               target="_blank"
-              rel="noreferrer"
+              rel="noreferrer noopener"
             >
               <img
                 alt="GitHub contributors (non-exhaustive)"