From 07826c567546f79901534e65ac3f9668361c2693 Mon Sep 17 00:00:00 2001
From: "J. Ryan Stinnett" <jryans@gmail.com>
Date: Mon, 19 Aug 2019 14:03:38 +0100
Subject: [PATCH 1/2] Hide 3PID discovery sections when no identity server

This hides the email and phone sections of Discovery in the Settings when there
is no IS, as they can't meaningfully be used.

Part of https://github.com/vector-im/riot-web/issues/10528
---
 .../settings/tabs/user/GeneralUserSettingsTab.js   | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/components/views/settings/tabs/user/GeneralUserSettingsTab.js b/src/components/views/settings/tabs/user/GeneralUserSettingsTab.js
index 08550db1d1..b428ef51fa 100644
--- a/src/components/views/settings/tabs/user/GeneralUserSettingsTab.js
+++ b/src/components/views/settings/tabs/user/GeneralUserSettingsTab.js
@@ -189,13 +189,17 @@ export default class GeneralUserSettingsTab extends React.Component {
         const PhoneNumbers = sdk.getComponent("views.settings.discovery.PhoneNumbers");
         const SetIdServer = sdk.getComponent("views.settings.SetIdServer");
 
+        const threepidSection = this.state.haveIdServer ? <div>
+            <span className="mx_SettingsTab_subheading">{_t("Email addresses")}</span>
+            <EmailAddresses />
+
+            <span className="mx_SettingsTab_subheading">{_t("Phone numbers")}</span>
+            <PhoneNumbers />
+        </div> : null;
+
         return (
             <div className="mx_SettingsTab_section">
-                <span className="mx_SettingsTab_subheading">{_t("Email addresses")}</span>
-                <EmailAddresses />
-
-                <span className="mx_SettingsTab_subheading">{_t("Phone numbers")}</span>
-                <PhoneNumbers />
+                {threepidSection}
                 { /* has its own heading as it includes the current ID server */ }
                 <SetIdServer />
             </div>

From d4ecb99d11f8725711d9cc648e11b9b7283806fe Mon Sep 17 00:00:00 2001
From: "J. Ryan Stinnett" <jryans@gmail.com>
Date: Mon, 19 Aug 2019 14:20:01 +0100
Subject: [PATCH 2/2] Show the default IS as a placeholder in Settings

This changes the UX for the set IS field to show the default IS as a placeholder
value (as opposed to an initial value as if the user had actually entered it).

Fixes https://github.com/vector-im/riot-web/issues/10528
---
 src/components/views/settings/SetIdServer.js | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/components/views/settings/SetIdServer.js b/src/components/views/settings/SetIdServer.js
index c0d103a219..8b9c3150a3 100644
--- a/src/components/views/settings/SetIdServer.js
+++ b/src/components/views/settings/SetIdServer.js
@@ -95,8 +95,9 @@ export default class SetIdServer extends React.Component {
         }
 
         this.state = {
+            defaultIdServer,
             currentClientIdServer: MatrixClientPeg.get().getIdentityServerUrl(),
-            idServer: defaultIdServer,
+            idServer: "",
             error: null,
             busy: false,
             disconnectBusy: false,
@@ -265,7 +266,10 @@ export default class SetIdServer extends React.Component {
                 </span>
                 <Field label={_t("Identity Server")}
                     id="mx_SetIdServer_idServer"
-                    type="text" value={this.state.idServer} autoComplete="off"
+                    type="text"
+                    autoComplete="off"
+                    placeholder={this.state.defaultIdServer}
+                    value={this.state.idServer}
                     onChange={this._onIdentityServerChanged}
                     tooltipContent={this._getTooltip()}
                 />