diff options
| author | Kevin Serrano <kevin.serrano@consensys.net> | 2017-06-20 04:51:38 +0800 |
|---|---|---|
| committer | Kevin Serrano <kevin.serrano@consensys.net> | 2017-06-20 04:51:38 +0800 |
| commit | 9da243f42d7f9a1bfc868b9637774c6fbad6af53 (patch) | |
| tree | f37cc44c80a3c22f11b46c527dee66454ed70867 /app/scripts/controllers/transactions.js | |
| parent | 7ec7e1226691474ea200ccf867f7a7d1f0c1086a (diff) | |
| parent | 39c7ed230d61b04d147e45a55ac7af0576961968 (diff) | |
| download | tangerine-wallet-browser-9da243f42d7f9a1bfc868b9637774c6fbad6af53.tar.gz tangerine-wallet-browser-9da243f42d7f9a1bfc868b9637774c6fbad6af53.tar.zst tangerine-wallet-browser-9da243f42d7f9a1bfc868b9637774c6fbad6af53.zip | |
Merge branch 'AddTokenList' of github.com:MetaMask/metamask-plugin into AddTokenList
Diffstat (limited to 'app/scripts/controllers/transactions.js')
| -rw-r--r-- | app/scripts/controllers/transactions.js | 2 |
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') |