diff options
| author | Dan Finlay <flyswatter@users.noreply.github.com> | 2017-03-25 04:53:45 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-03-25 04:53:45 +0800 |
| commit | c15dfccaa4770539152acdfb81d623f0569e2d51 (patch) | |
| tree | 1595c6287f87162e987f76c8f580f87a06ad2cb3 /ui/app/reducers | |
| parent | 61a62038084c29fb29c8445feca36bce9e756471 (diff) | |
| parent | 393c7faf28bd94f16c16427f33d830b3b7241538 (diff) | |
| download | tangerine-wallet-browser-c15dfccaa4770539152acdfb81d623f0569e2d51.tar tangerine-wallet-browser-c15dfccaa4770539152acdfb81d623f0569e2d51.tar.gz tangerine-wallet-browser-c15dfccaa4770539152acdfb81d623f0569e2d51.tar.bz2 tangerine-wallet-browser-c15dfccaa4770539152acdfb81d623f0569e2d51.tar.lz tangerine-wallet-browser-c15dfccaa4770539152acdfb81d623f0569e2d51.tar.xz tangerine-wallet-browser-c15dfccaa4770539152acdfb81d623f0569e2d51.tar.zst tangerine-wallet-browser-c15dfccaa4770539152acdfb81d623f0569e2d51.zip | |
Merge branch 'master' into kovan-notice
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) { |