From c6a3d00d80e1fa6ca1426246d9a3e03b7ad4ecbb Mon Sep 17 00:00:00 2001
From: Chi Kei Chan <chikeichan@gmail.com>
Date: Mon, 18 Sep 2017 15:41:25 -0700
Subject: Fix merge conflict; separate onboarding buy screen

---
 ui/app/reducers/app.js | 11 +++++++++++
 1 file changed, 11 insertions(+)

(limited to 'ui/app/reducers')

diff --git a/ui/app/reducers/app.js b/ui/app/reducers/app.js
index 349c25b96..4b05b608d 100644
--- a/ui/app/reducers/app.js
+++ b/ui/app/reducers/app.js
@@ -494,6 +494,17 @@ function reduceApp (state, action) {
         },
       })
 
+
+    case actions.ONBOARDING_BUY_ETH_VIEW:
+      return extend(appState, {
+        transForward: true,
+        currentView: {
+          name: 'onboardingBuyEth',
+          context: appState.currentView.name,
+        },
+        identity: state.metamask.identities[action.value],
+      })
+
     case actions.COINBASE_SUBVIEW:
       return extend(appState, {
         buyView: {
-- 
cgit