diff options
| author | Kevin Serrano <kevgagser@gmail.com> | 2017-03-28 04:45:04 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-03-28 04:45:04 +0800 |
| commit | 67892c49a6cb26e433e3dbeaa9f2f7790667f103 (patch) | |
| tree | 29e74d1c3a1586fa568583a9ff93c04596d5bf8e | |
| parent | 6fd7e133bd0966e2a15a802872844a11b1c81ae6 (diff) | |
| parent | a298130357996be48a61544154268025c4724cf4 (diff) | |
| download | tangerine-wallet-browser-67892c49a6cb26e433e3dbeaa9f2f7790667f103.tar tangerine-wallet-browser-67892c49a6cb26e433e3dbeaa9f2f7790667f103.tar.gz tangerine-wallet-browser-67892c49a6cb26e433e3dbeaa9f2f7790667f103.tar.bz2 tangerine-wallet-browser-67892c49a6cb26e433e3dbeaa9f2f7790667f103.tar.lz tangerine-wallet-browser-67892c49a6cb26e433e3dbeaa9f2f7790667f103.tar.xz tangerine-wallet-browser-67892c49a6cb26e433e3dbeaa9f2f7790667f103.tar.zst tangerine-wallet-browser-67892c49a6cb26e433e3dbeaa9f2f7790667f103.zip | |
Merge branch 'master' into kovan-faucet-instructions
| -rw-r--r-- | CHANGELOG.md | 4 | ||||
| -rw-r--r-- | app/manifest.json | 2 | ||||
| -rw-r--r-- | ui/app/components/notice.js | 3 |
3 files changed, 8 insertions, 1 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 8a0f866bf..36c03344c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,10 @@ - Add link to Kovan Test Faucet instructions on buy view. +## 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 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", 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 () { |