aboutsummaryrefslogtreecommitdiffstats
path: root/app/scripts/controllers/transactions.js
diff options
context:
space:
mode:
authorDan Finlay <dan@danfinlay.com>2017-10-19 08:07:25 +0800
committerDan Finlay <dan@danfinlay.com>2017-10-19 08:07:25 +0800
commitbbe2c9f48dd617e0696db50a3113df920dcaa974 (patch)
treecde9e7a2cb61dcfa254a7651aa12441e5c63c0fb /app/scripts/controllers/transactions.js
parentd89394a7c9a5139ed5708ce7022fbbe2809e612a (diff)
parent6eb27389579586dc06ce840444bcdb207707e0b2 (diff)
downloadtangerine-wallet-browser-bbe2c9f48dd617e0696db50a3113df920dcaa974.tar
tangerine-wallet-browser-bbe2c9f48dd617e0696db50a3113df920dcaa974.tar.gz
tangerine-wallet-browser-bbe2c9f48dd617e0696db50a3113df920dcaa974.tar.bz2
tangerine-wallet-browser-bbe2c9f48dd617e0696db50a3113df920dcaa974.tar.lz
tangerine-wallet-browser-bbe2c9f48dd617e0696db50a3113df920dcaa974.tar.xz
tangerine-wallet-browser-bbe2c9f48dd617e0696db50a3113df920dcaa974.tar.zst
tangerine-wallet-browser-bbe2c9f48dd617e0696db50a3113df920dcaa974.zip
Merge remote-tracking branch 'origin/master' into i2348-SelectAccountOnNewVault
Diffstat (limited to 'app/scripts/controllers/transactions.js')
-rw-r--r--app/scripts/controllers/transactions.js1
1 files changed, 0 insertions, 1 deletions
diff --git a/app/scripts/controllers/transactions.js b/app/scripts/controllers/transactions.js
index d46dee230..ef659a300 100644
--- a/app/scripts/controllers/transactions.js
+++ b/app/scripts/controllers/transactions.js
@@ -46,7 +46,6 @@ module.exports = class TransactionController extends EventEmitter {
this.txStateManager.on('tx:status-update', this.emit.bind(this, 'tx:status-update'))
this.nonceTracker = new NonceTracker({
provider: this.provider,
- blockTracker: this.blockTracker,
getPendingTransactions: this.txStateManager.getPendingTransactions.bind(this.txStateManager),
getConfirmedTransactions: (address) => {
return this.txStateManager.getFilteredTxList({