diff options
| author | frankiebee <frankie.diamond@gmail.com> | 2018-03-14 06:27:26 +0800 |
|---|---|---|
| committer | frankiebee <frankie.diamond@gmail.com> | 2018-03-14 06:27:26 +0800 |
| commit | a2c14ad02b6f080efe18535d64efe4acdaa5f310 (patch) | |
| tree | a4f10bab758b35c5344557907c7c95a396e4fbb9 /app/scripts/controllers | |
| parent | c465d510b100fdf9926413751df04cbd59de68eb (diff) | |
| parent | c83a9ceb04a485149fe65fbb2b44f0adeda696b1 (diff) | |
| download | tangerine-wallet-browser-a2c14ad02b6f080efe18535d64efe4acdaa5f310.tar.gz tangerine-wallet-browser-a2c14ad02b6f080efe18535d64efe4acdaa5f310.tar.zst tangerine-wallet-browser-a2c14ad02b6f080efe18535d64efe4acdaa5f310.zip | |
Merge remote-tracking branch 'origin/i#3509' into i#3509
Diffstat (limited to 'app/scripts/controllers')
| -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), |