diff options
| author | frankiebee <frankie.diamond@gmail.com> | 2017-03-29 09:02:39 +0800 |
|---|---|---|
| committer | frankiebee <frankie.diamond@gmail.com> | 2017-03-29 09:02:39 +0800 |
| commit | a20a237282c38da86b03625d08b48c2e58e83523 (patch) | |
| tree | 65c58173cf8e0da53dbb6b9f18014ed8c1babf9c /ui/app/reducers/app.js | |
| parent | 79248ae5cd3fb1314c5a7ff71c05f9dbe7b3a4cd (diff) | |
| parent | 7c09bde4120d1063df762076d41d2e9921dd3c0e (diff) | |
| download | tangerine-wallet-browser-a20a237282c38da86b03625d08b48c2e58e83523.tar tangerine-wallet-browser-a20a237282c38da86b03625d08b48c2e58e83523.tar.gz tangerine-wallet-browser-a20a237282c38da86b03625d08b48c2e58e83523.tar.bz2 tangerine-wallet-browser-a20a237282c38da86b03625d08b48c2e58e83523.tar.lz tangerine-wallet-browser-a20a237282c38da86b03625d08b48c2e58e83523.tar.xz tangerine-wallet-browser-a20a237282c38da86b03625d08b48c2e58e83523.tar.zst tangerine-wallet-browser-a20a237282c38da86b03625d08b48c2e58e83523.zip | |
Merge branch 'master' into mascara
Diffstat (limited to 'ui/app/reducers/app.js')
| -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) { |