diff options
| author | frankiebee <frankie.diamond@gmail.com> | 2017-09-07 15:55:21 +0800 |
|---|---|---|
| committer | frankiebee <frankie.diamond@gmail.com> | 2017-09-07 15:55:21 +0800 |
| commit | 50075c6df5af4441db78b47f3bc2036a65228224 (patch) | |
| tree | 7c818fcdd20161b1d65296a2f6040ed33527d7e5 /app | |
| parent | 00fca4f1f236c915eca8f0b068a7c5998e1092f3 (diff) | |
| download | tangerine-wallet-browser-50075c6df5af4441db78b47f3bc2036a65228224.tar tangerine-wallet-browser-50075c6df5af4441db78b47f3bc2036a65228224.tar.gz tangerine-wallet-browser-50075c6df5af4441db78b47f3bc2036a65228224.tar.bz2 tangerine-wallet-browser-50075c6df5af4441db78b47f3bc2036a65228224.tar.lz tangerine-wallet-browser-50075c6df5af4441db78b47f3bc2036a65228224.tar.xz tangerine-wallet-browser-50075c6df5af4441db78b47f3bc2036a65228224.tar.zst tangerine-wallet-browser-50075c6df5af4441db78b47f3bc2036a65228224.zip | |
fix messy merge
Diffstat (limited to 'app')
| -rw-r--r-- | app/scripts/controllers/transactions.js | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/app/scripts/controllers/transactions.js b/app/scripts/controllers/transactions.js index 5aaee7be0..d71be37d8 100644 --- a/app/scripts/controllers/transactions.js +++ b/app/scripts/controllers/transactions.js @@ -62,10 +62,6 @@ module.exports = class TransactionController extends EventEmitter { err: undefined, }) }, - giveUpOnTransaction: (txId) => { - const msg = `Gave up submitting after 3500 blocks un-mined.` - this.setTxStatusFailed(txId, msg) - }, }) this.pendingTxTracker = new PendingTransactionTracker({ @@ -80,6 +76,10 @@ module.exports = class TransactionController extends EventEmitter { getPendingTransactions: () => { return this.txStateManager.getFilteredTxList({ status: 'submitted' }) }, + giveUpOnTransaction: (txId) => { + const msg = `Gave up submitting after 3500 blocks un-mined.` + this.setTxStatusFailed(txId, msg) + }, }) this.txStateManager.subscribe(() => { |