diff options
| author | frankiebee <frankie.diamond@gmail.com> | 2017-06-28 04:10:56 +0800 |
|---|---|---|
| committer | frankiebee <frankie.diamond@gmail.com> | 2017-06-28 04:10:56 +0800 |
| commit | 847a4282a2c0db6561972147bd366622424f5d28 (patch) | |
| tree | 2eefd2831cb627b9fd41e8858fe82714d85d399b /app/scripts/controllers/transactions.js | |
| parent | abbbe1156c03700c4476d0618e65aa2eed2c264e (diff) | |
| parent | 48f7cff8c0e765e85532c860c5f3061ca1d6deb7 (diff) | |
| download | tangerine-wallet-browser-847a4282a2c0db6561972147bd366622424f5d28.tar tangerine-wallet-browser-847a4282a2c0db6561972147bd366622424f5d28.tar.gz tangerine-wallet-browser-847a4282a2c0db6561972147bd366622424f5d28.tar.bz2 tangerine-wallet-browser-847a4282a2c0db6561972147bd366622424f5d28.tar.lz tangerine-wallet-browser-847a4282a2c0db6561972147bd366622424f5d28.tar.xz tangerine-wallet-browser-847a4282a2c0db6561972147bd366622424f5d28.tar.zst tangerine-wallet-browser-847a4282a2c0db6561972147bd366622424f5d28.zip | |
Merge branch 'master' into nonce-tracker
Diffstat (limited to 'app/scripts/controllers/transactions.js')
| -rw-r--r-- | app/scripts/controllers/transactions.js | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/app/scripts/controllers/transactions.js b/app/scripts/controllers/transactions.js index 59c8be8b7..651565519 100644 --- a/app/scripts/controllers/transactions.js +++ b/app/scripts/controllers/transactions.js @@ -384,6 +384,7 @@ 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 |