diff options
author | Dan Finlay <dan@danfinlay.com> | 2016-05-27 06:21:27 +0800 |
---|---|---|
committer | Dan Finlay <dan@danfinlay.com> | 2016-05-27 06:21:27 +0800 |
commit | 921ced1630b0e63f067fb9170f499f0fbc304004 (patch) | |
tree | 4e3d5ff73eef5400c10983438acb8de22acc4622 /ui/app/reducers | |
parent | 73ad717392eb8da8ce2594c4b34b395a3872a84f (diff) | |
parent | f1fb7ff42c5a86411108fe908d5d85921dcdaec4 (diff) | |
download | tangerine-wallet-browser-921ced1630b0e63f067fb9170f499f0fbc304004.tar.gz tangerine-wallet-browser-921ced1630b0e63f067fb9170f499f0fbc304004.tar.zst tangerine-wallet-browser-921ced1630b0e63f067fb9170f499f0fbc304004.zip |
Merge branch 'master' into i216
Diffstat (limited to 'ui/app/reducers')
-rw-r--r-- | ui/app/reducers/app.js | 28 |
1 files changed, 26 insertions, 2 deletions
diff --git a/ui/app/reducers/app.js b/ui/app/reducers/app.js index a98b809d6..08c2268c1 100644 --- a/ui/app/reducers/app.js +++ b/ui/app/reducers/app.js @@ -12,10 +12,10 @@ function reduceApp(state, action) { const pendingTxs = hasPendingTxs(state) let name = 'accounts' if (selectedAccount) { - defaultView = 'accountDetail' + name = 'accountDetail' } if (pendingTxs) { - defaultView = 'confTx' + name = 'confTx' } var defaultView = { @@ -270,6 +270,17 @@ function reduceApp(state, action) { } }) + case actions.VIEW_PENDING_TX: + const context = indexForPending(state, action.value) + return extend(appState, { + transForward: true, + currentView: { + name: 'confTx', + context, + warning: null, + } + }) + case actions.PREVIOUS_TX: return extend(appState, { transForward: false, @@ -366,3 +377,16 @@ function hasPendingTxs (state) { var unconfTxList = txHelper(unconfTxs, unconfMsgs) return unconfTxList.length > 0 } + +function indexForPending(state, txId) { + var unconfTxs = state.metamask.unconfTxs + var unconfMsgs = state.metamask.unconfMsgs + var unconfTxList = txHelper(unconfTxs, unconfMsgs) + let idx + unconfTxList.forEach((tx, i) => { + if (tx.id === txId) { + idx = i + } + }) + return idx +} |