diff options
author | brunobar79 <brunobar79@gmail.com> | 2018-08-18 00:56:07 +0800 |
---|---|---|
committer | brunobar79 <brunobar79@gmail.com> | 2018-08-18 00:56:07 +0800 |
commit | 992e7f1b5aae5ae4a96c67dd40b6626f181b51c1 (patch) | |
tree | 11a429e8d3fdbe7b4945d77273598091c4cbd70d /old-ui | |
parent | 51e4a6d3355524cd8622d6d2893cc878a64dc53e (diff) | |
download | tangerine-wallet-browser-992e7f1b5aae5ae4a96c67dd40b6626f181b51c1.tar tangerine-wallet-browser-992e7f1b5aae5ae4a96c67dd40b6626f181b51c1.tar.gz tangerine-wallet-browser-992e7f1b5aae5ae4a96c67dd40b6626f181b51c1.tar.bz2 tangerine-wallet-browser-992e7f1b5aae5ae4a96c67dd40b6626f181b51c1.tar.lz tangerine-wallet-browser-992e7f1b5aae5ae4a96c67dd40b6626f181b51c1.tar.xz tangerine-wallet-browser-992e7f1b5aae5ae4a96c67dd40b6626f181b51c1.tar.zst tangerine-wallet-browser-992e7f1b5aae5ae4a96c67dd40b6626f181b51c1.zip |
fix merge conflicts
Diffstat (limited to 'old-ui')
-rw-r--r-- | old-ui/app/components/notice.js | 17 | ||||
-rw-r--r-- | old-ui/app/info.js | 1 |
2 files changed, 15 insertions, 3 deletions
diff --git a/old-ui/app/components/notice.js b/old-ui/app/components/notice.js index 09d461c7b..1ec254555 100644 --- a/old-ui/app/components/notice.js +++ b/old-ui/app/components/notice.js @@ -116,12 +116,25 @@ Notice.prototype.render = function () { ) } +Notice.prototype.setInitialDisclaimerState = function () { + if (document.getElementsByClassName('notice-box')[0].clientHeight < 310) { + this.setState({disclaimerDisabled: false}) + } +} + Notice.prototype.componentDidMount = function () { // eslint-disable-next-line react/no-find-dom-node var node = findDOMNode(this) linker.setupListener(node) - if (document.getElementsByClassName('notice-box')[0].clientHeight < 310) { - this.setState({disclaimerDisabled: false}) + this.setInitialDisclaimerState() +} + +Notice.prototype.componentDidUpdate = function (prevProps) { + const { notice: { id } = {} } = this.props + const { notice: { id: prevNoticeId } = {} } = prevProps + + if (id !== prevNoticeId) { + this.setInitialDisclaimerState() } } diff --git a/old-ui/app/info.js b/old-ui/app/info.js index d79b8a3d2..936d270da 100644 --- a/old-ui/app/info.js +++ b/old-ui/app/info.js @@ -138,7 +138,6 @@ InfoScreen.prototype.render = function () { h('div.fa.fa-envelope', [ h('a.info', { target: '_blank', - style: { width: '85vw' }, href: 'mailto:help@metamask.io?subject=Feedback', }, 'Email us!'), ]), |