diff options
| author | Esteban MIno <efmino@uc.cl> | 2018-07-04 01:23:15 +0800 |
|---|---|---|
| committer | Esteban MIno <efmino@uc.cl> | 2018-07-04 01:23:15 +0800 |
| commit | 0494b2fc8a84a533227d25e869a95226f99734af (patch) | |
| tree | da39134cf8d82c4e208f9461a9f4391b8f47fd28 /old-ui | |
| parent | 03fd4355af8ceae9a1d2cad04e12a4f86a9f36b7 (diff) | |
| parent | 1f0cf11af1c94e750bbc4c5238c3ee028350a6c6 (diff) | |
| download | tangerine-wallet-browser-0494b2fc8a84a533227d25e869a95226f99734af.tar.gz tangerine-wallet-browser-0494b2fc8a84a533227d25e869a95226f99734af.tar.zst tangerine-wallet-browser-0494b2fc8a84a533227d25e869a95226f99734af.zip | |
Merge branch 'develop' into detectTokenFeature
Diffstat (limited to 'old-ui')
| -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/components/typed-message-renderer.js | 6 | ||||
| -rw-r--r-- | old-ui/app/config.js | 2 |
5 files changed, 10 insertions, 6 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 } diff --git a/old-ui/app/components/typed-message-renderer.js b/old-ui/app/components/typed-message-renderer.js index d170d63b7..19e46f4fc 100644 --- a/old-ui/app/components/typed-message-renderer.js +++ b/old-ui/app/components/typed-message-renderer.js @@ -34,9 +34,13 @@ TypedMessageRenderer.prototype.render = function () { function renderTypedData (values) { return values.map(function (value) { + let v = value.value + if (typeof v === 'boolean') { + v = v.toString() + } return h('div', {}, [ h('strong', {style: {display: 'block', fontWeight: 'bold'}}, String(value.name) + ':'), - h('div', {}, value.value), + h('div', {}, v), ]) }) } 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', }, |