Merge pull request #1269 from MetaMask/notice-fix

Notice fix for when notices are short

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 () {