From 655d0c615a6bfb627440971cc337de307c22a024 Mon Sep 17 00:00:00 2001
From: Matthew Hodgson <matthew@matrix.org>
Date: Thu, 26 Oct 2017 17:57:49 +0100
Subject: [PATCH] remove spurious Sign In button and legacy Return to App
 buttons

---
 src/components/structures/login/Login.js        |  5 ++++-
 src/components/structures/login/Registration.js | 16 +++++++++++++---
 2 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/src/components/structures/login/Login.js b/src/components/structures/login/Login.js
index 44363d83ad..789b066074 100644
--- a/src/components/structures/login/Login.js
+++ b/src/components/structures/login/Login.js
@@ -346,12 +346,15 @@ module.exports = React.createClass({
         }
 
         let returnToAppJsx;
-        if (this.props.onCancelClick && theme !== 'status') {
+        /*
+        // with the advent of ILAG I don't think we need this any more
+        if (this.props.onCancelClick) {
             returnToAppJsx =
                 <a className="mx_Login_create" onClick={this.props.onCancelClick} href="#">
                     { _t('Return to app') }
                 </a>;
         }
+        */
 
         let serverConfig;
         let header;
diff --git a/src/components/structures/login/Registration.js b/src/components/structures/login/Registration.js
index 4e95b62be3..5634c28197 100644
--- a/src/components/structures/login/Registration.js
+++ b/src/components/structures/login/Registration.js
@@ -382,6 +382,8 @@ module.exports = React.createClass({
         }
 
         let returnToAppJsx;
+        /*
+        // with the advent of ILAG I don't think we need this any more
         if (this.props.onCancelClick) {
             returnToAppJsx = (
                 <a className="mx_Login_create" onClick={this.props.onCancelClick} href="#">
@@ -389,6 +391,7 @@ module.exports = React.createClass({
                 </a>
             );
         }
+        */
 
         let header;
         let errorText;
@@ -402,6 +405,15 @@ module.exports = React.createClass({
             }
         }
 
+        let signIn;
+        if (!this.state.doingUIAuth) {
+            signIn = (
+                <a className="mx_Login_create" onClick={this.props.onLoginClick} href="#">
+                    { theme === 'status' ? _t('Sign in') : _t('I already have an account') }
+                </a>
+            );
+        }
+
         return (
             <LoginPage>
                 <div className="mx_Login_box">
@@ -413,9 +425,7 @@ module.exports = React.createClass({
                     />
                     { header }
                     { registerBody }
-                    <a className="mx_Login_create" onClick={this.props.onLoginClick} href="#">
-                        { theme === 'status' ? _t('Sign in') : _t('I already have an account') }
-                    </a>
+                    { signIn }
                     { errorText }
                     { returnToAppJsx }
                     <LoginFooter />