diff options
| author | Dan Finlay <542863+danfinlay@users.noreply.github.com> | 2017-10-07 05:03:04 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-10-07 05:03:04 +0800 |
| commit | 0c61695656054d5da43a8bfb10d7a15cb2958d81 (patch) | |
| tree | fa5b4d2789235ea23275e6e5bab08eb434e52eb8 /app/scripts/controllers/transactions.js | |
| parent | 52bfed5d13846326fbd8940dbb7c91a4f399b190 (diff) | |
| parent | fa11bbf99673bb6b2dd4ad5f291d63ff1358fda6 (diff) | |
| download | tangerine-wallet-browser-0c61695656054d5da43a8bfb10d7a15cb2958d81.tar tangerine-wallet-browser-0c61695656054d5da43a8bfb10d7a15cb2958d81.tar.gz tangerine-wallet-browser-0c61695656054d5da43a8bfb10d7a15cb2958d81.tar.bz2 tangerine-wallet-browser-0c61695656054d5da43a8bfb10d7a15cb2958d81.tar.lz tangerine-wallet-browser-0c61695656054d5da43a8bfb10d7a15cb2958d81.tar.xz tangerine-wallet-browser-0c61695656054d5da43a8bfb10d7a15cb2958d81.tar.zst tangerine-wallet-browser-0c61695656054d5da43a8bfb10d7a15cb2958d81.zip | |
Merge branch 'master' into SignTypedData
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')) |