From 6bdf7f1ee9657d64c995252beba1a9350958d928 Mon Sep 17 00:00:00 2001
From: Will Hunt <willh@matrix.org>
Date: Tue, 30 Mar 2021 17:43:03 +0100
Subject: [PATCH 1/2] Allow specifying a custom defaultHomeServer

---
 assets/config.json           | 3 ++-
 src/domain/RootViewModel.js  | 2 +-
 src/platform/web/Platform.js | 4 ++++
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/assets/config.json b/assets/config.json
index a98c5ba9..703ae1e6 100644
--- a/assets/config.json
+++ b/assets/config.json
@@ -3,5 +3,6 @@
     "appId": "io.element.hydrogen.web",
     "gatewayUrl": "https://matrix.org",
     "applicationServerKey": "BC-gpSdVHEXhvHSHS0AzzWrQoukv2BE7KzpoPO_FfPacqOo3l1pdqz7rSgmB04pZCWaHPz7XRe6fjLaC-WPDopM"
-  }
+  },
+  "defaultHomeServer": "matrix.org"
 }
diff --git a/src/domain/RootViewModel.js b/src/domain/RootViewModel.js
index cb22bee2..f6e566e3 100644
--- a/src/domain/RootViewModel.js
+++ b/src/domain/RootViewModel.js
@@ -99,7 +99,7 @@ export class RootViewModel extends ViewModel {
     _showLogin() {
         this._setSection(() => {
             this._loginViewModel = new LoginViewModel(this.childOptions({
-                defaultHomeServer: "https://matrix.org",
+                defaultHomeServer: this.platform.config["defaultHomeServer"],
                 createSessionContainer: this._createSessionContainer,
                 ready: sessionContainer => {
                     // we don't want to load the session container again,
diff --git a/src/platform/web/Platform.js b/src/platform/web/Platform.js
index 747855de..549d49c3 100644
--- a/src/platform/web/Platform.js
+++ b/src/platform/web/Platform.js
@@ -125,6 +125,10 @@ export class Platform {
         return loadOlm(this._config.olm);
     }
 
+    get config() {
+        return this._config;
+    }
+
     async loadOlmWorker() {
         if (!window.WebAssembly) {
             return await loadOlmWorker(this._config);

From 110f0821f05a56708a4926a106635395b5ffa37c Mon Sep 17 00:00:00 2001
From: Will Hunt <willh@matrix.org>
Date: Wed, 31 Mar 2021 17:01:49 +0100
Subject: [PATCH 2/2] Add to index.html

---
 index.html | 1 +
 1 file changed, 1 insertion(+)

diff --git a/index.html b/index.html
index d1a9db0d..0b266ff3 100644
--- a/index.html
+++ b/index.html
@@ -24,6 +24,7 @@
             main(new Platform(document.body, {
                 worker: "src/worker.js",
                 downloadSandbox: "assets/download-sandbox.html",
+                defaultHomeServer: "matrix.org",
                 // NOTE: uncomment this if you want the service worker for local development
                 // serviceWorker: "sw.js",
                 // NOTE: provide push config if you want push notifs for local development