From 9a8bf5a605738c49301c1ebe1793e2e3ebce61fc Mon Sep 17 00:00:00 2001
From: Kevin Serrano <kevin.serrano@consensys.net>
Date: Mon, 27 Mar 2017 16:33:04 -0400
Subject: [PATCH 1/3] 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 <kevin.serrano@consensys.net>
Date: Mon, 27 Mar 2017 16:33:54 -0400
Subject: [PATCH 2/3] 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 <dan@danfinlay.com>
Date: Mon, 27 Mar 2017 13:39:19 -0700
Subject: [PATCH 3/3] 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",