From 02da6fdbd505b73c91c583b5fc4f03e38785ad68 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Mon, 19 Jun 2017 16:40:33 +0100
Subject: [PATCH 1/2] Fix infinite spinner on email registration

Remove setTimeout on dialog display as it's no longer necessary
and causes races.
---
 src/createRoom.js | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/createRoom.js b/src/createRoom.js
index bf0c0fee1c..8f0f9bd148 100644
--- a/src/createRoom.js
+++ b/src/createRoom.js
@@ -76,10 +76,7 @@ function createRoom(opts) {
         }
     ];
 
-    let modal;
-    setTimeout(()=>{
-        modal = Modal.createDialog(Loader, null, 'mx_Dialog_spinner');
-    }, 0);
+    const modal = Modal.createDialog(Loader, null, 'mx_Dialog_spinner');
 
     let roomId;
     return client.createRoom(createOpts).finally(function() {

From 640b7a74a2e117c024245b75ad8a0c9802c3eaeb Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Mon, 19 Jun 2017 16:45:40 +0100
Subject: [PATCH 2/2] Remove unnecessary if

---
 src/createRoom.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/createRoom.js b/src/createRoom.js
index 8f0f9bd148..ce83f31c27 100644
--- a/src/createRoom.js
+++ b/src/createRoom.js
@@ -80,7 +80,7 @@ function createRoom(opts) {
 
     let roomId;
     return client.createRoom(createOpts).finally(function() {
-        if (modal) modal.close();
+        modal.close();
     }).then(function(res) {
         roomId = res.room_id;
         if (opts.dmUserId) {