aboutsummaryrefslogtreecommitdiffstats
path: root/app/scripts/controllers
diff options
context:
space:
mode:
authorfrankiebee <frankie.diamond@gmail.com>2018-03-14 05:42:26 +0800
committerfrankiebee <frankie.diamond@gmail.com>2018-03-14 05:42:26 +0800
commit9d7640996aa9b63fb6c9271d7e0698e7acdc559e (patch)
tree0933aaa4c5eb13d93f5337e87c4cd3051f5f9499 /app/scripts/controllers
parentc6dff98ee1551c4ae69c14c52073d64ace15f773 (diff)
downloadtangerine-wallet-browser-9d7640996aa9b63fb6c9271d7e0698e7acdc559e.tar
tangerine-wallet-browser-9d7640996aa9b63fb6c9271d7e0698e7acdc559e.tar.gz
tangerine-wallet-browser-9d7640996aa9b63fb6c9271d7e0698e7acdc559e.tar.bz2
tangerine-wallet-browser-9d7640996aa9b63fb6c9271d7e0698e7acdc559e.tar.lz
tangerine-wallet-browser-9d7640996aa9b63fb6c9271d7e0698e7acdc559e.tar.xz
tangerine-wallet-browser-9d7640996aa9b63fb6c9271d7e0698e7acdc559e.tar.zst
tangerine-wallet-browser-9d7640996aa9b63fb6c9271d7e0698e7acdc559e.zip
transactions - return the txMeta in retryTransaction
Diffstat (limited to 'app/scripts/controllers')
-rw-r--r--app/scripts/controllers/transactions.js5
1 files changed, 3 insertions, 2 deletions
diff --git a/app/scripts/controllers/transactions.js b/app/scripts/controllers/transactions.js
index a3f731b6e..ab07dde62 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 TransactionStateManager = require('../lib/tx-state-manager')
+const TransactionStateManger = 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 TransactionStateManager({
+ this.txStateManager = new TransactionStateManger({
initState: opts.initState,
txHistoryLimit: opts.txHistoryLimit,
getNetwork: this.getNetwork.bind(this),
@@ -227,6 +227,7 @@ module.exports = class TransactionController extends EventEmitter {
})
this.addTx(txMeta)
this.emit('newUnapprovedTx', txMeta)
+ return txMeta
}
async updateTransaction (txMeta) {