diff options
author | Dan <danjm.com@gmail.com> | 2018-03-09 01:31:21 +0800 |
---|---|---|
committer | Dan <danjm.com@gmail.com> | 2018-03-09 01:51:54 +0800 |
commit | 91c890041c685db8ff7f7ac87009225fa31b3042 (patch) | |
tree | 7172c36f2a0e118ac07718f9d85f53f60c84f717 /mascara/src/app/first-time/create-password-screen.js | |
parent | b8dec6827127ebd5a1fba19a389a361ebc3a9a4d (diff) | |
download | tangerine-wallet-browser-91c890041c685db8ff7f7ac87009225fa31b3042.tar.gz tangerine-wallet-browser-91c890041c685db8ff7f7ac87009225fa31b3042.tar.zst tangerine-wallet-browser-91c890041c685db8ff7f7ac87009225fa31b3042.zip |
Add welcome screen to new-ui browser first time flow.
Diffstat (limited to 'mascara/src/app/first-time/create-password-screen.js')
-rw-r--r-- | mascara/src/app/first-time/create-password-screen.js | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/mascara/src/app/first-time/create-password-screen.js b/mascara/src/app/first-time/create-password-screen.js index ff56542d7..b56c183e6 100644 --- a/mascara/src/app/first-time/create-password-screen.js +++ b/mascara/src/app/first-time/create-password-screen.js @@ -2,6 +2,7 @@ import EventEmitter from 'events' import React, { Component } from 'react' import PropTypes from 'prop-types' import {connect} from 'react-redux' +import classnames from 'classnames' import {createNewVaultAndKeychain} from '../../../../ui/app/actions' import LoadingScreen from './loading-screen' import Breadcrumbs from './breadcrumbs' @@ -14,6 +15,7 @@ class CreatePasswordScreen extends Component { goToImportWithSeedPhrase: PropTypes.func.isRequired, goToImportAccount: PropTypes.func.isRequired, next: PropTypes.func.isRequired, + isMascara: PropTypes.bool.isRequired, } state = { @@ -53,14 +55,17 @@ class CreatePasswordScreen extends Component { } render () { - const { isLoading, goToImportWithSeedPhrase } = this.props - + const { isLoading, goToImportWithSeedPhrase, isMascara } = this.props + // return isLoading ? <LoadingScreen loadingMessage="Creating your new account" /> : ( <div> - <div className="first-view-main"> - <div className="mascara-info first-view-phone-invisible"> + <div className={classnames({ + 'first-view-main': !isMascara, + 'first-view-main__mascara': isMascara, + })}> + {isMascara && <div className="mascara-info first-view-phone-invisible"> <Mascot animationEventEmitter={this.animationEventEmitter} width="225" @@ -72,7 +77,7 @@ class CreatePasswordScreen extends Component { <div className="info"> It allows you to hold ether & tokens, and interact with decentralized applications. </div> - </div> + </div>} <div className="create-password"> <div className="create-password__title"> Create Password @@ -127,7 +132,7 @@ class CreatePasswordScreen extends Component { } export default connect( - ({ appState: { isLoading } }) => ({ isLoading }), + ({ appState: { isLoading }, metamask: { isMascara } }) => ({ isLoading, isMascara }), dispatch => ({ createAccount: password => dispatch(createNewVaultAndKeychain(password)), }) |