From 91c5f2f35a800323b67f87572c813bcc48e2ec30 Mon Sep 17 00:00:00 2001
From: Gustavo Santos <gefgu@hotmail.com>
Date: Mon, 3 Oct 2022 19:58:30 -0300
Subject: [PATCH 1/3] feat(faq): remove keyboard shortcuts button

Signed-off-by: Gustavo Santos <gefgu@hotmail.com>
---
 .../settings/tabs/user/HelpUserSettingsTab.tsx     | 14 --------------
 1 file changed, 14 deletions(-)

diff --git a/src/components/views/settings/tabs/user/HelpUserSettingsTab.tsx b/src/components/views/settings/tabs/user/HelpUserSettingsTab.tsx
index 7bb06f197b7..79693de1a34 100644
--- a/src/components/views/settings/tabs/user/HelpUserSettingsTab.tsx
+++ b/src/components/views/settings/tabs/user/HelpUserSettingsTab.tsx
@@ -26,10 +26,6 @@ import Modal from "../../../../../Modal";
 import PlatformPeg from "../../../../../PlatformPeg";
 import UpdateCheckButton from "../../UpdateCheckButton";
 import BugReportDialog from '../../../dialogs/BugReportDialog';
-import { OpenToTabPayload } from "../../../../../dispatcher/payloads/OpenToTabPayload";
-import { Action } from "../../../../../dispatcher/actions";
-import { UserTab } from "../../../dialogs/UserTab";
-import dis from "../../../../../dispatcher/dispatcher";
 import CopyableText from "../../../elements/CopyableText";
 
 interface IProps {
@@ -171,13 +167,6 @@ export default class HelpUserSettingsTab extends React.Component<IProps, IState>
         return `${appVersion}\n${olmVersion}`;
     };
 
-    private onKeyboardShortcutsClicked = (): void => {
-        dis.dispatch<OpenToTabPayload>({
-            action: Action.ViewUserSettings,
-            initialTabId: UserTab.Keyboard,
-        });
-    };
-
     render() {
         const brand = SdkConfig.get().brand;
 
@@ -276,9 +265,6 @@ export default class HelpUserSettingsTab extends React.Component<IProps, IState>
                     <div className='mx_SettingsTab_subsectionText'>
                         { faqText }
                     </div>
-                    <AccessibleButton kind="primary" onClick={this.onKeyboardShortcutsClicked}>
-                        { _t("Keyboard Shortcuts") }
-                    </AccessibleButton>
                 </div>
                 <div className='mx_SettingsTab_section'>
                     <span className='mx_SettingsTab_subheading'>{ _t("Versions") }</span>

From 9409fbb6314bdf34657379b81458545a7de16932 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Fri, 7 Jul 2023 15:11:15 +0100
Subject: [PATCH 2/3] Update HelpUserSettingsTab.tsx

---
 .../views/settings/tabs/user/HelpUserSettingsTab.tsx     | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/src/components/views/settings/tabs/user/HelpUserSettingsTab.tsx b/src/components/views/settings/tabs/user/HelpUserSettingsTab.tsx
index ac21a26be88..a1d57943811 100644
--- a/src/components/views/settings/tabs/user/HelpUserSettingsTab.tsx
+++ b/src/components/views/settings/tabs/user/HelpUserSettingsTab.tsx
@@ -232,14 +232,6 @@ export default class HelpUserSettingsTab extends React.Component<IProps, IState>
         return `${appVersion}\n${olmVersion}`;
     };
 
-
-    private onKeyboardShortcutsClicked = (): void => {
-        dis.dispatch<OpenToTabPayload>({
-            action: Action.ViewUserSettings,
-            initialTabId: UserTab.Keyboard,
-        });
-    };
-
     public render(): React.ReactNode {
         const brand = SdkConfig.get().brand;
 
@@ -338,6 +330,7 @@ export default class HelpUserSettingsTab extends React.Component<IProps, IState>
             <SettingsTab>
                 <SettingsSection heading={_t("Help & About")}>
                     {bugReportingSection}
+                    <SettingsSubsection heading={_t("FAQ")} description={faqText} />
                     <SettingsSubsection heading={_t("Versions")}>
                         <SettingsSubsectionText>
                             <CopyableText getTextToCopy={this.getVersionTextToCopy}>

From 0f54d712f9b9552619f1a5bc192339b985f7e648 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Fri, 7 Jul 2023 15:15:42 +0100
Subject: [PATCH 3/3] delint

---
 .../views/settings/tabs/user/HelpUserSettingsTab.tsx         | 5 -----
 src/i18n/strings/en_EN.json                                  | 1 -
 2 files changed, 6 deletions(-)

diff --git a/src/components/views/settings/tabs/user/HelpUserSettingsTab.tsx b/src/components/views/settings/tabs/user/HelpUserSettingsTab.tsx
index a1d57943811..e66e15bf5b6 100644
--- a/src/components/views/settings/tabs/user/HelpUserSettingsTab.tsx
+++ b/src/components/views/settings/tabs/user/HelpUserSettingsTab.tsx
@@ -25,10 +25,6 @@ import Modal from "../../../../../Modal";
 import PlatformPeg from "../../../../../PlatformPeg";
 import UpdateCheckButton from "../../UpdateCheckButton";
 import BugReportDialog from "../../../dialogs/BugReportDialog";
-import { OpenToTabPayload } from "../../../../../dispatcher/payloads/OpenToTabPayload";
-import { Action } from "../../../../../dispatcher/actions";
-import { UserTab } from "../../../dialogs/UserTab";
-import dis from "../../../../../dispatcher/dispatcher";
 import CopyableText from "../../../elements/CopyableText";
 import SettingsTab from "../SettingsTab";
 import { SettingsSection } from "../../shared/SettingsSection";
@@ -326,7 +322,6 @@ export default class HelpUserSettingsTab extends React.Component<IProps, IState>
         const { appVersion, olmVersion } = this.getVersionInfo();
 
         return (
-
             <SettingsTab>
                 <SettingsSection heading={_t("Help & About")}>
                     {bugReportingSection}
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index a6cba4d95ff..e5c1635f4db 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -1579,7 +1579,6 @@
     "To report a Matrix-related security issue, please read the Matrix.org <a>Security Disclosure Policy</a>.": "To report a Matrix-related security issue, please read the Matrix.org <a>Security Disclosure Policy</a>.",
     "Help & About": "Help & About",
     "FAQ": "FAQ",
-    "Keyboard Shortcuts": "Keyboard Shortcuts",
     "Versions": "Versions",
     "Homeserver is <code>%(homeserverUrl)s</code>": "Homeserver is <code>%(homeserverUrl)s</code>",
     "Identity server is <code>%(identityServerUrl)s</code>": "Identity server is <code>%(identityServerUrl)s</code>",