Skip to content

Don't show empty privacy section #32582

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
dbkr merged 3 commits into from
Feb 20, 2026
Merged

Don't show empty privacy section #32582

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
cd02b9f
Don't show empty privacy section
dbkr Feb 19, 2026
fa6a3b9
Move test
dbkr Feb 19, 2026
90eea70
Merge branch 'develop' into dbkr/no_empty_privacy
dbkr Feb 20, 2026
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
4 changes: 0 additions & 4 deletions src/components/views/settings/discovery/DiscoverySettings.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,6 @@ import { Alert } from "@vector-im/compound-web";
import { getThreepidsWithBindStatus } from "../../../../boundThreepids";
import { useMatrixClientContext } from "../../../../contexts/MatrixClientContext";
import { type ThirdPartyIdentifier } from "../../../../AddThreepid";
import SettingsStore from "../../../../settings/SettingsStore";
import { UIFeature } from "../../../../settings/UIFeature";
import { _t } from "../../../../languageHandler";
import SetIdServer from "../SetIdServer";
import { SettingsSubsection } from "../shared/SettingsSubsection";
Expand Down Expand Up @@ -124,8 +122,6 @@ export const DiscoverySettings: React.FC = () => {
})();
}, [client, getThreepidState]);

if (!SettingsStore.getValue(UIFeature.ThirdPartyID)) return null;

if (mustAgreeToTerms && requiredPolicyInfo.policiesAndServices) {
const intro = (
<Alert type="info" title={_t("settings|general|discovery_needs_terms_title")}>
Expand Down
20 changes: 16 additions & 4 deletions src/components/views/settings/tabs/user/SecurityUserSettingsTab.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -362,6 +362,21 @@ export default class SecurityUserSettingsTab extends React.Component<IProps, ISt
}
}

let discoverySection;
if (SettingsStore.getValue(UIFeature.ThirdPartyID)) {
discoverySection = <DiscoverySettings />;
}

let privacySection;
if (discoverySection || posthogSection) {
privacySection = (
<SettingsSection heading={_t("common|privacy")}>
{discoverySection}
{posthogSection}
</SettingsSection>
);
}

return (
<SettingsTab>
{warning}
Expand All @@ -370,10 +385,7 @@ export default class SecurityUserSettingsTab extends React.Component<IProps, ISt
{secureBackup}
{eventIndex}
</SettingsSection>
<SettingsSection heading={_t("common|privacy")}>
<DiscoverySettings />
{posthogSection}
</SettingsSection>
{privacySection}
{advancedSection}
</SettingsTab>
);
Expand Down
Loading