diff options
| author | kumavis <aaron@kumavis.me> | 2018-03-21 04:01:08 +0800 |
|---|---|---|
| committer | kumavis <aaron@kumavis.me> | 2018-03-21 04:01:08 +0800 |
| commit | 29cc2f8ab9628d21cc32962666879c71be4e69d1 (patch) | |
| tree | 592a68784a7e8f7ee600249380fb2f4e11d1e8dd /ui/app/components/send | |
| parent | 2ddc2cc1fbe5249f70d80e2a74146cb87dcc8421 (diff) | |
| parent | fd3e240dd934c0938a57344a6ae09a213aaa8e37 (diff) | |
| download | tangerine-wallet-browser-29cc2f8ab9628d21cc32962666879c71be4e69d1.tar.gz tangerine-wallet-browser-29cc2f8ab9628d21cc32962666879c71be4e69d1.tar.zst tangerine-wallet-browser-29cc2f8ab9628d21cc32962666879c71be4e69d1.zip | |
Merge branch 'master' of github.com:MetaMask/metamask-extension into i18n-translator-redux
Diffstat (limited to 'ui/app/components/send')
| -rw-r--r-- | ui/app/components/send/gas-fee-display-v2.js | 11 | ||||
| -rw-r--r-- | ui/app/components/send/send-v2-container.js | 1 |
2 files changed, 8 insertions, 4 deletions
diff --git a/ui/app/components/send/gas-fee-display-v2.js b/ui/app/components/send/gas-fee-display-v2.js index c156e4482..04a43df2f 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,13 +32,15 @@ GasFeeDisplay.prototype.render = function () { convertedPrefix: '$', readOnly: true, }) - : h('div.currency-display', t(this.props.localeMessages, 'loading')), + : gasLoadingError + ? h('div.currency-display.currency-display--message', t(this.props.localeMessages, 'setGasPrice')) + : h('div.currency-display', t(this.props.localeMessages, 'loading')), - h('button.send-v2__sliders-icon-container', { + h('button.sliders-icon-container', { onClick, - disabled: !gasTotal, + disabled: !gasTotal && !gasLoadingError, }, [ - h('i.fa.fa-sliders.send-v2__sliders-icon'), + h('i.fa.fa-sliders.sliders-icon'), ]), ]) diff --git a/ui/app/components/send/send-v2-container.js b/ui/app/components/send/send-v2-container.js index a2a3ed389..25902cfce 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, |