diff options
| author | Chi Kei Chan <chikeichan@gmail.com> | 2017-09-19 06:41:25 +0800 |
|---|---|---|
| committer | Chi Kei Chan <chikeichan@gmail.com> | 2017-10-21 12:51:37 +0800 |
| commit | c6a3d00d80e1fa6ca1426246d9a3e03b7ad4ecbb (patch) | |
| tree | dc8d97b83e8cd571a04112c400a13914c2ba5f8e /ui/app/reducers/app.js | |
| parent | e88baff2eec33de41faa0fa1ee0b3416117f9c96 (diff) | |
| download | tangerine-wallet-browser-c6a3d00d80e1fa6ca1426246d9a3e03b7ad4ecbb.tar.gz tangerine-wallet-browser-c6a3d00d80e1fa6ca1426246d9a3e03b7ad4ecbb.tar.zst tangerine-wallet-browser-c6a3d00d80e1fa6ca1426246d9a3e03b7ad4ecbb.zip | |
Fix merge conflict; separate onboarding buy screen
Diffstat (limited to 'ui/app/reducers/app.js')
| -rw-r--r-- | ui/app/reducers/app.js | 11 |
1 files changed, 11 insertions, 0 deletions
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: { |