diff --git a/src/components/views/settings/discovery/DiscoverySettings.tsx b/src/components/views/settings/discovery/DiscoverySettings.tsx index d240d53d7c7..6fbc91874c8 100644 --- a/src/components/views/settings/discovery/DiscoverySettings.tsx +++ b/src/components/views/settings/discovery/DiscoverySettings.tsx @@ -51,7 +51,6 @@ export const DiscoverySettings: React.FC = () => { const [emails, setEmails] = useState([]); const [phoneNumbers, setPhoneNumbers] = useState([]); const [idServerName, setIdServerName] = useState(abbreviateUrl(client.getIdentityServerUrl())); - const [canMake3pidChanges, setCanMake3pidChanges] = useState(false); const [requiredPolicyInfo, setRequiredPolicyInfo] = useState({ // This object is passed along to a component for handling @@ -88,11 +87,6 @@ export const DiscoverySettings: React.FC = () => { try { await getThreepidState(); - const capabilities = await client.getCapabilities(); - setCanMake3pidChanges( - !capabilities["m.3pid_changes"] || capabilities["m.3pid_changes"].enabled === true, - ); - // By starting the terms flow we get the logic for checking which terms the user has signed // for free. So we might as well use that for our own purposes. const idServerUrl = client.getIdentityServerUrl(); @@ -166,7 +160,7 @@ export const DiscoverySettings: React.FC = () => { medium={ThreepidMedium.Email} threepids={emails} onChange={getThreepidState} - disabled={!canMake3pidChanges} + disabled={!hasTerms} isLoading={isLoadingThreepids} /> @@ -180,7 +174,7 @@ export const DiscoverySettings: React.FC = () => { medium={ThreepidMedium.Phone} threepids={phoneNumbers} onChange={getThreepidState} - disabled={!canMake3pidChanges} + disabled={!hasTerms} isLoading={isLoadingThreepids} />