diff options
| author | Dan Finlay <flyswatter@users.noreply.github.com> | 2017-01-19 04:25:35 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-01-19 04:25:35 +0800 |
| commit | 0e01abdf7154067ca50bf279340b868aefd8343f (patch) | |
| tree | fa3c5f2811912a18ce9811c5c850bb4ec25ffbb1 /app | |
| parent | 99ce68b4f6c24fbea34a9f6d23ff6ae9d9761b7c (diff) | |
| parent | 9ab7ce370bc12e10b3458c0755f0dd8488788bec (diff) | |
| download | tangerine-wallet-browser-0e01abdf7154067ca50bf279340b868aefd8343f.tar tangerine-wallet-browser-0e01abdf7154067ca50bf279340b868aefd8343f.tar.gz tangerine-wallet-browser-0e01abdf7154067ca50bf279340b868aefd8343f.tar.bz2 tangerine-wallet-browser-0e01abdf7154067ca50bf279340b868aefd8343f.tar.lz tangerine-wallet-browser-0e01abdf7154067ca50bf279340b868aefd8343f.tar.xz tangerine-wallet-browser-0e01abdf7154067ca50bf279340b868aefd8343f.tar.zst tangerine-wallet-browser-0e01abdf7154067ca50bf279340b868aefd8343f.zip | |
Merge branch 'master' into Version-3.1.0
Diffstat (limited to 'app')
| -rw-r--r-- | app/scripts/transaction-manager.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/scripts/transaction-manager.js b/app/scripts/transaction-manager.js index 9261bb54a..6d0121afd 100644 --- a/app/scripts/transaction-manager.js +++ b/app/scripts/transaction-manager.js @@ -296,7 +296,7 @@ module.exports = class TransactionManager extends EventEmitter { // checks if a signed tx is in a block and // if included sets the tx status as 'confirmed' checkForTxInBlock () { - var signedTxList = this.getFilteredTxList({status: 'signed'}) + var signedTxList = this.getFilteredTxList({status: 'submitted'}) if (!signedTxList.length) return signedTxList.forEach((txMeta) => { var txHash = txMeta.hash |