Fix merge conflict; separate onboarding buy screen

1 files changed, 8 insertions, 7 deletions

diff --git a/ui/app/app.js b/ui/app/app.js
index 36241b942..bd0ccb0a2 100644
--- a/ui/app/app.js
+++ b/ui/app/app.js
@@ -46,10 +46,9 @@ function mapStateToProps (state) {
     accounts,
     address,
     keyrings,
-    isMascara,
     isInitialized,
     noActiveNotices,
-    seedWords
+    seedWords,
   } = state.metamask
   const selected = address || Object.keys(accounts)[0]
 
@@ -405,8 +404,8 @@ App.prototype.renderDropdown = function () {
   ])
 }
 
-App.prototype.renderLoadingIndicator = function({ isLoading, isLoadingNetwork, loadMessage }) {
-  const { isMascara } = this.props;
+App.prototype.renderLoadingIndicator = function ({ isLoading, isLoadingNetwork, loadMessage }) {
+  const { isMascara } = this.props
 
   return isMascara
     ? null
@@ -541,9 +540,11 @@ App.prototype.renderPrimary = function () {
 
     case 'buyEth':
       log.debug('rendering buy ether screen')
-      return isMascara
-        ? h(MascaraBuyEtherScreen, {key: 'buyEthView'})
-        : h(BuyView, {key: 'buyEthView'})
+      return h(BuyView, {key: 'buyEthView'})
+
+    case 'onboardingBuyEth':
+      log.debug('rendering onboarding buy ether screen')
+      return h(MascaraBuyEtherScreen, {key: 'buyEthView'})
 
     case 'qr':
       log.debug('rendering show qr screen')