diff options
author | Dan <danjm.com@gmail.com> | 2018-03-09 13:37:27 +0800 |
---|---|---|
committer | Dan <danjm.com@gmail.com> | 2018-03-09 13:37:27 +0800 |
commit | 81e72147ef829acbbed85bced7f0eb4533f2fb17 (patch) | |
tree | 0e13f8ea4e6fb80fe57e437a466e3f7ae04c6c22 /app/scripts/controllers/transactions.js | |
parent | 2d6b378bf8f8f0b23ef54b48118b61fb6c7deee1 (diff) | |
parent | f28bbe5b0392a9ae45f7f17fbc979ef796b27d16 (diff) | |
download | tangerine-wallet-browser-81e72147ef829acbbed85bced7f0eb4533f2fb17.tar.gz tangerine-wallet-browser-81e72147ef829acbbed85bced7f0eb4533f2fb17.tar.zst tangerine-wallet-browser-81e72147ef829acbbed85bced7f0eb4533f2fb17.zip |
Merge branch 'master' into retry-tx-refractor
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 3dbd424ca..a3f731b6e 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 NonceTracker = require('../lib/nonce-tracker') @@ -37,7 +37,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), |