From eda2dee63fd3be2d1f3b8d5a5bede8d46c4bfeb2 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Thu, 17 Sep 2020 13:25:18 +0100
Subject: [PATCH] UI Feature Flag: 3PIDs
---
.../views/settings/tabs/user/GeneralUserSettingsTab.js | 4 +++-
src/settings/Settings.ts | 4 ++++
src/settings/UIFeature.ts | 1 +
3 files changed, 8 insertions(+), 1 deletion(-)
diff --git a/src/components/views/settings/tabs/user/GeneralUserSettingsTab.js b/src/components/views/settings/tabs/user/GeneralUserSettingsTab.js
index 42e12077f2..fadb4c756b 100644
--- a/src/components/views/settings/tabs/user/GeneralUserSettingsTab.js
+++ b/src/components/views/settings/tabs/user/GeneralUserSettingsTab.js
@@ -248,7 +248,9 @@ export default class GeneralUserSettingsTab extends React.Component {
// validate 3PID ownership even if we're just adding to the homeserver only.
// For newer homeservers with separate 3PID add and bind methods (MSC2290),
// there is no such concern, so we can always show the HS account 3PIDs.
- if (this.state.haveIdServer || this.state.serverSupportsSeparateAddAndBind === true) {
+ if (SettingsStore.getValue(UIFeature.ThirdPartyID) &&
+ (this.state.haveIdServer || this.state.serverSupportsSeparateAddAndBind === true)
+ ) {
const emails = this.state.loading3pids
?
: