From 7a3aa9be2e5deacbc374a6a71257c7fad946a48e Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Thu, 11 Jul 2019 15:11:09 -0600
Subject: [PATCH 1/2] Remove unused identityEnabled property from
 ValidatedServerConfig

See https://github.com/vector-im/riot-web/issues/10229
---
 src/components/views/auth/ServerTypeSelector.js | 1 -
 src/utils/AutoDiscoveryUtils.js                 | 2 --
 test/test-utils.js                              | 1 -
 3 files changed, 4 deletions(-)

diff --git a/src/components/views/auth/ServerTypeSelector.js b/src/components/views/auth/ServerTypeSelector.js
index 602de72f3f4..fa76bc85124 100644
--- a/src/components/views/auth/ServerTypeSelector.js
+++ b/src/components/views/auth/ServerTypeSelector.js
@@ -39,7 +39,6 @@ export const TYPES = {
             hsName: "matrix.org",
             hsNameIsDifferent: false,
             isUrl: "https://vector.im",
-            identityEnabled: true,
         }),
     },
     PREMIUM: {
diff --git a/src/utils/AutoDiscoveryUtils.js b/src/utils/AutoDiscoveryUtils.js
index e83e0348cae..990a84a6b5f 100644
--- a/src/utils/AutoDiscoveryUtils.js
+++ b/src/utils/AutoDiscoveryUtils.js
@@ -31,7 +31,6 @@ export class ValidatedServerConfig {
     hsNameIsDifferent: string;
 
     isUrl: string;
-    identityEnabled: boolean;
 
     isDefault: boolean;
 }
@@ -236,7 +235,6 @@ export default class AutoDiscoveryUtils {
             hsName: preferredHomeserverName,
             hsNameIsDifferent: url.hostname !== preferredHomeserverName,
             isUrl: preferredIdentityUrl,
-            identityEnabled: !SdkConfig.get()['disable_identity_server'],
             isDefault: false,
         });
     }
diff --git a/test/test-utils.js b/test/test-utils.js
index 54705434e28..5f78508f460 100644
--- a/test/test-utils.js
+++ b/test/test-utils.js
@@ -268,7 +268,6 @@ export function mkServerConfig(hsUrl, isUrl) {
         hsName: "TEST_ENVIRONMENT",
         hsNameIsDifferent: false, // yes, we lie
         isUrl,
-        identityEnabled: true,
     });
 }
 

From 285b12653083cbc0d6b26ed4a288d8670310d3f1 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Thu, 11 Jul 2019 15:14:05 -0600
Subject: [PATCH 2/2] Appease the linter

---
 src/utils/AutoDiscoveryUtils.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/utils/AutoDiscoveryUtils.js b/src/utils/AutoDiscoveryUtils.js
index 990a84a6b5f..c21377a034a 100644
--- a/src/utils/AutoDiscoveryUtils.js
+++ b/src/utils/AutoDiscoveryUtils.js
@@ -18,7 +18,6 @@ import React from 'react';
 import {AutoDiscovery} from "matrix-js-sdk";
 import {_t, _td, newTranslatableError} from "../languageHandler";
 import {makeType} from "./TypeUtils";
-import SdkConfig from "../SdkConfig";
 
 const LIVELINESS_DISCOVERY_ERRORS = [
     AutoDiscovery.ERROR_INVALID_HOMESERVER,