diff options
| author | Kevin Serrano <kevin.serrano@consensys.net> | 2017-10-10 02:54:16 +0800 |
|---|---|---|
| committer | Kevin Serrano <kevin.serrano@consensys.net> | 2017-10-10 02:54:16 +0800 |
| commit | 5ae5ee9a2080017d56f7096a8fe5bef54368603a (patch) | |
| tree | 41059e0891f120754ab08f8629fb3093db4dbe5c /app/scripts/controllers/transactions.js | |
| parent | e557d7f7563d6e9ac9a9a98f012a324ce3c0881a (diff) | |
| parent | 4a4338c1f4669f621fc39d34b06a77f247c7ce65 (diff) | |
| download | tangerine-wallet-browser-5ae5ee9a2080017d56f7096a8fe5bef54368603a.tar tangerine-wallet-browser-5ae5ee9a2080017d56f7096a8fe5bef54368603a.tar.gz tangerine-wallet-browser-5ae5ee9a2080017d56f7096a8fe5bef54368603a.tar.bz2 tangerine-wallet-browser-5ae5ee9a2080017d56f7096a8fe5bef54368603a.tar.lz tangerine-wallet-browser-5ae5ee9a2080017d56f7096a8fe5bef54368603a.tar.xz tangerine-wallet-browser-5ae5ee9a2080017d56f7096a8fe5bef54368603a.tar.zst tangerine-wallet-browser-5ae5ee9a2080017d56f7096a8fe5bef54368603a.zip | |
Merge branch 'master' into precision-fix
Diffstat (limited to 'app/scripts/controllers/transactions.js')
| -rw-r--r-- | app/scripts/controllers/transactions.js | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/app/scripts/controllers/transactions.js b/app/scripts/controllers/transactions.js index a0f983deb..ef659a300 100644 --- a/app/scripts/controllers/transactions.js +++ b/app/scripts/controllers/transactions.js @@ -62,6 +62,7 @@ module.exports = class TransactionController extends EventEmitter { retryTimePeriod: 86400000, // Retry 3500 blocks, or about 1 day. publishTransaction: (rawTx) => this.query.sendRawTransaction(rawTx), getPendingTransactions: this.txStateManager.getPendingTransactions.bind(this.txStateManager), + getCompletedTransactions: this.txStateManager.getConfirmedTransactions.bind(this.txStateManager), }) this.txStateManager.store.subscribe(() => this.emit('update:badge')) |