diff options
| author | brunobar79 <brunobar79@gmail.com> | 2018-07-04 01:31:30 +0800 |
|---|---|---|
| committer | brunobar79 <brunobar79@gmail.com> | 2018-07-04 01:31:30 +0800 |
| commit | 3290421e2f16bd0ea1b13ba3f3d93fc4d233c750 (patch) | |
| tree | dfbcfb70609fd24074dad6686f447a452313c6c6 /old-ui/app/components | |
| parent | 85fd75c21f0e64817b3d4c4d51f37649e3a81233 (diff) | |
| parent | 1f0cf11af1c94e750bbc4c5238c3ee028350a6c6 (diff) | |
| download | tangerine-wallet-browser-3290421e2f16bd0ea1b13ba3f3d93fc4d233c750.tar tangerine-wallet-browser-3290421e2f16bd0ea1b13ba3f3d93fc4d233c750.tar.gz tangerine-wallet-browser-3290421e2f16bd0ea1b13ba3f3d93fc4d233c750.tar.bz2 tangerine-wallet-browser-3290421e2f16bd0ea1b13ba3f3d93fc4d233c750.tar.lz tangerine-wallet-browser-3290421e2f16bd0ea1b13ba3f3d93fc4d233c750.tar.xz tangerine-wallet-browser-3290421e2f16bd0ea1b13ba3f3d93fc4d233c750.tar.zst tangerine-wallet-browser-3290421e2f16bd0ea1b13ba3f3d93fc4d233c750.zip | |
fix merge conflicts
Diffstat (limited to 'old-ui/app/components')
| -rw-r--r-- | old-ui/app/components/ens-input.js | 2 | ||||
| -rw-r--r-- | old-ui/app/components/loading.js | 2 | ||||
| -rw-r--r-- | old-ui/app/components/transaction-list-item.js | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/old-ui/app/components/ens-input.js b/old-ui/app/components/ens-input.js index 7e06fa9f1..9c46f77d7 100644 --- a/old-ui/app/components/ens-input.js +++ b/old-ui/app/components/ens-input.js @@ -20,7 +20,7 @@ function EnsInput () { EnsInput.prototype.render = function () { const props = this.props - function onInputChange() { + function onInputChange () { const network = this.props.network const networkHasEnsSupport = getNetworkEnsSupport(network) if (!networkHasEnsSupport) return diff --git a/old-ui/app/components/loading.js b/old-ui/app/components/loading.js index b8e2eb599..2a29361f9 100644 --- a/old-ui/app/components/loading.js +++ b/old-ui/app/components/loading.js @@ -28,7 +28,7 @@ LoadingIndicator.prototype.render = function () { background: 'rgba(255, 255, 255, 0.8)', }, }, [ - canBypass ? h( 'i.fa.fa-close.cursor-pointer.close-loading', { + canBypass ? h('i.fa.fa-close.cursor-pointer.close-loading', { style: { position: 'absolute', top: '1px', diff --git a/old-ui/app/components/transaction-list-item.js b/old-ui/app/components/transaction-list-item.js index b9f82c668..e9280419a 100644 --- a/old-ui/app/components/transaction-list-item.js +++ b/old-ui/app/components/transaction-list-item.js @@ -40,8 +40,8 @@ TransactionListItem.prototype.showRetryButton = function () { const currentNonceTxs = transactions.filter(tx => tx.txParams.nonce === currentNonce) const currentNonceSubmittedTxs = currentNonceTxs.filter(tx => tx.status === 'submitted') const lastSubmittedTxWithCurrentNonce = currentNonceSubmittedTxs[0] - const currentTxIsLatestWithNonce = lastSubmittedTxWithCurrentNonce - && lastSubmittedTxWithCurrentNonce.id === transaction.id + const currentTxIsLatestWithNonce = lastSubmittedTxWithCurrentNonce && + lastSubmittedTxWithCurrentNonce.id === transaction.id return currentTxIsLatestWithNonce && Date.now() - submittedTime > 30000 } |