diff options
| -rw-r--r-- | CHANGELOG.md | 6 | ||||
| -rw-r--r-- | app/manifest.json | 2 | ||||
| -rw-r--r-- | test/unit/account-link-test.js | 12 | ||||
| -rw-r--r-- | test/unit/explorer-link-test.js | 9 | ||||
| -rw-r--r-- | ui/app/components/notice.js | 3 | ||||
| -rw-r--r-- | ui/lib/account-link.js | 2 | ||||
| -rw-r--r-- | ui/lib/explorer-link.js | 2 |
7 files changed, 25 insertions, 11 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 2dcbb7290..93824e71c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,12 @@ ## Current Master +## 3.5.1 2017-3-27 + +- Fix edge case where users were unable to enable the notice button if notices were short enough to not require a scrollbar. + +## 3.5.0 2017-3-27 + - Add better error messages for when a transaction fails on approval - Allow sending to ENS names in send form on Ropsten. - Added an address book functionality that remembers the last 15 unique addresses sent to. diff --git a/app/manifest.json b/app/manifest.json index bc1d2f866..a163d4c06 100644 --- a/app/manifest.json +++ b/app/manifest.json @@ -1,7 +1,7 @@ { "name": "MetaMask", "short_name": "Metamask", - "version": "3.4.0", + "version": "3.5.1", "manifest_version": 2, "author": "https://metamask.io", "description": "Ethereum Browser Extension", diff --git a/test/unit/account-link-test.js b/test/unit/account-link-test.js index 4ea12e002..803a70f37 100644 --- a/test/unit/account-link-test.js +++ b/test/unit/account-link-test.js @@ -3,15 +3,15 @@ var linkGen = require('../../ui/lib/account-link') describe('account-link', function() { - it('adds morden prefix to morden test network', function() { - var result = linkGen('account', '2') - assert.notEqual(result.indexOf('morden'), -1, 'testnet included') + it('adds ropsten prefix to ropsten test network', function() { + var result = linkGen('account', '3') + assert.notEqual(result.indexOf('ropsten'), -1, 'ropsten included') assert.notEqual(result.indexOf('account'), -1, 'account included') }) - it('adds testnet prefix to ropsten test network', function() { - var result = linkGen('account', '3') - assert.notEqual(result.indexOf('testnet'), -1, 'testnet included') + it('adds kovan prefix to kovan test network', function() { + var result = linkGen('account', '42') + assert.notEqual(result.indexOf('kovan'), -1, 'kovan included') assert.notEqual(result.indexOf('account'), -1, 'account included') }) diff --git a/test/unit/explorer-link-test.js b/test/unit/explorer-link-test.js index 8aa58bff9..4f0230c2c 100644 --- a/test/unit/explorer-link-test.js +++ b/test/unit/explorer-link-test.js @@ -3,9 +3,14 @@ var linkGen = require('../../ui/lib/explorer-link') describe('explorer-link', function() { - it('adds testnet prefix to morden test network', function() { + it('adds ropsten prefix to ropsten test network', function() { var result = linkGen('hash', '3') - assert.notEqual(result.indexOf('testnet'), -1, 'testnet injected') + assert.notEqual(result.indexOf('ropsten'), -1, 'ropsten injected') + }) + + it('adds kovan prefix to kovan test network', function() { + var result = linkGen('hash', '42') + assert.notEqual(result.indexOf('kovan'), -1, 'kovan injected') }) }) diff --git a/ui/app/components/notice.js b/ui/app/components/notice.js index 8a953a6b5..b85787033 100644 --- a/ui/app/components/notice.js +++ b/ui/app/components/notice.js @@ -92,6 +92,7 @@ Notice.prototype.render = function () { }, }, [ h(ReactMarkdown, { + className: 'notice-box', source: body, skipHtml: true, }), @@ -114,6 +115,8 @@ Notice.prototype.render = function () { Notice.prototype.componentDidMount = function () { var node = findDOMNode(this) linker.setupListener(node) + if (document.getElementsByClassName('notice-box')[0].clientHeight < 310) { this.setState({disclaimerDisabled: false}) } + } Notice.prototype.componentWillUnmount = function () { diff --git a/ui/lib/account-link.js b/ui/lib/account-link.js index 948f32da1..4f27b35c0 100644 --- a/ui/lib/account-link.js +++ b/ui/lib/account-link.js @@ -9,7 +9,7 @@ module.exports = function (address, network) { link = `http://morden.etherscan.io/address/${address}` break case 3: // ropsten test net - link = `http://testnet.etherscan.io/address/${address}` + link = `http://ropsten.etherscan.io/address/${address}` break case 42: // kovan test net link = `http://kovan.etherscan.io/address/${address}` diff --git a/ui/lib/explorer-link.js b/ui/lib/explorer-link.js index 7ae19cca0..ca89f8b25 100644 --- a/ui/lib/explorer-link.js +++ b/ui/lib/explorer-link.js @@ -6,7 +6,7 @@ module.exports = function (hash, network) { prefix = '' break case 3: // ropsten test net - prefix = 'testnet.' + prefix = 'ropsten.' break case 42: // kovan test net prefix = 'kovan.' |