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 1/2] 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
                 ? <Spinner />
                 : <EmailAddresses
diff --git a/src/settings/Settings.ts b/src/settings/Settings.ts
index e6af135e72..7f2ba25a05 100644
--- a/src/settings/Settings.ts
+++ b/src/settings/Settings.ts
@@ -631,4 +631,8 @@ export const SETTINGS: {[setting: string]: ISetting} = {
         supportedLevels: LEVELS_UI_FEATURE,
         default: true,
     },
+    [UIFeature.ThirdPartyID]: {
+        supportedLevels: LEVELS_UI_FEATURE,
+        default: true,
+    },
 };
diff --git a/src/settings/UIFeature.ts b/src/settings/UIFeature.ts
index a71f72db7d..19eabf3d90 100644
--- a/src/settings/UIFeature.ts
+++ b/src/settings/UIFeature.ts
@@ -20,4 +20,5 @@ export enum UIFeature {
     Widgets = "UIFeature.widgets",
     Voip = "UIFeature.voip",
     Feedback = "UIFeature.feedback",
+    ThirdPartyID = "UIFeature.thirdPartyId",
 }

From 1a965b1cb704f50ec2ea7ab9494451b3d828120e Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Fri, 18 Sep 2020 11:15:48 +0100
Subject: [PATCH 2/2] UIF 3PID implies UIF Identity Server

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/settings/Settings.ts | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/settings/Settings.ts b/src/settings/Settings.ts
index 4a4594b6dc..2a699897a6 100644
--- a/src/settings/Settings.ts
+++ b/src/settings/Settings.ts
@@ -649,6 +649,8 @@ export const SETTINGS: {[setting: string]: ISetting} = {
     [UIFeature.IdentityServer]: {
         supportedLevels: LEVELS_UI_FEATURE,
         default: true,
+        // Identity Server (Discovery) Settings make no sense if 3PIDs in general are hidden
+        controller: new UIFeatureController(UIFeature.ThirdPartyID),
     },
     [UIFeature.ThirdPartyID]: {
         supportedLevels: LEVELS_UI_FEATURE,