Skip to content

fix: use help_encryption_url of config instead of hardcoded https://element.io/help#encryption5 #30746

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Sep 22, 2025
Merged

fix: use help_encryption_url of config instead of hardcoded https://element.io/help#encryption5 #30746

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7490287
fix: use `help_encryption_url` instead of hardcoded `https://element.…
florianduros Sep 11, 2025
c368585
test: update snapshot
florianduros Sep 11, 2025
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
3 changes: 2 additions & 1 deletion src/components/views/dialogs/ConfirmKeyStorageOffDialog.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ import { EncryptionCardButtons } from "../settings/encryption/EncryptionCardButt
import { type OpenToTabPayload } from "../../../dispatcher/payloads/OpenToTabPayload";
import { Action } from "../../../dispatcher/actions";
import { UserTab } from "./UserTab";
import SdkConfig from "../../../SdkConfig";

interface Props {
onFinished: (dismissed: boolean) => void;
Expand Down Expand Up @@ -60,7 +61,7 @@ export default class ConfirmKeyStorageOffDialog extends React.Component<Props> {
a: (sub) => (
<>
<br />
<a href="https://element.io/help#encryption5" target="_blank" rel="noreferrer noopener">
<a href={SdkConfig.get("help_encryption_url")} target="_blank" rel="noreferrer noopener">
{sub} <PopOutIcon />
</a>
</>
Expand Down
3 changes: 2 additions & 1 deletion src/components/views/settings/encryption/KeyStoragePanel.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ import { SettingsSection } from "../shared/SettingsSection";
import { _t } from "../../../../languageHandler";
import { SettingsHeader } from "../SettingsHeader";
import { useKeyStoragePanelViewModel } from "../../../viewmodels/settings/encryption/KeyStoragePanelViewModel";
import SdkConfig from "../../../../SdkConfig";

interface Props {
/**
Expand Down Expand Up @@ -55,7 +56,7 @@ export const KeyStoragePanel: React.FC<Props> = ({ onKeyStorageDisableClick }) =
}
subHeading={_t("settings|encryption|key_storage|description", undefined, {
a: (sub) => (
<a href="https://element.io/help#encryption5" target="_blank" rel="noreferrer noopener">
<a href={SdkConfig.get("help_encryption_url")} target="_blank" rel="noreferrer noopener">
{sub}
</a>
),
Expand Down
2 changes: 1 addition & 1 deletion ...nit-tests/components/views/dialogs/__snapshots__/ConfirmKeyStorageOffDialog-test.tsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ exports[`ConfirmKeyStorageOffDialog renders 1`] = `
If you sign out of all your devices you will lose your message history and will need to verify all your existing contacts again.
<br />
<a
href="https://element.io/help#encryption5"
href="https://element.io/help#encryption"
rel="noreferrer noopener"
target="_blank"
>
Expand Down
Loading