diff options
| author | Alexander Tseung <alextsg@gmail.com> | 2018-03-30 00:37:29 +0800 |
|---|---|---|
| committer | Alexander Tseung <alextsg@gmail.com> | 2018-03-30 00:37:29 +0800 |
| commit | ef61ef2ce885635862bb242612dd821cb3a65b6b (patch) | |
| tree | 0f128f8b56b57a1bbe96dcf5743d34b5f95dc4cc /ui/app/components/send/gas-fee-display-v2.js | |
| parent | 58f52b2b8de9efd43896e23ab0ac9972f45bb278 (diff) | |
| parent | 8766420f19251b95211dd99ff9a45e60cf0177ad (diff) | |
| download | tangerine-wallet-browser-ef61ef2ce885635862bb242612dd821cb3a65b6b.tar.gz tangerine-wallet-browser-ef61ef2ce885635862bb242612dd821cb3a65b6b.tar.zst tangerine-wallet-browser-ef61ef2ce885635862bb242612dd821cb3a65b6b.zip | |
Fix i18n merge conflicts
Diffstat (limited to 'ui/app/components/send/gas-fee-display-v2.js')
| -rw-r--r-- | ui/app/components/send/gas-fee-display-v2.js | 8 |
1 files changed, 4 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 f6af13454..76ed1b5d4 100644 --- a/ui/app/components/send/gas-fee-display-v2.js +++ b/ui/app/components/send/gas-fee-display-v2.js @@ -2,9 +2,9 @@ const Component = require('react').Component const h = require('react-hyperscript') const inherits = require('util').inherits const CurrencyDisplay = require('./currency-display') -const t = require('../../../i18n') +const connect = require('../../metamask-connect') -module.exports = GasFeeDisplay +module.exports = connect()(GasFeeDisplay) inherits(GasFeeDisplay, Component) function GasFeeDisplay () { @@ -33,8 +33,8 @@ GasFeeDisplay.prototype.render = function () { readOnly: true, }) : gasLoadingError - ? h('div..currency-display.currency-display--message', 'Set with the gas price customizer.') - : h('div.currency-display', t('loading')), + ? h('div.currency-display.currency-display--message', this.props.t('setGasPrice')) + : h('div.currency-display', this.props.t('loading')), h('button.sliders-icon-container', { onClick, |