diff options
| author | Kevin Serrano <kevin.serrano@consensys.net> | 2017-03-25 05:13:57 +0800 |
|---|---|---|
| committer | Kevin Serrano <kevin.serrano@consensys.net> | 2017-03-25 05:13:57 +0800 |
| commit | 30e8d250138bef588d25619b9fc9563dbbb8ecac (patch) | |
| tree | 563330742d202a9aa8fccc2b7234c6e259f8ea90 /ui/app/reducers | |
| parent | 2e446eb5880396716d919e10e97a7ab824cc0fc1 (diff) | |
| parent | fb39539214ca888300eb192e0e137a512cc0d88a (diff) | |
| download | tangerine-wallet-browser-30e8d250138bef588d25619b9fc9563dbbb8ecac.tar tangerine-wallet-browser-30e8d250138bef588d25619b9fc9563dbbb8ecac.tar.gz tangerine-wallet-browser-30e8d250138bef588d25619b9fc9563dbbb8ecac.tar.bz2 tangerine-wallet-browser-30e8d250138bef588d25619b9fc9563dbbb8ecac.tar.lz tangerine-wallet-browser-30e8d250138bef588d25619b9fc9563dbbb8ecac.tar.xz tangerine-wallet-browser-30e8d250138bef588d25619b9fc9563dbbb8ecac.tar.zst tangerine-wallet-browser-30e8d250138bef588d25619b9fc9563dbbb8ecac.zip | |
Merge branch 'master' into i1210-txdisappearance
Diffstat (limited to 'ui/app/reducers')
| -rw-r--r-- | ui/app/reducers/app.js | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/ui/app/reducers/app.js b/ui/app/reducers/app.js index b9e3f7b16..3a6baca91 100644 --- a/ui/app/reducers/app.js +++ b/ui/app/reducers/app.js @@ -592,8 +592,9 @@ function hasPendingTxs (state) { function indexForPending (state, txId) { var unapprovedTxs = state.metamask.unapprovedTxs var unapprovedMsgs = state.metamask.unapprovedMsgs + var unapprovedPersonalMsgs = state.metamask.unapprovedPersonalMsgs var network = state.metamask.network - var unconfTxList = txHelper(unapprovedTxs, unapprovedMsgs, network) + var unconfTxList = txHelper(unapprovedTxs, unapprovedMsgs, unapprovedPersonalMsgs, network) let idx unconfTxList.forEach((tx, i) => { if (tx.id === txId) { |