diff options
| author | Dan Finlay <dan@danfinlay.com> | 2017-07-27 06:32:19 +0800 |
|---|---|---|
| committer | Dan Finlay <dan@danfinlay.com> | 2017-07-27 06:32:19 +0800 |
| commit | f147b928b238af3e1f0abdcc4d38b5281f67aba4 (patch) | |
| tree | 758d3cb81d42af5bde01be3dbedfb24536cc1a80 /app/scripts/controllers | |
| parent | 3d8ebf2265d167923f3b913bac3b9cc4d37fa052 (diff) | |
| parent | 520cda0058849778461cf6b9682980068149c120 (diff) | |
| download | tangerine-wallet-browser-f147b928b238af3e1f0abdcc4d38b5281f67aba4.tar.gz tangerine-wallet-browser-f147b928b238af3e1f0abdcc4d38b5281f67aba4.tar.zst tangerine-wallet-browser-f147b928b238af3e1f0abdcc4d38b5281f67aba4.zip | |
Merge branch 'master' into i1805-LiveBlacklistUpdating
Diffstat (limited to 'app/scripts/controllers')
| -rw-r--r-- | app/scripts/controllers/transactions.js | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/app/scripts/controllers/transactions.js b/app/scripts/controllers/transactions.js index 8f53ffa8c..f71659042 100644 --- a/app/scripts/controllers/transactions.js +++ b/app/scripts/controllers/transactions.js @@ -24,7 +24,6 @@ module.exports = class TransactionController extends EventEmitter { this.blockTracker = opts.blockTracker this.nonceTracker = new NonceTracker({ provider: this.provider, - blockTracker: this.provider._blockTracker, getPendingTransactions: (address) => { return this.getFilteredTxList({ from: address, |