diff options
author | Esteban MIno <efmino@uc.cl> | 2018-08-21 06:35:38 +0800 |
---|---|---|
committer | Esteban MIno <efmino@uc.cl> | 2018-08-21 06:35:38 +0800 |
commit | 81cd29df43feb2469b78c6240d12ffcb9a68678e (patch) | |
tree | 15b14d9d3a29e5c21776ce5f9a3b35c7934abb81 /old-ui | |
parent | dbab9a007fc9663427cebdbe1d41c51df67fd1fe (diff) | |
parent | 887cad973f25f43d2d4502ff31657f156a44b188 (diff) | |
download | tangerine-wallet-browser-81cd29df43feb2469b78c6240d12ffcb9a68678e.tar.gz tangerine-wallet-browser-81cd29df43feb2469b78c6240d12ffcb9a68678e.tar.zst tangerine-wallet-browser-81cd29df43feb2469b78c6240d12ffcb9a68678e.zip |
Merge branch 'develop' into WatchTokenFeature
Diffstat (limited to 'old-ui')
-rw-r--r-- | old-ui/app/components/notice.js | 17 | ||||
-rw-r--r-- | old-ui/app/components/transaction-list-item.js | 2 | ||||
-rw-r--r-- | old-ui/app/info.js | 1 |
3 files changed, 16 insertions, 4 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/components/transaction-list-item.js b/old-ui/app/components/transaction-list-item.js index 015ef6ba6..6ecf7d193 100644 --- a/old-ui/app/components/transaction-list-item.js +++ b/old-ui/app/components/transaction-list-item.js @@ -40,7 +40,7 @@ TransactionListItem.prototype.showRetryButton = function () { const currentNonce = txParams.nonce const currentNonceTxs = transactions.filter(tx => tx.txParams.nonce === currentNonce) const currentNonceSubmittedTxs = currentNonceTxs.filter(tx => tx.status === 'submitted') - const currentSubmittedTxs = transactions.filter(tx => tx.status === 'submitted') + const currentSubmittedTxs = transactions.filter(tx => tx.status === 'submitted') const lastSubmittedTxWithCurrentNonce = currentNonceSubmittedTxs[0] const currentTxIsLatestWithNonce = lastSubmittedTxWithCurrentNonce && lastSubmittedTxWithCurrentNonce.id === transaction.id 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!'), ]), |