Skip to content
This repository has been archived by the owner on Sep 11, 2024. It is now read-only.

feat(faq): remove keyboard shortcuts button #9342

Merged
merged 6 commits into from
Jul 7, 2023
Merged

feat(faq): remove keyboard shortcuts button #9342

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
91c5f2f
feat(faq): remove keyboard shortcuts button
gefgu Oct 3, 2022
f62b750
Merge branch 'develop' into feat/remove-keyboard-button-in-faq
May 25, 2023
dc18fed
Merge branch 'develop' into feat/remove-keyboard-button-in-faq
May 26, 2023
1a090cc
Merge branch 'develop' into feat/remove-keyboard-button-in-faq
t3chguy Jul 7, 2023
9409fbb
Update HelpUserSettingsTab.tsx
t3chguy Jul 7, 2023
0f54d71
delint
t3chguy Jul 7, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 1 addition & 16 deletions src/components/views/settings/tabs/user/HelpUserSettingsTab.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down Expand Up @@ -232,13 +228,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;

Expand Down Expand Up @@ -336,11 +325,7 @@ export default class HelpUserSettingsTab extends React.Component<IProps, IState>
<SettingsTab>
<SettingsSection heading={_t("Help & About")}>
{bugReportingSection}
<SettingsSubsection heading={_t("FAQ")} description={faqText}>
<AccessibleButton kind="primary" onClick={this.onKeyboardShortcutsClicked}>
{_t("Keyboard Shortcuts")}
</AccessibleButton>
</SettingsSubsection>
<SettingsSubsection heading={_t("FAQ")} description={faqText} />
<SettingsSubsection heading={_t("Versions")}>
<SettingsSubsectionText>
<CopyableText getTextToCopy={this.getVersionTextToCopy}>
Expand Down
1 change: 0 additions & 1 deletion src/i18n/strings/en_EN.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>",
Expand Down