diff options
| author | Dan J Miller <danjm.com@gmail.com> | 2018-03-20 17:17:45 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-03-20 17:17:45 +0800 |
| commit | 5cdaf270f798218bddc72bde05d8ab77267cfb94 (patch) | |
| tree | a857cf36325d9b537bf4bb3c6516cbd94284d912 /ui/app/components | |
| parent | 424e98f6a896df6a848a92ef318464abc505d83d (diff) | |
| download | tangerine-wallet-browser-5cdaf270f798218bddc72bde05d8ab77267cfb94.tar.gz tangerine-wallet-browser-5cdaf270f798218bddc72bde05d8ab77267cfb94.tar.zst tangerine-wallet-browser-5cdaf270f798218bddc72bde05d8ab77267cfb94.zip | |
Don't block user from setting gas if estimating gas returns errors. (#3627)
Diffstat (limited to 'ui/app/components')
| -rw-r--r-- | ui/app/components/send/gas-fee-display-v2.js | 7 | ||||
| -rw-r--r-- | ui/app/components/send/send-v2-container.js | 1 |
2 files changed, 6 insertions, 2 deletions
diff --git a/ui/app/components/send/gas-fee-display-v2.js b/ui/app/components/send/gas-fee-display-v2.js index 0c6f76303..9aaa31b1e 100644 --- a/ui/app/components/send/gas-fee-display-v2.js +++ b/ui/app/components/send/gas-fee-display-v2.js @@ -18,6 +18,7 @@ GasFeeDisplay.prototype.render = function () { onClick, primaryCurrency = 'ETH', convertedCurrency, + gasLoadingError, } = this.props return h('div.send-v2__gas-fee-display', [ @@ -31,11 +32,13 @@ GasFeeDisplay.prototype.render = function () { convertedPrefix: '$', readOnly: true, }) - : h('div.currency-display', t('loading')), + : gasLoadingError + ? h('div..currency-display.currency-display--message', 'Set with the gas price customizer.') + : h('div.currency-display', t('loading')), h('button.send-v2__sliders-icon-container', { onClick, - disabled: !gasTotal, + disabled: !gasTotal && !gasLoadingError, }, [ h('i.fa.fa-sliders.send-v2__sliders-icon'), ]), diff --git a/ui/app/components/send/send-v2-container.js b/ui/app/components/send/send-v2-container.js index 1106902b7..d1319b6dc 100644 --- a/ui/app/components/send/send-v2-container.js +++ b/ui/app/components/send/send-v2-container.js @@ -48,6 +48,7 @@ function mapStateToProps (state) { primaryCurrency, convertedCurrency: getCurrentCurrency(state), data, + selectedAddress, amountConversionRate: selectedToken ? tokenToFiatRate : conversionRate, tokenContract: getSelectedTokenContract(state), unapprovedTxs: state.metamask.unapprovedTxs, |