diff options
| author | Kevin Serrano <kevgagser@gmail.com> | 2017-02-24 06:17:52 +0800 |
|---|---|---|
| committer | Kevin Serrano <kevgagser@gmail.com> | 2017-02-24 06:17:52 +0800 |
| commit | 30e4bdf24b30c9a59a86d7b7890af66ffd0e83c5 (patch) | |
| tree | 831a0441622eb017e64dc9a8c513c82b2a8f7c08 /ui/app/components | |
| parent | 6b56d6ba9853ec978cd2d3d030882fa5ee3645cd (diff) | |
| parent | 09c7b9d242f66db99c80f22fae00dfdb894e2adc (diff) | |
| download | tangerine-wallet-browser-30e4bdf24b30c9a59a86d7b7890af66ffd0e83c5.tar.gz tangerine-wallet-browser-30e4bdf24b30c9a59a86d7b7890af66ffd0e83c5.tar.zst tangerine-wallet-browser-30e4bdf24b30c9a59a86d7b7890af66ffd0e83c5.zip | |
Merge github.com:MetaMask/metamask-plugin into i765-gaslimits
Diffstat (limited to 'ui/app/components')
| -rw-r--r-- | ui/app/components/notice.js | 13 |
1 files changed, 11 insertions, 2 deletions
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', |