Fix merge conflict; separate onboarding buy screen

2 files changed, 20 insertions, 20 deletions

diff --git a/mascara/src/app/first-time/backup-phrase-screen.js b/mascara/src/app/first-time/backup-phrase-screen.js
index fdbba6550..c68dacea2 100644
--- a/mascara/src/app/first-time/backup-phrase-screen.js
+++ b/mascara/src/app/first-time/backup-phrase-screen.js
@@ -66,7 +66,7 @@ class BackupPhraseScreen extends Component {
     }
   }
 
-  renderSecretWordsContainer() {
+  renderSecretWordsContainer () {
     const { isShowingSecret } = this.state
 
     return (
@@ -197,7 +197,7 @@ class BackupPhraseScreen extends Component {
     ) 
   }
 
-  renderBack() {
+  renderBack () {
     return this.state.page === BackupPhraseScreen.PAGE.CONFIRM
       ? (
         <a
@@ -216,17 +216,17 @@ class BackupPhraseScreen extends Component {
       : null
   }
 
-  renderContent() {
-    switch(this.state.page) {
+  renderContent () {
+    switch (this.state.page) {
       case BackupPhraseScreen.PAGE.CONFIRM:
-        return this.renderConfirmationScreen();
+        return this.renderConfirmationScreen()
       case BackupPhraseScreen.PAGE.SECRET:
       default:
-        return this.renderSecretScreen();
+        return this.renderSecretScreen()
     }
   }
 
-  render() {
+  render () {
     return this.props.isLoading
       ? <LoadingScreen loadingMessage="Creating your new account" />
       : (
@@ -245,10 +245,10 @@ export default compose(
     ({ metamask: { selectedAddress, seedWords }, appState: { isLoading } }) => ({
       seedWords,
       isLoading,
-      address: selectedAddress
+      address: selectedAddress,
     }),
     dispatch => ({
-      confirmSeedWords: () => dispatch(confirmSeedWords())
+      confirmSeedWords: () => dispatch(confirmSeedWords()),
     })
   )
 )(BackupPhraseScreen)
diff --git a/mascara/src/app/first-time/index.js b/mascara/src/app/first-time/index.js
index 42c89aa0d..6035db5c2 100644
--- a/mascara/src/app/first-time/index.js
+++ b/mascara/src/app/first-time/index.js
@@ -1,12 +1,12 @@
 import React, {Component, PropTypes} from 'react'
-import {connect} from 'react-redux';
+import {connect} from 'react-redux'
 import CreatePasswordScreen from './create-password-screen'
 import UniqueImageScreen from './unique-image-screen'
 import NoticeScreen from './notice-screen'
 import BackupPhraseScreen from './backup-phrase-screen'
 import ImportAccountScreen from './import-account-screen'
 import BuyEtherScreen from './buy-ether-screen'
-import {buyEthView} from '../../../../ui/app/actions'
+import {onboardingBuyEthView} from '../../../../ui/app/actions'
 
 class FirstTimeFlow extends Component {
 
@@ -33,23 +33,23 @@ class FirstTimeFlow extends Component {
     CONFIRM_BACK_UP_PHRASE: 'confirm_back_up_phrase',
   };
 
-  constructor(props) {
-    super(props);
+  constructor (props) {
+    super(props)
     this.state = {
-      screenType: this.getScreenType()
+      screenType: this.getScreenType(),
     }
   }
 
-  setScreenType(screenType) {
+  setScreenType (screenType) {
     this.setState({ screenType })
   }
 
-  getScreenType() {
+  getScreenType () {
     const {
       isInitialized,
       seedWords,
       noActiveNotices,
-    } = this.props;
+    } = this.props
     const {SCREEN_TYPE} = FirstTimeFlow
 
     // return SCREEN_TYPE.NOTICE
@@ -67,7 +67,7 @@ class FirstTimeFlow extends Component {
     }
   };
 
-  renderScreen() {
+  renderScreen () {
     const {SCREEN_TYPE} = FirstTimeFlow
     const {goToBuyEtherView, address} = this.props
 
@@ -109,7 +109,7 @@ class FirstTimeFlow extends Component {
     }
   }
 
-  render() {
+  render () {
     return (
       <div className="first-time-flow">
         {this.renderScreen()}
@@ -127,7 +127,7 @@ export default connect(
     address: selectedAddress,
   }),
   dispatch => ({
-    goToBuyEtherView: address => dispatch(buyEthView(address))
+    goToBuyEtherView: address => dispatch(onboardingBuyEthView(address)),
   })
 )(FirstTimeFlow)