From bd4a68531bc915e70964e28002c3a59d85853dfa Mon Sep 17 00:00:00 2001 From: kumavis Date: Mon, 27 Mar 2017 10:55:40 -0700 Subject: [PATCH 1/8] block explorer - account link - ropsten etherscan differentiates between "attacked ropsten" vs "revived ropsten" https://ropsten.etherscan.io/ is the revived ropsten --- ui/lib/account-link.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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}` From dca4486a651a19c72203219effd54b14ad989a90 Mon Sep 17 00:00:00 2001 From: kumavis Date: Mon, 27 Mar 2017 10:57:04 -0700 Subject: [PATCH 2/8] block explorer - ropsten etherscan differentiates between "attacked ropsten" vs "revived ropsten" https://ropsten.etherscan.io/ is the revived ropsten --- ui/lib/explorer-link.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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.' From 4b9f1c0e0cb31824a430547c1354331f946386c1 Mon Sep 17 00:00:00 2001 From: kumavis Date: Mon, 27 Mar 2017 11:01:10 -0700 Subject: [PATCH 3/8] tests - fix ropsten link check --- test/unit/account-link-test.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/unit/account-link-test.js b/test/unit/account-link-test.js index 4ea12e002..5be3a072e 100644 --- a/test/unit/account-link-test.js +++ b/test/unit/account-link-test.js @@ -5,13 +5,13 @@ 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') + assert.notEqual(result.indexOf('morden'), -1, 'morden 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') + assert.notEqual(result.indexOf('ropsten'), -1, 'ropsten included') assert.notEqual(result.indexOf('account'), -1, 'account included') }) From 918f388463d4afaf6429f6432bdd364b780f8d6c Mon Sep 17 00:00:00 2001 From: kumavis Date: Mon, 27 Mar 2017 11:32:00 -0700 Subject: [PATCH 4/8] explorer - fix ropsten explorer link tests --- test/unit/account-link-test.js | 14 +++++++------- test/unit/explorer-link-test.js | 9 +++++++-- 2 files changed, 14 insertions(+), 9 deletions(-) diff --git a/test/unit/account-link-test.js b/test/unit/account-link-test.js index 5be3a072e..803a70f37 100644 --- a/test/unit/account-link-test.js +++ b/test/unit/account-link-test.js @@ -3,16 +3,16 @@ 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, 'morden included') - assert.notEqual(result.indexOf('account'), -1, 'account included') - }) - - it('adds testnet prefix to ropsten test network', function() { + 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 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') }) }) From d9c2f4f5e8dc9ec8a88a02eb5a73ea78b4a564ac Mon Sep 17 00:00:00 2001 From: Dan Finlay Date: Mon, 27 Mar 2017 11:48:10 -0700 Subject: [PATCH 5/8] Version 3.5.0 --- CHANGELOG.md | 2 ++ app/manifest.json | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2dcbb7290..1e6256100 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,8 @@ ## Current Master +## 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 910a5701e..70d701fc5 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.0", "manifest_version": 2, "author": "https://metamask.io", "description": "Ethereum Browser Extension", From 9a8bf5a605738c49301c1ebe1793e2e3ebce61fc Mon Sep 17 00:00:00 2001 From: Kevin Serrano Date: Mon, 27 Mar 2017 16:33:04 -0400 Subject: [PATCH 6/8] Fix edge case where notice does not require scrollbar. --- ui/app/components/notice.js | 3 +++ 1 file changed, 3 insertions(+) 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 () { From c69ebf34204d8fa932e0ac5240e7907f33d0afbb Mon Sep 17 00:00:00 2001 From: Kevin Serrano Date: Mon, 27 Mar 2017 16:33:54 -0400 Subject: [PATCH 7/8] Add to changelog. --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1e6256100..c7432bdc2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,8 @@ ## Current Master +- 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 From d41c8ef5986e1f39350f4ea1f7664415ea236c7d Mon Sep 17 00:00:00 2001 From: Dan Finlay Date: Mon, 27 Mar 2017 13:39:19 -0700 Subject: [PATCH 8/8] Version 3.5.1 --- CHANGELOG.md | 2 ++ app/manifest.json | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c7432bdc2..93824e71c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,8 @@ ## 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 diff --git a/app/manifest.json b/app/manifest.json index 70d701fc5..97cc7dd6d 100644 --- a/app/manifest.json +++ b/app/manifest.json @@ -1,7 +1,7 @@ { "name": "MetaMask", "short_name": "Metamask", - "version": "3.5.0", + "version": "3.5.1", "manifest_version": 2, "author": "https://metamask.io", "description": "Ethereum Browser Extension",