aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChen Wei <chenwei@byzantine-lab.io>2019-07-04 10:24:17 +0800
committerChen Wei <chenwei@byzantine-lab.io>2019-07-04 10:24:17 +0800
commit3d258d088abb3de8baa039d9def2fe8b00dd5f02 (patch)
tree2221f3ca97347b5bca7b6bdfc4c07a8e06948685
parent20e9132dcdc6910302dde7378ba6e6ce28603519 (diff)
downloadtangerine-wallet-browser-3d258d088abb3de8baa039d9def2fe8b00dd5f02.tar
tangerine-wallet-browser-3d258d088abb3de8baa039d9def2fe8b00dd5f02.tar.gz
tangerine-wallet-browser-3d258d088abb3de8baa039d9def2fe8b00dd5f02.tar.bz2
tangerine-wallet-browser-3d258d088abb3de8baa039d9def2fe8b00dd5f02.tar.lz
tangerine-wallet-browser-3d258d088abb3de8baa039d9def2fe8b00dd5f02.tar.xz
tangerine-wallet-browser-3d258d088abb3de8baa039d9def2fe8b00dd5f02.tar.zst
tangerine-wallet-browser-3d258d088abb3de8baa039d9def2fe8b00dd5f02.zip
replace some wordings
-rw-r--r--ui/app/components/app/gas-customization/gas-modal-page-container/advanced-tab-content/advanced-tab-content.component.js27
-rw-r--r--ui/app/components/app/gas-customization/gas-modal-page-container/gas-modal-page-container.component.js6
-rw-r--r--ui/app/components/app/gas-customization/gas-price-button-group/gas-price-button-group.component.js2
3 files changed, 17 insertions, 18 deletions
diff --git a/ui/app/components/app/gas-customization/gas-modal-page-container/advanced-tab-content/advanced-tab-content.component.js b/ui/app/components/app/gas-customization/gas-modal-page-container/advanced-tab-content/advanced-tab-content.component.js
index eab3434df..000432d8a 100644
--- a/ui/app/components/app/gas-customization/gas-modal-page-container/advanced-tab-content/advanced-tab-content.component.js
+++ b/ui/app/components/app/gas-customization/gas-modal-page-container/advanced-tab-content/advanced-tab-content.component.js
@@ -124,7 +124,7 @@ export default class AdvancedTabContent extends Component {
</div>
<div className="advanced-tab__transaction-data-summary__container">
<div className="advanced-tab__transaction-data-summary__fee">
- {transactionFee}
+ {(transactionFee || '').replace('ETH', 'TAN')}
</div>
<div className="time-remaining">{timeRemaining}</div>
</div>
@@ -204,20 +204,19 @@ export default class AdvancedTabContent extends Component {
customPriceIsSafe,
isSpeedUp,
}) }
- { isEthereumNetwork
- ? <div>
- <div className="advanced-tab__fee-chart__title">{ t('liveGasPricePredictions') }</div>
- {!gasEstimatesLoading
- ? <GasPriceChart {...gasChartProps} updateCustomGasPrice={updateCustomGasPrice} />
- : <Loading />
- }
- <div className="advanced-tab__fee-chart__speed-buttons">
- <span>{ t('slower') }</span>
- <span>{ t('faster') }</span>
- </div>
+ { isEthereumNetwork && (
+ <div>
+ <div className="advanced-tab__fee-chart__title">{ t('liveGasPricePredictions') }</div>
+ {!gasEstimatesLoading
+ ? <GasPriceChart {...gasChartProps} updateCustomGasPrice={updateCustomGasPrice} />
+ : <Loading />
+ }
+ <div className="advanced-tab__fee-chart__speed-buttons">
+ <span>{ t('slower') }</span>
+ <span>{ t('faster') }</span>
+ </div>
</div>
- : <div className="advanced-tab__fee-chart__title">{ t('chartOnlyAvailableEth') }</div>
- }
+ )}
</div>
</div>
)
diff --git a/ui/app/components/app/gas-customization/gas-modal-page-container/gas-modal-page-container.component.js b/ui/app/components/app/gas-customization/gas-modal-page-container/gas-modal-page-container.component.js
index e18c1067e..ec22c9455 100644
--- a/ui/app/components/app/gas-customization/gas-modal-page-container/gas-modal-page-container.component.js
+++ b/ui/app/components/app/gas-customization/gas-modal-page-container/gas-modal-page-container.component.js
@@ -103,15 +103,15 @@ export default class GasModalPageContainer extends Component {
<div className="gas-modal-content__info-row">
<div className="gas-modal-content__info-row__send-info">
<span className="gas-modal-content__info-row__send-info__label">{this.context.t('sendAmount')}</span>
- <span className="gas-modal-content__info-row__send-info__value">{sendAmount}</span>
+ <span className="gas-modal-content__info-row__send-info__value">{(sendAmount || '').replace('ETH', 'TAN')}</span>
</div>
<div className="gas-modal-content__info-row__transaction-info">
<span className={'gas-modal-content__info-row__transaction-info__label'}>{this.context.t('transactionFee')}</span>
- <span className="gas-modal-content__info-row__transaction-info__value">{transactionFee}</span>
+ <span className="gas-modal-content__info-row__transaction-info__value">{(transactionFee || '').replace('ETH', 'TAN')}</span>
</div>
<div className="gas-modal-content__info-row__total-info">
<span className="gas-modal-content__info-row__total-info__label">{this.context.t('newTotal')}</span>
- <span className="gas-modal-content__info-row__total-info__value">{newTotalEth}</span>
+ <span className="gas-modal-content__info-row__total-info__value">{(newTotalEth || '').replace('ETH', 'TAN')}</span>
</div>
<div className="gas-modal-content__info-row__fiat-total-info">
<span className="gas-modal-content__info-row__fiat-total-info__value">{newTotalFiat}</span>
diff --git a/ui/app/components/app/gas-customization/gas-price-button-group/gas-price-button-group.component.js b/ui/app/components/app/gas-customization/gas-price-button-group/gas-price-button-group.component.js
index 1febef2e5..fccb7d1a4 100644
--- a/ui/app/components/app/gas-customization/gas-price-button-group/gas-price-button-group.component.js
+++ b/ui/app/components/app/gas-customization/gas-price-button-group/gas-price-button-group.component.js
@@ -41,7 +41,7 @@ export default class GasPriceButtonGroup extends Component {
{ timeEstimate && <div className={`${className}__time-estimate`}>{ timeEstimate }</div> }
{feeInPrimaryCurrency && (
<div className={`${className}__primary-currency`}>
- { feeInPrimaryCurrency.replace('ETH', 'TAN') }
+ { (feeInPrimaryCurrency || '').replace('ETH', 'TAN') }
</div>)}
{ feeInSecondaryCurrency && <div className={`${className}__secondary-currency`}>{ feeInSecondaryCurrency }</div> }
{ showCheck && <div className="button-check-wrapper"><i className="fa fa-check fa-sm" /></div> }