diff options
Diffstat (limited to 'ui/app/reducers')
-rw-r--r-- | ui/app/reducers/app.js | 104 | ||||
-rw-r--r-- | ui/app/reducers/metamask.js | 3 |
2 files changed, 102 insertions, 5 deletions
diff --git a/ui/app/reducers/app.js b/ui/app/reducers/app.js index a9d6e4ff0..95b60f929 100644 --- a/ui/app/reducers/app.js +++ b/ui/app/reducers/app.js @@ -317,6 +317,15 @@ function reduceApp (state, action) { isLoading: false, }) + case actions.SHOW_SUB_LOADING_INDICATION: + return extend(appState, { + isSubLoading: true, + }) + + case actions.HIDE_SUB_LOADING_INDICATION: + return extend(appState, { + isSubLoading: false, + }) case actions.CLEAR_SEED_WORD_CACHE: return extend(appState, { transForward: true, @@ -369,15 +378,102 @@ function reduceApp (state, action) { }, }) - case actions.SHOW_ETH_WARNING: + case actions.BUY_ETH_VIEW: return extend(appState, { transForward: true, currentView: { - name: 'accountDetail', + name: 'buyEth', context: appState.currentView.context, }, - accountDetail: { - subview: 'buy-eth-warning', + buyView: { + subview: 'buyForm', + amount: '5.00', + buyAddress: action.value, + formView: { + coinbase: true, + shapeshift: false, + }, + }, + }) + + case actions.UPDATE_BUY_ADDRESS: + return extend(appState, { + buyView: { + subview: 'buyForm', + formView: { + coinbase: appState.buyView.formView.coinbase, + shapeshift: appState.buyView.formView.shapeshift, + }, + buyAddress: action.value, + amount: appState.buyView.amount, + }, + }) + + case actions.UPDATE_COINBASE_AMOUNT: + return extend(appState, { + buyView: { + subview: 'buyForm', + formView: { + coinbase: true, + shapeshift: false, + }, + buyAddress: appState.buyView.buyAddress, + amount: action.value, + }, + }) + + case actions.COINBASE_SUBVIEW: + return extend(appState, { + buyView: { + subview: 'buyForm', + formView: { + coinbase: true, + shapeshift: false, + }, + buyAddress: appState.buyView.buyAddress, + amount: appState.buyView.amount, + }, + }) + + case actions.SHAPESHIFT_SUBVIEW: + return extend(appState, { + buyView: { + subview: 'buyForm', + formView: { + coinbase: false, + shapeshift: true, + marketinfo: action.value.marketinfo, + coinOptions: action.value.coinOptions, + }, + buyAddress: appState.buyView.buyAddress, + amount: appState.buyView.amount, + }, + }) + + case actions.PAIR_UPDATE: + return extend(appState, { + buyView: { + subview: 'buyForm', + formView: { + coinbase: false, + shapeshift: true, + marketinfo: action.value.marketinfo, + coinOptions: appState.buyView.formView.coinOptions, + }, + buyAddress: appState.buyView.buyAddress, + amount: appState.buyView.amount, + warning: null, + }, + }) + + case actions.SHOW_QR: + return extend(appState, { + qrRequested: true, + transForward: true, + Qr: { + message: action.value.message, + image: action.value.qr, + data: action.value.data, }, }) default: diff --git a/ui/app/reducers/metamask.js b/ui/app/reducers/metamask.js index a63de9005..7af805f06 100644 --- a/ui/app/reducers/metamask.js +++ b/ui/app/reducers/metamask.js @@ -10,6 +10,7 @@ function reduceMetamask (state, action) { var metamaskState = extend({ isInitialized: false, isUnlocked: false, + isEthConfirmed: false, currentDomain: 'example.com', rpcTarget: 'https://rawtestrpc.metamask.io/', identities: {}, @@ -36,7 +37,7 @@ function reduceMetamask (state, action) { case actions.AGREE_TO_ETH_WARNING: return extend(metamaskState, { - isEthConfirmed: true, + isEthConfirmed: !metamaskState.isEthConfirmed, }) case actions.UNLOCK_METAMASK: |