diff options
author | Dan <danjm.com@gmail.com> | 2018-04-10 03:22:26 +0800 |
---|---|---|
committer | Dan <danjm.com@gmail.com> | 2018-04-10 03:22:26 +0800 |
commit | 2c4426e4de745be880a994674dc1dc74c7ec74eb (patch) | |
tree | 1de9b836026d3222b490793099b66372404b83ab /ui/app/welcome-screen.js | |
parent | 9dbb9d12ad31d53b8911db171cb7d6b3fcb477e2 (diff) | |
parent | 4cae3d3b0d2a9cc0279e44de256e7fc7e219dca1 (diff) | |
download | tangerine-wallet-browser-2c4426e4de745be880a994674dc1dc74c7ec74eb.tar.gz tangerine-wallet-browser-2c4426e4de745be880a994674dc1dc74c7ec74eb.tar.zst tangerine-wallet-browser-2c4426e4de745be880a994674dc1dc74c7ec74eb.zip |
Merge branch 'master' into i3580-InternationalizeCurrency
Diffstat (limited to 'ui/app/welcome-screen.js')
-rw-r--r-- | ui/app/welcome-screen.js | 35 |
1 files changed, 29 insertions, 6 deletions
diff --git a/ui/app/welcome-screen.js b/ui/app/welcome-screen.js index cdbb6dba8..2fa244d9f 100644 --- a/ui/app/welcome-screen.js +++ b/ui/app/welcome-screen.js @@ -3,21 +3,35 @@ import h from 'react-hyperscript' import { Component } from 'react' import PropTypes from 'prop-types' import {connect} from 'react-redux' +import { withRouter } from 'react-router-dom' +import { compose } from 'recompose' import {closeWelcomeScreen} from './actions' import Mascot from './components/mascot' +import { INITIALIZE_CREATE_PASSWORD_ROUTE } from './routes' class WelcomeScreen extends Component { static propTypes = { closeWelcomeScreen: PropTypes.func.isRequired, + welcomeScreenSeen: PropTypes.bool, + history: PropTypes.object, } - constructor(props) { + constructor (props) { super(props) this.animationEventEmitter = new EventEmitter() } + componentWillMount () { + const { history, welcomeScreenSeen } = this.props + + if (welcomeScreenSeen) { + history.push(INITIALIZE_CREATE_PASSWORD_ROUTE) + } + } + initiateAccountCreation = () => { this.props.closeWelcomeScreen() + this.props.history.push(INITIALIZE_CREATE_PASSWORD_ROUTE) } render () { @@ -48,9 +62,18 @@ class WelcomeScreen extends Component { } } -export default connect( - null, - dispatch => ({ - closeWelcomeScreen: () => dispatch(closeWelcomeScreen()), - }) +const mapStateToProps = ({ metamask: { welcomeScreenSeen } }) => { + return { + welcomeScreenSeen, + } +} + +export default compose( + withRouter, + connect( + mapStateToProps, + dispatch => ({ + closeWelcomeScreen: () => dispatch(closeWelcomeScreen()), + }) + ) )(WelcomeScreen) |