mirror of
https://github.com/kremalicious/metamask-extension.git
synced 2024-12-23 09:52:26 +01:00
Internationalize converted value in confirm screens
This commit is contained in:
parent
1382de2cda
commit
9dbb9d12ad
@ -21,6 +21,8 @@ const {
|
|||||||
const GasFeeDisplay = require('../send/gas-fee-display-v2')
|
const GasFeeDisplay = require('../send/gas-fee-display-v2')
|
||||||
const SenderToRecipient = require('../sender-to-recipient')
|
const SenderToRecipient = require('../sender-to-recipient')
|
||||||
const NetworkDisplay = require('../network-display')
|
const NetworkDisplay = require('../network-display')
|
||||||
|
const currencyFormatter = require('currency-formatter')
|
||||||
|
const currencies = require('currency-formatter/currencies')
|
||||||
|
|
||||||
const { MIN_GAS_PRICE_HEX } = require('../send/send-constants')
|
const { MIN_GAS_PRICE_HEX } = require('../send/send-constants')
|
||||||
|
|
||||||
@ -269,6 +271,16 @@ ConfirmSendEther.prototype.getData = function () {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
ConfirmSendEther.prototype.convertToRenderableCurrency = function (value, currencyCode) {
|
||||||
|
const upperCaseCurrencyCode = currencyCode.toUpperCase()
|
||||||
|
|
||||||
|
return currencies.find(currency => currency.code === upperCaseCurrencyCode)
|
||||||
|
? currencyFormatter.format(Number(value), {
|
||||||
|
code: upperCaseCurrencyCode,
|
||||||
|
})
|
||||||
|
: value
|
||||||
|
}
|
||||||
|
|
||||||
ConfirmSendEther.prototype.render = function () {
|
ConfirmSendEther.prototype.render = function () {
|
||||||
const {
|
const {
|
||||||
editTransaction,
|
editTransaction,
|
||||||
@ -308,6 +320,9 @@ ConfirmSendEther.prototype.render = function () {
|
|||||||
? 'Increase your gas fee to attempt to overwrite and speed up your transaction'
|
? 'Increase your gas fee to attempt to overwrite and speed up your transaction'
|
||||||
: 'Please review your transaction.'
|
: 'Please review your transaction.'
|
||||||
|
|
||||||
|
const convertedAmountInFiat = this.convertToRenderableCurrency(amountInFIAT, currentCurrency)
|
||||||
|
const convertedTotalInFiat = this.convertToRenderableCurrency(totalInFIAT, currentCurrency)
|
||||||
|
|
||||||
// This is from the latest master
|
// This is from the latest master
|
||||||
// It handles some of the errors that we are not currently handling
|
// It handles some of the errors that we are not currently handling
|
||||||
// Leaving as comments fo reference
|
// Leaving as comments fo reference
|
||||||
@ -354,7 +369,7 @@ ConfirmSendEther.prototype.render = function () {
|
|||||||
// `You're sending to Recipient ...${toAddress.slice(toAddress.length - 4)}`,
|
// `You're sending to Recipient ...${toAddress.slice(toAddress.length - 4)}`,
|
||||||
// ]),
|
// ]),
|
||||||
|
|
||||||
h('h3.flex-center.confirm-screen-send-amount', [`${amountInFIAT}`]),
|
h('h3.flex-center.confirm-screen-send-amount', [`${convertedAmountInFiat}`]),
|
||||||
h('h3.flex-center.confirm-screen-send-amount-currency', [ currentCurrency.toUpperCase() ]),
|
h('h3.flex-center.confirm-screen-send-amount-currency', [ currentCurrency.toUpperCase() ]),
|
||||||
h('div.flex-center.confirm-memo-wrapper', [
|
h('div.flex-center.confirm-memo-wrapper', [
|
||||||
h('h3.confirm-screen-send-memo', [ memo ? `"${memo}"` : '' ]),
|
h('h3.confirm-screen-send-memo', [ memo ? `"${memo}"` : '' ]),
|
||||||
@ -401,7 +416,7 @@ ConfirmSendEther.prototype.render = function () {
|
|||||||
]),
|
]),
|
||||||
|
|
||||||
h('div.confirm-screen-section-column', [
|
h('div.confirm-screen-section-column', [
|
||||||
h('div.confirm-screen-row-info', `${totalInFIAT} ${currentCurrency.toUpperCase()}`),
|
h('div.confirm-screen-row-info', `${convertedTotalInFiat} ${currentCurrency.toUpperCase()}`),
|
||||||
h('div.confirm-screen-row-detail', `${totalInETH} ETH`),
|
h('div.confirm-screen-row-detail', `${totalInETH} ETH`),
|
||||||
]),
|
]),
|
||||||
|
|
||||||
|
@ -25,6 +25,8 @@ const {
|
|||||||
calcTokenAmount,
|
calcTokenAmount,
|
||||||
} = require('../../token-util')
|
} = require('../../token-util')
|
||||||
const classnames = require('classnames')
|
const classnames = require('classnames')
|
||||||
|
const currencyFormatter = require('currency-formatter')
|
||||||
|
const currencies = require('currency-formatter/currencies')
|
||||||
|
|
||||||
const { MIN_GAS_PRICE_HEX } = require('../send/send-constants')
|
const { MIN_GAS_PRICE_HEX } = require('../send/send-constants')
|
||||||
|
|
||||||
@ -310,10 +312,12 @@ ConfirmSendToken.prototype.renderHeroAmount = function () {
|
|||||||
const txParams = txMeta.txParams || {}
|
const txParams = txMeta.txParams || {}
|
||||||
const { memo = '' } = txParams
|
const { memo = '' } = txParams
|
||||||
|
|
||||||
|
const convertedAmountInFiat = this.convertToRenderableCurrency(fiatAmount, currentCurrency)
|
||||||
|
|
||||||
return fiatAmount
|
return fiatAmount
|
||||||
? (
|
? (
|
||||||
h('div.confirm-send-token__hero-amount-wrapper', [
|
h('div.confirm-send-token__hero-amount-wrapper', [
|
||||||
h('h3.flex-center.confirm-screen-send-amount', `${fiatAmount}`),
|
h('h3.flex-center.confirm-screen-send-amount', `${convertedAmountInFiat}`),
|
||||||
h('h3.flex-center.confirm-screen-send-amount-currency', currentCurrency),
|
h('h3.flex-center.confirm-screen-send-amount-currency', currentCurrency),
|
||||||
h('div.flex-center.confirm-memo-wrapper', [
|
h('div.flex-center.confirm-memo-wrapper', [
|
||||||
h('h3.confirm-screen-send-memo', [ memo ? `"${memo}"` : '' ]),
|
h('h3.confirm-screen-send-memo', [ memo ? `"${memo}"` : '' ]),
|
||||||
@ -361,6 +365,9 @@ ConfirmSendToken.prototype.renderTotalPlusGas = function () {
|
|||||||
const { fiat: fiatAmount, token: tokenAmount } = this.getAmount()
|
const { fiat: fiatAmount, token: tokenAmount } = this.getAmount()
|
||||||
const { fiat: fiatGas, token: tokenGas } = this.getGasFee()
|
const { fiat: fiatGas, token: tokenGas } = this.getGasFee()
|
||||||
|
|
||||||
|
const totalInFIAT = fiatAmount && fiatGas && addCurrencies(fiatAmount, fiatGas)
|
||||||
|
const convertedTotalInFiat = this.convertToRenderableCurrency(totalInFIAT, currentCurrency)
|
||||||
|
|
||||||
return fiatAmount && fiatGas
|
return fiatAmount && fiatGas
|
||||||
? (
|
? (
|
||||||
h('section.flex-row.flex-center.confirm-screen-row.confirm-screen-total-box ', [
|
h('section.flex-row.flex-center.confirm-screen-row.confirm-screen-total-box ', [
|
||||||
@ -370,7 +377,7 @@ ConfirmSendToken.prototype.renderTotalPlusGas = function () {
|
|||||||
]),
|
]),
|
||||||
|
|
||||||
h('div.confirm-screen-section-column', [
|
h('div.confirm-screen-section-column', [
|
||||||
h('div.confirm-screen-row-info', `${addCurrencies(fiatAmount, fiatGas)} ${currentCurrency}`),
|
h('div.confirm-screen-row-info', `${convertedTotalInFiat} ${currentCurrency}`),
|
||||||
h('div.confirm-screen-row-detail', `${addCurrencies(tokenAmount, tokenGas || '0')} ${symbol}`),
|
h('div.confirm-screen-row-detail', `${addCurrencies(tokenAmount, tokenGas || '0')} ${symbol}`),
|
||||||
]),
|
]),
|
||||||
])
|
])
|
||||||
@ -405,6 +412,16 @@ ConfirmSendToken.prototype.renderErrorMessage = function (message) {
|
|||||||
: null
|
: null
|
||||||
}
|
}
|
||||||
|
|
||||||
|
ConfirmSendToken.prototype.convertToRenderableCurrency = function (value, currencyCode) {
|
||||||
|
const upperCaseCurrencyCode = currencyCode.toUpperCase()
|
||||||
|
|
||||||
|
return currencies.find(currency => currency.code === upperCaseCurrencyCode)
|
||||||
|
? currencyFormatter.format(Number(value), {
|
||||||
|
code: upperCaseCurrencyCode,
|
||||||
|
})
|
||||||
|
: value
|
||||||
|
}
|
||||||
|
|
||||||
ConfirmSendToken.prototype.render = function () {
|
ConfirmSendToken.prototype.render = function () {
|
||||||
const { editTransaction } = this.props
|
const { editTransaction } = this.props
|
||||||
const txMeta = this.gatherTxMeta()
|
const txMeta = this.gatherTxMeta()
|
||||||
|
Loading…
Reference in New Issue
Block a user