diff options
| author | TrejGun <trejgun@gmail.com> | 2018-07-05 11:34:13 +0800 |
|---|---|---|
| committer | TrejGun <trejgun@gmail.com> | 2018-07-05 11:34:13 +0800 |
| commit | 94d1d846fb57932fd1e959f53dbf6444f0789e91 (patch) | |
| tree | 369276cd66bdcae85cac77b2c9b2458de5b08dd7 /old-ui/app | |
| parent | c94f639de55a867ebe8d3599d337a1f7341b1979 (diff) | |
| parent | fd218142acb6dab0b2f921b9729f17ff90cffc2d (diff) | |
| download | tangerine-wallet-browser-94d1d846fb57932fd1e959f53dbf6444f0789e91.tar.gz tangerine-wallet-browser-94d1d846fb57932fd1e959f53dbf6444f0789e91.tar.zst tangerine-wallet-browser-94d1d846fb57932fd1e959f53dbf6444f0789e91.zip | |
Merge branch 'develop' into contextTypes
# Conflicts:
# ui/app/components/send_/send-content/send-gas-row/gas-fee-display/gas-fee-display.component.js
Diffstat (limited to 'old-ui/app')
| -rw-r--r-- | old-ui/app/app.js | 1 | ||||
| -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 | ||||
| -rw-r--r-- | old-ui/app/config.js | 2 |
5 files changed, 6 insertions, 5 deletions
diff --git a/old-ui/app/app.js b/old-ui/app/app.js index 5c2dccc03..0637e3b5b 100644 --- a/old-ui/app/app.js +++ b/old-ui/app/app.js @@ -183,6 +183,7 @@ App.prototype.renderAppBar = function () { this.setState({ isNetworkMenuOpen: !isNetworkMenuOpen }) }, }), + ]), props.isUnlocked && h('div', { 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 } diff --git a/old-ui/app/config.js b/old-ui/app/config.js index 508770bd4..392a6dba7 100644 --- a/old-ui/app/config.js +++ b/old-ui/app/config.js @@ -31,7 +31,7 @@ ConfigScreen.prototype.render = function () { return ( h('.flex-column.flex-grow', { - style:{ + style: { maxHeight: '585px', overflowY: 'auto', }, |