diff options
Diffstat (limited to 'ui/app')
| -rw-r--r-- | ui/app/app.js | 2 | ||||
| -rw-r--r-- | ui/app/components/notice.js | 13 |
2 files changed, 12 insertions, 3 deletions
diff --git a/ui/app/app.js b/ui/app/app.js index f3581b56d..6e249b09e 100644 --- a/ui/app/app.js +++ b/ui/app/app.js @@ -350,7 +350,7 @@ App.prototype.renderPrimary = function () { var props = this.props // notices - if (!props.noActiveNotices && !global.METAMASK_DEBUG) { + if (!props.noActiveNotices) { log.debug('rendering notice screen for unread notices.') return h(NoticeScreen, { notice: props.lastUnreadNotice, diff --git a/ui/app/components/notice.js b/ui/app/components/notice.js index 00db734d7..23ded9d5d 100644 --- a/ui/app/components/notice.js +++ b/ui/app/components/notice.js @@ -15,10 +15,12 @@ function Notice () { Notice.prototype.render = function () { const { notice, onConfirm } = this.props const { title, date, body } = notice + const state = this.state || { disclaimerDisabled: true } + const disabled = state.disclaimerDisabled return ( h('.flex-column.flex-center.flex-grow', [ - h('h3.flex-center.text-transform-uppercacse.terms-header', { + h('h3.flex-center.text-transform-uppercase.terms-header', { style: { background: '#EBEBEB', color: '#AEAEAE', @@ -31,7 +33,7 @@ Notice.prototype.render = function () { title, ]), - h('h5.flex-center.text-transform-uppercacse.terms-header', { + h('h5.flex-center.text-transform-uppercase.terms-header', { style: { background: '#EBEBEB', color: '#AEAEAE', @@ -74,6 +76,12 @@ Notice.prototype.render = function () { `), h('div.markdown', { + onScroll: (e) => { + var object = e.currentTarget + if (object.offsetHeight + object.scrollTop + 100 >= object.scrollHeight) { + this.setState({disclaimerDisabled: false}) + } + }, style: { background: 'rgb(235, 235, 235)', height: '310px', @@ -90,6 +98,7 @@ Notice.prototype.render = function () { ]), h('button', { + disabled, onClick: onConfirm, style: { marginTop: '18px', |