diff options
| author | Kevin Serrano <kevin.serrano@consensys.net> | 2017-10-10 23:38:27 +0800 |
|---|---|---|
| committer | Kevin Serrano <kevin.serrano@consensys.net> | 2017-10-10 23:38:27 +0800 |
| commit | 1816eca9144b13b3e869e2c3c95476b27c3e3aba (patch) | |
| tree | 356cc6269f6920bc20585e455811a43253fff777 /app/scripts/controllers | |
| parent | 24a55cf7770a6154fe723cf13cdc9998e1759f3b (diff) | |
| parent | f18615a82abafee1a648e8de6f60ecc54e1aabb4 (diff) | |
| download | tangerine-wallet-browser-1816eca9144b13b3e869e2c3c95476b27c3e3aba.tar tangerine-wallet-browser-1816eca9144b13b3e869e2c3c95476b27c3e3aba.tar.gz tangerine-wallet-browser-1816eca9144b13b3e869e2c3c95476b27c3e3aba.tar.bz2 tangerine-wallet-browser-1816eca9144b13b3e869e2c3c95476b27c3e3aba.tar.lz tangerine-wallet-browser-1816eca9144b13b3e869e2c3c95476b27c3e3aba.tar.xz tangerine-wallet-browser-1816eca9144b13b3e869e2c3c95476b27c3e3aba.tar.zst tangerine-wallet-browser-1816eca9144b13b3e869e2c3c95476b27c3e3aba.zip | |
Merge branch 'master' into version-debugging
Diffstat (limited to 'app/scripts/controllers')
| -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')) |