From 0ef8e2a8f4b8305a8f989c73856bbc45e13bf870 Mon Sep 17 00:00:00 2001
From: Luke Barnard <lukeb@openmarket.com>
Date: Tue, 28 Feb 2017 15:18:00 +0000
Subject: [PATCH] Various fixes

---
 src/components/structures/MatrixChat.js         | 1 -
 src/components/structures/login/Registration.js | 9 ++++-----
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/src/components/structures/MatrixChat.js b/src/components/structures/MatrixChat.js
index 9a1eb90620..1a828cd3e1 100644
--- a/src/components/structures/MatrixChat.js
+++ b/src/components/structures/MatrixChat.js
@@ -1131,7 +1131,6 @@ module.exports = React.createClass({
                     customIsUrl={this.getCurrentIsUrl()}
                     registrationUrl={this.props.registrationUrl}
                     defaultDeviceDisplayName={this.props.defaultDeviceDisplayName}
-                    onTeamMemberRegistered={this.onTeamMemberRegistered}
                     onLoggedIn={this.onRegistered}
                     onLoginClick={this.onLoginClick}
                     onRegisterClick={this.onRegisterClick}
diff --git a/src/components/structures/login/Registration.js b/src/components/structures/login/Registration.js
index 389cabd833..737dd5939f 100644
--- a/src/components/structures/login/Registration.js
+++ b/src/components/structures/login/Registration.js
@@ -60,7 +60,6 @@ module.exports = React.createClass({
             teamServerURL: React.PropTypes.string.isRequired,
         }),
         teamSelected: React.PropTypes.object,
-        onTeamMemberRegistered: React.PropTypes.func.isRequired,
 
         defaultDeviceDisplayName: React.PropTypes.string,
 
@@ -259,7 +258,7 @@ module.exports = React.createClass({
                     identityServerUrl: self.registerLogic.getIdentityServerUrl(),
                     accessToken: response.access_token
                 }, teamToken);
-            }).done(() => {
+            }).then(() => {
                 self._setupPushers();
             });
         }, function(err) {
@@ -276,7 +275,7 @@ module.exports = React.createClass({
     },
 
     _setupPushers: function() {
-        if (!self.props.brand) {
+        if (!this.props.brand) {
             return;
         }
         MatrixClientPeg.get().getPushers().done((resp)=>{
@@ -284,9 +283,9 @@ module.exports = React.createClass({
             for (var i = 0; i < pushers.length; ++i) {
                 if (pushers[i].kind == 'email') {
                     var emailPusher = pushers[i];
-                    emailPusher.data = { brand: self.props.brand };
+                    emailPusher.data = { brand: this.props.brand };
                     MatrixClientPeg.get().setPusher(emailPusher).done(() => {
-                        console.log("Set email branding to " + self.props.brand);
+                        console.log("Set email branding to " + this.props.brand);
                     }, (error) => {
                         console.error("Couldn't set email branding: " + error);
                     });