diff --git a/apps/web/src/components/views/dialogs/UserSettingsDialog.tsx b/apps/web/src/components/views/dialogs/UserSettingsDialog.tsx index 6604577d8c..0570beb0d7 100644 --- a/apps/web/src/components/views/dialogs/UserSettingsDialog.tsx +++ b/apps/web/src/components/views/dialogs/UserSettingsDialog.tsx @@ -20,6 +20,7 @@ import SidebarIcon from "@vector-im/compound-design-tokens/assets/web/icons/side import MicOnIcon from "@vector-im/compound-design-tokens/assets/web/icons/mic-on"; import LockIcon from "@vector-im/compound-design-tokens/assets/web/icons/lock"; import BlockIcon from "@vector-im/compound-design-tokens/assets/web/icons/block"; +import HelpIcon from "@vector-im/compound-design-tokens/assets/web/icons/help"; import TabbedView, { Tab, useActiveTabWithDefault } from "../../structures/TabbedView"; import { _t, _td } from "../../../languageHandler"; @@ -31,6 +32,7 @@ import NotificationUserSettingsTab from "../settings/tabs/user/NotificationUserS import PreferencesUserSettingsTab from "../settings/tabs/user/PreferencesUserSettingsTab"; import VoiceUserSettingsTab from "../settings/tabs/user/VoiceUserSettingsTab"; import MjolnirUserSettingsTab from "../settings/tabs/user/MjolnirUserSettingsTab"; +import HelpUserSettingsTab from "../settings/tabs/user/HelpUserSettingsTab"; import { UIFeature } from "../../../settings/UIFeature"; import BaseDialog from "./BaseDialog"; import SidebarUserSettingsTab from "../settings/tabs/user/SidebarUserSettingsTab"; @@ -253,8 +255,7 @@ export default function UserSettingsDialog(props: IProps): JSX.Element { ), ); } - // JP: Disable help tab for now - /* tabs.push( + tabs.push( new Tab( UserTab.Help, _td("setting|help_about|title"), @@ -262,7 +263,7 @@ export default function UserSettingsDialog(props: IProps): JSX.Element { , "UserSettingsHelpAbout", ), - );*/ + ); return tabs as NonEmptyArray>; }; diff --git a/apps/web/src/components/views/settings/tabs/user/HelpUserSettingsTab.tsx b/apps/web/src/components/views/settings/tabs/user/HelpUserSettingsTab.tsx index f4f67e57d3..fbcbed2a56 100644 --- a/apps/web/src/components/views/settings/tabs/user/HelpUserSettingsTab.tsx +++ b/apps/web/src/components/views/settings/tabs/user/HelpUserSettingsTab.tsx @@ -6,7 +6,7 @@ SPDX-License-Identifier: AGPL-3.0-only OR GPL-3.0-only OR LicenseRef-Element-Com Please see LICENSE files in the repository root for full details. */ -import React, { type JSX, type ReactNode } from "react"; +import React, { type JSX } from "react"; import { logger } from "matrix-js-sdk/src/logger"; import { type EmptyObject } from "matrix-js-sdk/src/matrix"; @@ -21,7 +21,6 @@ import { SettingsSection } from "../../shared/SettingsSection"; import { SettingsSubsection, SettingsSubsectionText } from "../../shared/SettingsSubsection"; import ExternalLink from "../../../elements/ExternalLink"; import MatrixClientContext from "../../../../../contexts/MatrixClientContext"; -import { BugReportDialogButton } from "../../../elements/BugReportDialogButton"; interface IState { appVersion: string | null; @@ -79,118 +78,6 @@ export default class HelpUserSettingsTab extends React.Component - {tocEntry.text} - , - ); - } - - return ( - - {legalLinks} - - ); - } - - private renderCredits(): JSX.Element { - // Note: This is not translated because it is legal text. - // Also,   is ugly but necessary. - return ( - - -
    -
  • - {_t( - "credits|default_cover_photo", - {}, - { - photo: (sub) => ( - - {sub} - - ), - author: (sub) => ( - {sub} - ), - terms: (sub) => ( - - {sub} - - ), - }, - )} -
    • -
  • - {_t( - "credits|twemoji_colr", - {}, - { - colr: (sub) => ( - - {sub} - - ), - author: (sub) => {sub}, - terms: (sub) => ( - - {sub} - - ), - }, - )} -
    • -
  • - {_t( - "credits|twemoji", - {}, - { - twemoji: (sub) => ( - {sub} - ), - author: (sub) => ( - {sub} - ), - terms: (sub) => ( - - {sub} - - ), - }, - )} -
    • -
- - - ); - } - private getVersionTextToCopy = (): string => { const { appVersion, cryptoVersion } = this.getVersionInfo(); return `${appVersion}\n${cryptoVersion}`; @@ -214,42 +101,11 @@ export default class HelpUserSettingsTab extends React.Component; } - let bugReportingSection; - if (SdkConfig.get().bug_report_endpoint_url) { - bugReportingSection = ( - - {_t("bug_reporting|introduction")} - {_t("bug_reporting|description")} - - } - > - - - {_t( - "bug_reporting|matrix_security_issue", - {}, - { - a: (sub) => ( - - {sub} - - ), - }, - )} - - - ); - } - const { appVersion, cryptoVersion } = this.getVersionInfo(); return ( - {bugReportingSection} @@ -262,8 +118,6 @@ export default class HelpUserSettingsTab extends React.Component - {this.renderLegal()} - {this.renderCredits()} {_t( diff --git a/apps/web/test/unit-tests/components/views/dialogs/UserSettingsDialog-test.tsx b/apps/web/test/unit-tests/components/views/dialogs/UserSettingsDialog-test.tsx index 9368a73cac..90f96b4fdd 100644 --- a/apps/web/test/unit-tests/components/views/dialogs/UserSettingsDialog-test.tsx +++ b/apps/web/test/unit-tests/components/views/dialogs/UserSettingsDialog-test.tsx @@ -200,8 +200,7 @@ describe("", () => { expect(screen.getByRole("heading", { level: 1 })).toHaveTextContent("Ignored Users"); }); - // HealthChat disables the Help tab "for now" (UserSettingsDialog.tsx). Restore when re-enabled. - it.skip("renders with help tab selected", () => { + it("renders with help tab selected", () => { const { container } = render(getComponent({ initialTabId: UserTab.Help })); expect(getActiveTabLabel(container)).toEqual("Help & About"); diff --git a/apps/web/test/unit-tests/components/views/dialogs/__snapshots__/UserSettingsDialog-test.tsx.snap b/apps/web/test/unit-tests/components/views/dialogs/__snapshots__/UserSettingsDialog-test.tsx.snap index 147cbcfd61..dcf3e0f38c 100644 --- a/apps/web/test/unit-tests/components/views/dialogs/__snapshots__/UserSettingsDialog-test.tsx.snap +++ b/apps/web/test/unit-tests/components/views/dialogs/__snapshots__/UserSettingsDialog-test.tsx.snap @@ -219,5 +219,34 @@ NodeList [ Encryption , + , ] `;