aboutsummaryrefslogtreecommitdiffstats
path: root/app/scripts/controllers/transactions.js
diff options
context:
space:
mode:
authorKevin Serrano <kevgagser@gmail.com>2017-06-23 08:28:10 +0800
committerGitHub <noreply@github.com>2017-06-23 08:28:10 +0800
commitf022c7c714e17faf9558839116ba90ca8082e6b1 (patch)
tree7cab7a825004343b6f7d3aa909eef71d31391fc6 /app/scripts/controllers/transactions.js
parent2a429253994a0df2aae27234a7ac11c870bdc713 (diff)
parentc0c588053a29a4406ef30de8628065429ff99595 (diff)
downloadtangerine-wallet-browser-f022c7c714e17faf9558839116ba90ca8082e6b1.tar
tangerine-wallet-browser-f022c7c714e17faf9558839116ba90ca8082e6b1.tar.gz
tangerine-wallet-browser-f022c7c714e17faf9558839116ba90ca8082e6b1.tar.bz2
tangerine-wallet-browser-f022c7c714e17faf9558839116ba90ca8082e6b1.tar.lz
tangerine-wallet-browser-f022c7c714e17faf9558839116ba90ca8082e6b1.tar.xz
tangerine-wallet-browser-f022c7c714e17faf9558839116ba90ca8082e6b1.tar.zst
tangerine-wallet-browser-f022c7c714e17faf9558839116ba90ca8082e6b1.zip
Merge pull request #1603 from MetaMask/AddTokenList
Add popular token list
Diffstat (limited to 'app/scripts/controllers/transactions.js')
-rw-r--r--app/scripts/controllers/transactions.js2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/scripts/controllers/transactions.js b/app/scripts/controllers/transactions.js
index d9d9849b1..f6dea34e7 100644
--- a/app/scripts/controllers/transactions.js
+++ b/app/scripts/controllers/transactions.js
@@ -382,13 +382,13 @@ module.exports = class TransactionController extends EventEmitter {
// - `'signed'` the tx is signed
// - `'submitted'` the tx is sent to a server
// - `'confirmed'` the tx has been included in a block.
+ // - `'failed'` the tx failed for some reason, included on tx data.
_setTxStatus (txId, status) {
var txMeta = this.getTx(txId)
txMeta.status = status
this.emit(`${txMeta.id}:${status}`, txId)
if (status === 'submitted' || status === 'rejected') {
this.emit(`${txMeta.id}:finished`, txMeta)
-
}
this.updateTx(txMeta)
this.emit('updateBadge')