Merge branch 'master' into mascara

1 files changed, 7 insertions, 1 deletions

diff --git a/ui/app/components/notice.js b/ui/app/components/notice.js
index 23ded9d5d..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,
         }),
@@ -99,7 +100,10 @@ Notice.prototype.render = function () {
 
       h('button', {
         disabled,
-        onClick: onConfirm,
+        onClick: () => {
+          this.setState({disclaimerDisabled: true})
+          onConfirm()
+        },
         style: {
           marginTop: '18px',
         },
@@ -111,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 () {