diff options
| author | frankiebee <frankie.diamond@gmail.com> | 2017-08-22 02:35:22 +0800 |
|---|---|---|
| committer | frankiebee <frankie.diamond@gmail.com> | 2017-08-22 02:35:22 +0800 |
| commit | fbba3a1ac8575b910e8a2a684748d617eec19414 (patch) | |
| tree | c2940c33345d128a2888fc4441b8342e6b778d65 /app/scripts/controllers | |
| parent | 7ea83b6bae34dcf652d85474fe1d82893d592d55 (diff) | |
| parent | 9203b4edf9df8b616877c57970fb01a7fb87924b (diff) | |
| download | tangerine-wallet-browser-fbba3a1ac8575b910e8a2a684748d617eec19414.tar tangerine-wallet-browser-fbba3a1ac8575b910e8a2a684748d617eec19414.tar.gz tangerine-wallet-browser-fbba3a1ac8575b910e8a2a684748d617eec19414.tar.bz2 tangerine-wallet-browser-fbba3a1ac8575b910e8a2a684748d617eec19414.tar.lz tangerine-wallet-browser-fbba3a1ac8575b910e8a2a684748d617eec19414.tar.xz tangerine-wallet-browser-fbba3a1ac8575b910e8a2a684748d617eec19414.tar.zst tangerine-wallet-browser-fbba3a1ac8575b910e8a2a684748d617eec19414.zip | |
Merge branch 'master' into transactionControllerRefractorPt3
Diffstat (limited to 'app/scripts/controllers')
| -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 b044948d7..2349be1ad 100644 --- a/app/scripts/controllers/transactions.js +++ b/app/scripts/controllers/transactions.js @@ -114,6 +114,7 @@ module.exports = class TransactionController extends EventEmitter { // listen for tx completion (success, fail) return new Promise((resolve, reject) => { this.txStateManager.once(`${txMeta.id}:finished`, (completedTx) => { + this.emit('updateBadge') switch (completedTx.status) { case 'submitted': return resolve(completedTx.hash) @@ -136,7 +137,6 @@ module.exports = class TransactionController extends EventEmitter { status: 'unapproved', metamaskNetworkId: this.getNetwork(), txParams: txParams, - history: [], } // add default tx params await this.addTxDefaults(txMeta) |