m/metamask-extension
1
0
Fork 0
mirror of https://github.com/kremalicious/metamask-extension.git synced 2024-12-23 09:52:26 +01:00
Code

Merge pull request #1480 from MetaMask/Version-3.7.0

Browse Source 
Version 3.7.0
This commit is contained in:
kumavis 2017-05-23 14:55:18 -07:00 committed by GitHub
commit 9c316664de
3 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELOG.md
View File

@ -2,6 +2,8 @@
## Current Master ## Current Master
## 3.7.0 2017-5-23
- Add Transaction Number (nonce) to transaction list. - Add Transaction Number (nonce) to transaction list.
- Label the pending tx icon with a tooltip. - Label the pending tx icon with a tooltip.
- Fix bug where website filters would pile up and not deallocate when leaving a site. - Fix bug where website filters would pile up and not deallocate when leaving a site.

2
app/manifest.json
View File

@ -1,7 +1,7 @@
{ {
"name": "MetaMask", "name": "MetaMask",
"short_name": "Metamask", "short_name": "Metamask",
"version": "3.6.5", "version": "3.7.0",
"manifest_version": 2, "manifest_version": 2,
"author": "https://metamask.io", "author": "https://metamask.io",
"description": "Ethereum Browser Extension", "description": "Ethereum Browser Extension",

5
app/scripts/controllers/transactions.js
View File

@ -12,7 +12,7 @@ const denodeify = require('denodeify')
const RETRY_LIMIT = 200 const RETRY_LIMIT = 200
const RESUBMIT_INTERVAL = 10000 // Ten seconds const RESUBMIT_INTERVAL = 10000 // Ten seconds
module.exports = class TransactionManager extends EventEmitter { module.exports = class TransactionController extends EventEmitter {
constructor (opts) { constructor (opts) {
super() super()
this.store = new ObservableStore(extend({ this.store = new ObservableStore(extend({
@ -448,7 +448,8 @@ module.exports = class TransactionManager extends EventEmitter {
const rawTx = txMeta.rawTx const rawTx = txMeta.rawTx
this.txProviderUtils.publishTransaction(rawTx, cb) 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')