diff options
author | kumavis <kumavis@users.noreply.github.com> | 2018-03-14 01:46:14 +0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-03-14 01:46:14 +0800 |
commit | 572234e383f944eb2be28c4192f209c3972747b7 (patch) | |
tree | 3d6a214b845790c96e2c98e6c140ed6724d261e4 /app/scripts/controllers/transactions.js | |
parent | 70f33d47472863e3fce41eff60c1fe078efef7de (diff) | |
parent | 1fa5cec2ec784ace2dd8d1afab6c0d8cc195feb5 (diff) | |
download | tangerine-wallet-browser-572234e383f944eb2be28c4192f209c3972747b7.tar tangerine-wallet-browser-572234e383f944eb2be28c4192f209c3972747b7.tar.gz tangerine-wallet-browser-572234e383f944eb2be28c4192f209c3972747b7.tar.bz2 tangerine-wallet-browser-572234e383f944eb2be28c4192f209c3972747b7.tar.lz tangerine-wallet-browser-572234e383f944eb2be28c4192f209c3972747b7.tar.xz tangerine-wallet-browser-572234e383f944eb2be28c4192f209c3972747b7.tar.zst tangerine-wallet-browser-572234e383f944eb2be28c4192f209c3972747b7.zip |
Merge branch 'master' into i3033-responsive-newui-onboarding
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), |