m/metamask-extension
1
0
Fork 0
mirror of https://github.com/kremalicious/metamask-extension.git synced 2024-12-23 09:52:26 +01:00
Code

fix messy merge

Browse Source
This commit is contained in:
frankiebee 2017-09-07 00:55:21 -07:00
parent 00fca4f1f2
commit 50075c6df5
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/scripts/controllers/transactions.js
View File

@ -62,10 +62,6 @@ module.exports = class TransactionController extends EventEmitter {
err: undefined, err: undefined,
}) })
}, },
giveUpOnTransaction: (txId) => {
const msg = `Gave up submitting after 3500 blocks un-mined.`
this.setTxStatusFailed(txId, msg)
},
}) })
this.pendingTxTracker = new PendingTransactionTracker({ this.pendingTxTracker = new PendingTransactionTracker({
@ -80,6 +76,10 @@ module.exports = class TransactionController extends EventEmitter {
getPendingTransactions: () => { getPendingTransactions: () => {
return this.txStateManager.getFilteredTxList({ status: 'submitted' }) 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(() => { this.txStateManager.subscribe(() => {