diff options
| author | Dan Finlay <flyswatter@users.noreply.github.com> | 2017-03-28 04:44:17 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-03-28 04:44:17 +0800 |
| commit | a298130357996be48a61544154268025c4724cf4 (patch) | |
| tree | e1e2eeb9aac0da46d83418e6f2494f2933188833 | |
| parent | d6d85d28bbba9700ab9538403130873867dd7cfe (diff) | |
| parent | d41c8ef5986e1f39350f4ea1f7664415ea236c7d (diff) | |
| download | tangerine-wallet-browser-a298130357996be48a61544154268025c4724cf4.tar.gz tangerine-wallet-browser-a298130357996be48a61544154268025c4724cf4.tar.zst tangerine-wallet-browser-a298130357996be48a61544154268025c4724cf4.zip | |
Merge pull request #1269 from MetaMask/notice-fix
Notice fix for when notices are short
| -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 1e6256100..93824e71c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,10 @@ ## 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 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 () { |