diff options
| author | Thomas Huang <thomas.b.huang@gmail.com> | 2017-06-28 01:32:28 +0800 |
|---|---|---|
| committer | Thomas Huang <thomas.b.huang@gmail.com> | 2017-06-28 01:32:28 +0800 |
| commit | 1977417017eec00a546ab816fa635ea575e4835d (patch) | |
| tree | 77f942810eda1665b4b8974077985f082bfc24c3 /app/scripts/controllers/transactions.js | |
| parent | 235cb1f2d790a7bda349ab0d33ad1009751a8536 (diff) | |
| parent | 48f7cff8c0e765e85532c860c5f3061ca1d6deb7 (diff) | |
| download | tangerine-wallet-browser-1977417017eec00a546ab816fa635ea575e4835d.tar.gz tangerine-wallet-browser-1977417017eec00a546ab816fa635ea575e4835d.tar.zst tangerine-wallet-browser-1977417017eec00a546ab816fa635ea575e4835d.zip | |
Merge branch 'master' into i1473-dappDefaultGasPrice
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 e3c2d74d3..1efa96610 100644 --- a/app/scripts/controllers/transactions.js +++ b/app/scripts/controllers/transactions.js @@ -384,13 +384,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') |