aboutsummaryrefslogtreecommitdiffstats
path: root/ui/app/components/send/gas-fee-display-v2.js
diff options
context:
space:
mode:
authorDan <danjm.com@gmail.com>2018-03-20 19:57:27 +0800
committerDan <danjm.com@gmail.com>2018-03-20 19:57:27 +0800
commitd9160ac6da48bfead4cf47a5d9dc142432c52e0c (patch)
tree929ddf8387cecc78ef26dbb85461fe5e0d925d8a /ui/app/components/send/gas-fee-display-v2.js
parentd8788af9b867cebcc702384b780cc06a06f9d33b (diff)
parent4af1003b0efa8329718f5a95826976a54194d49b (diff)
downloadtangerine-wallet-browser-d9160ac6da48bfead4cf47a5d9dc142432c52e0c.tar.gz
tangerine-wallet-browser-d9160ac6da48bfead4cf47a5d9dc142432c52e0c.tar.zst
tangerine-wallet-browser-d9160ac6da48bfead4cf47a5d9dc142432c52e0c.zip
Merge branch 'master' into retry-tx-refractor
Diffstat (limited to 'ui/app/components/send/gas-fee-display-v2.js')
-rw-r--r--ui/app/components/send/gas-fee-display-v2.js7
1 files changed, 5 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 ca7fbd9a0..f6af13454 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.sliders-icon-container', {
onClick,
- disabled: !gasTotal,
+ disabled: !gasTotal && !gasLoadingError,
}, [
h('i.fa.fa-sliders.sliders-icon'),
]),