Merge pull request #2473 from jryans/rm-status-hacks

Remove Status theme-specific hacks

src/components/structures/login/Login.js

@@ -1,7 +1,7 @@
 /*
 Copyright 2015, 2016 OpenMarket Ltd
 Copyright 2017 Vector Creations Ltd
-Copyright 2018 New Vector Ltd
+Copyright 2018, 2019 New Vector Ltd
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -24,7 +24,6 @@ import { _t, _td } from '../../../languageHandler';
 import sdk from '../../../index';
 import Login from '../../../Login';
 import SdkConfig from '../../../SdkConfig';
-import SettingsStore from "../../../settings/SettingsStore";
 import { messageForResourceLimitError } from '../../../utils/ErrorUtils';
 import { AutoDiscovery } from "matrix-js-sdk";
 
@@ -533,7 +532,6 @@ module.exports = React.createClass({
         }
 
         let serverConfig;
-        let header;
 
         if (!SdkConfig.get()['disable_custom_urls']) {
             serverConfig = <ServerConfig ref="serverConfig"
@@ -546,15 +544,7 @@ module.exports = React.createClass({
                 delayTimeMs={1000} />;
         }
 
-        // FIXME: remove status.im theme tweaks
+        const header = <h2>{ _t('Sign in') } { loader }</h2>;
-        const theme = SettingsStore.getValue("theme");
-        if (theme !== "status") {
-            header = <h2>{ _t('Sign in') } { loader }</h2>;
-        } else {
-            if (!errorText) {
-                header = <h2>{ _t('Sign in to get started') } { loader }</h2>;
-            }
-        }
 
         let errorTextSection;
         if (errorText) {

src/components/structures/login/Registration.js

@@ -1,7 +1,7 @@
 /*
 Copyright 2015, 2016 OpenMarket Ltd
 Copyright 2017 Vector Creations Ltd
-Copyright 2018 New Vector Ltd
+Copyright 2018, 2019 New Vector Ltd
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -28,7 +28,6 @@ import RegistrationForm from '../../views/login/RegistrationForm';
 import RtsClient from '../../../RtsClient';
 import { _t, _td } from '../../../languageHandler';
 import SdkConfig from '../../../SdkConfig';
-import SettingsStore from "../../../settings/SettingsStore";
 import { messageForResourceLimitError } from '../../../utils/ErrorUtils';
 
 const MIN_PASSWORD_LENGTH = 6;
@@ -404,8 +403,6 @@ module.exports = React.createClass({
         const Spinner = sdk.getComponent("elements.Spinner");
         const ServerConfig = sdk.getComponent('views.login.ServerConfig');
 
-        const theme = SettingsStore.getValue("theme");
-
         let registerBody;
         if (this.state.doingUIAuth) {
             registerBody = (
@@ -458,24 +455,18 @@ module.exports = React.createClass({
             );
         }
 
-        let header;
         let errorText;
-        // FIXME: remove hardcoded Status team tweaks at some point
         const err = this.state.errorText || this.props.defaultServerDiscoveryError;
-        if (theme === 'status' && err) {
+        const header = <h2>{ _t('Create an account') }</h2>;
-            header = <div className="mx_Login_error">{ err }</div>;
-        } else {
-            header = <h2>{ _t('Create an account') }</h2>;
         if (err) {
             errorText = <div className="mx_Login_error">{ err }</div>;
         }
-        }
 
         let signIn;
         if (!this.state.doingUIAuth) {
             signIn = (
                 <a className="mx_Login_create" onClick={this.onLoginClick} href="#">
-                    { theme === 'status' ? _t('Sign in') : _t('I already have an account') }
+                    { _t('I already have an account') }
                 </a>
             );
         }

src/components/views/login/LoginPage.js

@@ -1,5 +1,6 @@
 /*
 Copyright 2015, 2016 OpenMarket Ltd
+Copyright 2019 New Vector Ltd
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -16,44 +17,16 @@ limitations under the License.
 
 'use strict';
 
-import SettingsStore from "../../../settings/SettingsStore";
-
 const React = require('react');
 
 module.exports = React.createClass({
     displayName: 'LoginPage',
 
     render: function() {
-        // FIXME: this should be turned into a proper skin with a StatusLoginPage component
-        if (SettingsStore.getValue("theme") === 'status') {
-            return (
-                <div className="mx_StatusLogin">
-                    <div className="mx_StatusLogin_brand">
-                        <img src="themes/status/img/logo.svg" alt="Status" width="221" height="53" />
-                    </div>
-                    <div className="mx_StatusLogin_content">
-                        <div className="mx_StatusLogin_header">
-                            <h1>Status Community Chat</h1>
-                            <div className="mx_StatusLogin_subtitle">
-                                A safer, decentralised communication
-                                platform <a href="https://riot.im">powered by Riot</a>
-                            </div>
-                        </div>
-                        { this.props.children }
-                        <div className="mx_StatusLogin_footer">
-                            <p>This channel is for our development community.</p>
-                            <p>Interested in SNT and discussions on the cryptocurrency market?</p>
-                            <p><a href="https://t.me/StatusNetworkChat" target="_blank" className="mx_StatusLogin_footer_cta">Join Telegram Chat</a></p>
-                        </div>
-                    </div>
-                </div>
-            );
-        } else {
         return (
             <div className="mx_Login">
                 { this.props.children }
             </div>
         );
-        }
     },
 });

src/i18n/strings/en_EN.json

@@ -1328,7 +1328,6 @@
     "Can't connect to homeserver - please check your connectivity, ensure your <a>homeserver's SSL certificate</a> is trusted, and that a browser extension is not blocking requests.": "Can't connect to homeserver - please check your connectivity, ensure your <a>homeserver's SSL certificate</a> is trusted, and that a browser extension is not blocking requests.",
     "Sign in with single sign-on": "Sign in with single sign-on",
     "Try the app first": "Try the app first",
-    "Sign in to get started": "Sign in to get started",
     "Failed to fetch avatar URL": "Failed to fetch avatar URL",
     "Set a display name:": "Set a display name:",
     "Upload an avatar:": "Upload an avatar:",