diff options
| author | Dan Finlay <flyswatter@users.noreply.github.com> | 2017-03-25 04:52:57 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-03-25 04:52:57 +0800 |
| commit | 393c7faf28bd94f16c16427f33d830b3b7241538 (patch) | |
| tree | 6c832c5fd2c044ef303e678f8f097b3b0b7ba066 /ui/app/reducers | |
| parent | 9e39f85ea1709859b09ed6f3953339b6a6362781 (diff) | |
| parent | 5cd917b0e94d770e416eb2ec67013c7404ab2fbc (diff) | |
| download | tangerine-wallet-browser-393c7faf28bd94f16c16427f33d830b3b7241538.tar tangerine-wallet-browser-393c7faf28bd94f16c16427f33d830b3b7241538.tar.gz tangerine-wallet-browser-393c7faf28bd94f16c16427f33d830b3b7241538.tar.bz2 tangerine-wallet-browser-393c7faf28bd94f16c16427f33d830b3b7241538.tar.lz tangerine-wallet-browser-393c7faf28bd94f16c16427f33d830b3b7241538.tar.xz tangerine-wallet-browser-393c7faf28bd94f16c16427f33d830b3b7241538.tar.zst tangerine-wallet-browser-393c7faf28bd94f16c16427f33d830b3b7241538.zip | |
Merge pull request #1248 from MetaMask/i1234-HardGasLimits-BrowserForm
Hard gas limits browser form
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) { |