diff options
| author | kumavis <kumavis@users.noreply.github.com> | 2017-05-24 05:55:18 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-05-24 05:55:18 +0800 |
| commit | 9c316664de2eb82bdd10ab9cd6fa0a33f5185e20 (patch) | |
| tree | ae20a0d348348849cbd727dd4e7ee610262d6b8a | |
| parent | f4158d26f61aed1882ca5734f561e12f68726972 (diff) | |
| parent | 17604f1ef5c880a391026aa02d19493d05c1dd18 (diff) | |
| download | tangerine-wallet-browser-9c316664de2eb82bdd10ab9cd6fa0a33f5185e20.tar.gz tangerine-wallet-browser-9c316664de2eb82bdd10ab9cd6fa0a33f5185e20.tar.zst tangerine-wallet-browser-9c316664de2eb82bdd10ab9cd6fa0a33f5185e20.zip | |
Merge pull request #1480 from MetaMask/Version-3.7.0
Version 3.7.0
| -rw-r--r-- | CHANGELOG.md | 2 | ||||
| -rw-r--r-- | app/manifest.json | 2 | ||||
| -rw-r--r-- | app/scripts/controllers/transactions.js | 5 |
3 files changed, 6 insertions, 3 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 88d7a81e7..c0473baee 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,8 @@ ## Current Master +## 3.7.0 2017-5-23 + - Add Transaction Number (nonce) to transaction list. - Label the pending tx icon with a tooltip. - Fix bug where website filters would pile up and not deallocate when leaving a site. diff --git a/app/manifest.json b/app/manifest.json index 31e4598c7..5fd4420be 100644 --- a/app/manifest.json +++ b/app/manifest.json @@ -1,7 +1,7 @@ { "name": "MetaMask", "short_name": "Metamask", - "version": "3.6.5", + "version": "3.7.0", "manifest_version": 2, "author": "https://metamask.io", "description": "Ethereum Browser Extension", diff --git a/app/scripts/controllers/transactions.js b/app/scripts/controllers/transactions.js index 3d86a171e..4d3197cba 100644 --- a/app/scripts/controllers/transactions.js +++ b/app/scripts/controllers/transactions.js @@ -12,7 +12,7 @@ const denodeify = require('denodeify') const RETRY_LIMIT = 200 const RESUBMIT_INTERVAL = 10000 // Ten seconds -module.exports = class TransactionManager extends EventEmitter { +module.exports = class TransactionController extends EventEmitter { constructor (opts) { super() this.store = new ObservableStore(extend({ @@ -448,7 +448,8 @@ module.exports = class TransactionManager extends EventEmitter { const rawTx = txMeta.rawTx this.txProviderUtils.publishTransaction(rawTx, cb) } + } -const warn = () => console.warn('warn was used no cb provided') +const warn = () => log.warn('warn was used no cb provided') |