aboutsummaryrefslogtreecommitdiffstats
path: root/app/scripts/controllers/transactions.js
diff options
context:
space:
mode:
authorFrankie <frankie.diamond@gmail.com>2017-08-09 12:16:49 +0800
committerGitHub <noreply@github.com>2017-08-09 12:16:49 +0800
commit57f6fce6b2524c4b36b591da5e600d0652f4077e (patch)
treec72727ee7c08fa080e8b764aee3b5ff36753b948 /app/scripts/controllers/transactions.js
parentd40bd9a726b7bef900d36ed195e38e8537cc791d (diff)
parent25f9746dabb4ecc736a5cdd7b01b2d8a6c8151de (diff)
downloadtangerine-wallet-browser-57f6fce6b2524c4b36b591da5e600d0652f4077e.tar
tangerine-wallet-browser-57f6fce6b2524c4b36b591da5e600d0652f4077e.tar.gz
tangerine-wallet-browser-57f6fce6b2524c4b36b591da5e600d0652f4077e.tar.bz2
tangerine-wallet-browser-57f6fce6b2524c4b36b591da5e600d0652f4077e.tar.lz
tangerine-wallet-browser-57f6fce6b2524c4b36b591da5e600d0652f4077e.tar.xz
tangerine-wallet-browser-57f6fce6b2524c4b36b591da5e600d0652f4077e.tar.zst
tangerine-wallet-browser-57f6fce6b2524c4b36b591da5e600d0652f4077e.zip
Merge pull request #1882 from MetaMask/tx-cont-fixes
Tx cont fixes
Diffstat (limited to 'app/scripts/controllers/transactions.js')
-rw-r--r--app/scripts/controllers/transactions.js9
1 files changed, 6 insertions, 3 deletions
diff --git a/app/scripts/controllers/transactions.js b/app/scripts/controllers/transactions.js
index 28130c164..58c468e22 100644
--- a/app/scripts/controllers/transactions.js
+++ b/app/scripts/controllers/transactions.js
@@ -40,7 +40,7 @@ module.exports = class TransactionController extends EventEmitter {
this.pendingTxTracker = new PendingTransactionTracker({
provider: this.provider,
nonceTracker: this.nonceTracker,
- getBalance: async (address) => {
+ getBalance: (address) => {
const account = this.ethStore.getState().accounts[address]
if (!account) return
return account.balance
@@ -382,9 +382,12 @@ module.exports = class TransactionController extends EventEmitter {
this._setTxStatus(txId, 'confirmed')
}
- setTxStatusFailed (txId, reason) {
+ setTxStatusFailed (txId, err) {
const txMeta = this.getTx(txId)
- txMeta.err = reason
+ txMeta.err = {
+ message: err.toString(),
+ stack: err.stack,
+ }
this.updateTx(txMeta)
this._setTxStatus(txId, 'failed')
}