diff options
author | Dan Finlay <dan@danfinlay.com> | 2018-03-08 05:39:44 +0800 |
---|---|---|
committer | Dan Finlay <dan@danfinlay.com> | 2018-03-08 05:39:44 +0800 |
commit | d0ba2d2d9428f13208ea54e9fa78f122ed42549b (patch) | |
tree | 7786903649241ab688b5622719cae34f804abef7 /app/scripts/controllers/transactions.js | |
parent | 423f084cb47d84e2e9063a6567454f83592f424b (diff) | |
parent | ca047b1ea0bd6778fc3b0c05b86ff23d0964f98d (diff) | |
download | tangerine-wallet-browser-d0ba2d2d9428f13208ea54e9fa78f122ed42549b.tar.gz tangerine-wallet-browser-d0ba2d2d9428f13208ea54e9fa78f122ed42549b.tar.zst tangerine-wallet-browser-d0ba2d2d9428f13208ea54e9fa78f122ed42549b.zip |
Merge branch 'master' into i3076-UseStorageLocalInstead
Diffstat (limited to 'app/scripts/controllers/transactions.js')
-rw-r--r-- | app/scripts/controllers/transactions.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/scripts/controllers/transactions.js b/app/scripts/controllers/transactions.js index ef5578d5a..9c2ca0dc8 100644 --- a/app/scripts/controllers/transactions.js +++ b/app/scripts/controllers/transactions.js @@ -3,7 +3,7 @@ const ObservableStore = require('obs-store') const ethUtil = require('ethereumjs-util') const Transaction = require('ethereumjs-tx') const EthQuery = require('ethjs-query') -const TransactionStateManger = require('../lib/tx-state-manager') +const TransactionStateManager = require('../lib/tx-state-manager') const TxGasUtil = require('../lib/tx-gas-utils') const PendingTransactionTracker = require('../lib/pending-tx-tracker') const createId = require('../lib/random-id') @@ -38,7 +38,7 @@ module.exports = class TransactionController extends EventEmitter { this.query = new EthQuery(this.provider) this.txGasUtil = new TxGasUtil(this.provider) - this.txStateManager = new TransactionStateManger({ + this.txStateManager = new TransactionStateManager({ initState: opts.initState, txHistoryLimit: opts.txHistoryLimit, getNetwork: this.getNetwork.bind(this), |