aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--app/scripts/controllers/transactions.js10
1 files changed, 7 insertions, 3 deletions
diff --git a/app/scripts/controllers/transactions.js b/app/scripts/controllers/transactions.js
index 45c6fb25a..a2842ae44 100644
--- a/app/scripts/controllers/transactions.js
+++ b/app/scripts/controllers/transactions.js
@@ -183,7 +183,7 @@ module.exports = class TransactionController extends EventEmitter {
}, {})
}
- async approveTransaction (txId, cb = warn) {
+ async approveTransaction (txId) {
let nonceLock
try {
// approve
@@ -199,7 +199,6 @@ module.exports = class TransactionController extends EventEmitter {
await this.publishTransaction(txId, rawTx)
// must set transaction to submitted/failed before releasing lock
nonceLock.releaseLock()
- cb()
} catch (err) {
this.setTxStatusFailed(txId, {
errCode: err.errCode || err,
@@ -208,7 +207,7 @@ module.exports = class TransactionController extends EventEmitter {
// must set transaction to submitted/failed before releasing lock
if (nonceLock) nonceLock.releaseLock()
// continue with error chain
- cb(err)
+ throw err
}
}
@@ -217,6 +216,11 @@ module.exports = class TransactionController extends EventEmitter {
cb()
}
+ async updateAndApproveTransaction (txMeta) {
+ this.updateTx(txMeta)
+ await this.approveTransaction(txMeta.id)
+ }
+
getChainId () {
const networkState = this.networkStore.getState()
const getChainId = parseInt(networkState)