mirror of
https://github.com/kremalicious/metamask-extension.git
synced 2024-12-23 09:52:26 +01:00
Convert ConfirmTokenTransactionBase to functional component (#9373)
* Convert ConfirmTokenTransactionBase to functional component Co-authored-by: Mark Stacey <markjstacey@gmail.com>
This commit is contained in:
parent
380ed78a34
commit
b349a5c8b1
@ -1,6 +1,18 @@
|
|||||||
import assert from 'assert'
|
import assert from 'assert'
|
||||||
|
import { ETH } from '../constants/common'
|
||||||
import * as utils from './conversions.util'
|
import * as utils from './conversions.util'
|
||||||
|
|
||||||
|
describe('getWeiHexFromDecimalValue', function () {
|
||||||
|
it('should correctly convert 0 in ETH', function () {
|
||||||
|
const weiValue = utils.getWeiHexFromDecimalValue({
|
||||||
|
value: '0',
|
||||||
|
fromCurrency: ETH,
|
||||||
|
fromDenomination: ETH,
|
||||||
|
})
|
||||||
|
assert.equal(weiValue, '0')
|
||||||
|
})
|
||||||
|
})
|
||||||
|
|
||||||
describe('decETHToDecWEI', function () {
|
describe('decETHToDecWEI', function () {
|
||||||
it('should correctly convert 1 ETH to WEI', function () {
|
it('should correctly convert 1 ETH to WEI', function () {
|
||||||
const weiValue = utils.decETHToDecWEI('1')
|
const weiValue = utils.decETHToDecWEI('1')
|
||||||
|
@ -1,5 +1,7 @@
|
|||||||
import React, { Component } from 'react'
|
import React, { useContext, useMemo } from 'react'
|
||||||
import PropTypes from 'prop-types'
|
import PropTypes from 'prop-types'
|
||||||
|
import BigNumber from 'bignumber.js'
|
||||||
|
import { I18nContext } from '../../contexts/i18n'
|
||||||
import ConfirmTransactionBase from '../confirm-transaction-base'
|
import ConfirmTransactionBase from '../confirm-transaction-base'
|
||||||
import UserPreferencedCurrencyDisplay from '../../components/app/user-preferenced-currency-display'
|
import UserPreferencedCurrencyDisplay from '../../components/app/user-preferenced-currency-display'
|
||||||
import {
|
import {
|
||||||
@ -11,112 +13,103 @@ import {
|
|||||||
import { getWeiHexFromDecimalValue } from '../../helpers/utils/conversions.util'
|
import { getWeiHexFromDecimalValue } from '../../helpers/utils/conversions.util'
|
||||||
import { ETH, PRIMARY } from '../../helpers/constants/common'
|
import { ETH, PRIMARY } from '../../helpers/constants/common'
|
||||||
|
|
||||||
export default class ConfirmTokenTransactionBase extends Component {
|
export default function ConfirmTokenTransactionBase ({
|
||||||
static contextTypes = {
|
toAddress,
|
||||||
t: PropTypes.func,
|
tokenAddress,
|
||||||
}
|
tokenAmount = '0',
|
||||||
|
tokenSymbol,
|
||||||
|
fiatTransactionTotal,
|
||||||
|
ethTransactionTotal,
|
||||||
|
contractExchangeRate,
|
||||||
|
conversionRate,
|
||||||
|
currentCurrency,
|
||||||
|
}) {
|
||||||
|
const t = useContext(I18nContext)
|
||||||
|
|
||||||
static propTypes = {
|
const hexWeiValue = useMemo(() => {
|
||||||
tokenAddress: PropTypes.string,
|
if (tokenAmount === '0' || !contractExchangeRate) {
|
||||||
toAddress: PropTypes.string,
|
return '0'
|
||||||
tokenAmount: PropTypes.string,
|
}
|
||||||
tokenSymbol: PropTypes.string,
|
|
||||||
fiatTransactionTotal: PropTypes.string,
|
|
||||||
ethTransactionTotal: PropTypes.string,
|
|
||||||
contractExchangeRate: PropTypes.number,
|
|
||||||
conversionRate: PropTypes.number,
|
|
||||||
currentCurrency: PropTypes.string,
|
|
||||||
}
|
|
||||||
|
|
||||||
static defaultProps = {
|
const decimalEthValue = (
|
||||||
tokenAmount: '0',
|
(new BigNumber(tokenAmount)).times(new BigNumber(contractExchangeRate))
|
||||||
}
|
).toFixed()
|
||||||
|
|
||||||
getFiatTransactionAmount () {
|
return getWeiHexFromDecimalValue({
|
||||||
const { tokenAmount, currentCurrency, conversionRate, contractExchangeRate } = this.props
|
value: decimalEthValue,
|
||||||
|
fromCurrency: ETH,
|
||||||
|
fromDenomination: ETH,
|
||||||
|
})
|
||||||
|
}, [tokenAmount, contractExchangeRate])
|
||||||
|
|
||||||
return convertTokenToFiat({
|
const secondaryTotalTextOverride = useMemo(() => {
|
||||||
|
if (typeof contractExchangeRate === 'undefined') {
|
||||||
|
return formatCurrency(fiatTransactionTotal, currentCurrency)
|
||||||
|
}
|
||||||
|
|
||||||
|
const fiatTransactionAmount = convertTokenToFiat({
|
||||||
value: tokenAmount,
|
value: tokenAmount,
|
||||||
toCurrency: currentCurrency,
|
toCurrency: currentCurrency,
|
||||||
conversionRate,
|
conversionRate,
|
||||||
contractExchangeRate,
|
contractExchangeRate,
|
||||||
})
|
})
|
||||||
}
|
|
||||||
|
|
||||||
renderSubtitleComponent () {
|
|
||||||
const { contractExchangeRate, tokenAmount } = this.props
|
|
||||||
|
|
||||||
const decimalEthValue = (tokenAmount * contractExchangeRate) || '0'
|
|
||||||
const hexWeiValue = getWeiHexFromDecimalValue({
|
|
||||||
value: decimalEthValue,
|
|
||||||
fromCurrency: ETH,
|
|
||||||
fromDenomination: ETH,
|
|
||||||
})
|
|
||||||
|
|
||||||
return typeof contractExchangeRate === 'undefined'
|
|
||||||
? (
|
|
||||||
<span>
|
|
||||||
{ this.context.t('noConversionRateAvailable') }
|
|
||||||
</span>
|
|
||||||
) : (
|
|
||||||
<UserPreferencedCurrencyDisplay
|
|
||||||
value={hexWeiValue}
|
|
||||||
type={PRIMARY}
|
|
||||||
showEthLogo
|
|
||||||
hideLabel
|
|
||||||
/>
|
|
||||||
)
|
|
||||||
}
|
|
||||||
|
|
||||||
renderPrimaryTotalTextOverride () {
|
|
||||||
const { tokenAmount, tokenSymbol, ethTransactionTotal } = this.props
|
|
||||||
const tokensText = `${tokenAmount} ${tokenSymbol}`
|
|
||||||
|
|
||||||
return (
|
|
||||||
<div>
|
|
||||||
<span>{ `${tokensText} + ` }</span>
|
|
||||||
<img
|
|
||||||
src="/images/eth.svg"
|
|
||||||
height="18"
|
|
||||||
/>
|
|
||||||
<span>{ ethTransactionTotal }</span>
|
|
||||||
</div>
|
|
||||||
)
|
|
||||||
}
|
|
||||||
|
|
||||||
getSecondaryTotalTextOverride () {
|
|
||||||
const { fiatTransactionTotal, currentCurrency, contractExchangeRate } = this.props
|
|
||||||
|
|
||||||
if (typeof contractExchangeRate === 'undefined') {
|
|
||||||
return formatCurrency(fiatTransactionTotal, currentCurrency)
|
|
||||||
}
|
|
||||||
const fiatTransactionAmount = this.getFiatTransactionAmount()
|
|
||||||
const fiatTotal = addFiat(fiatTransactionAmount, fiatTransactionTotal)
|
const fiatTotal = addFiat(fiatTransactionAmount, fiatTransactionTotal)
|
||||||
const roundedFiatTotal = roundExponential(fiatTotal)
|
const roundedFiatTotal = roundExponential(fiatTotal)
|
||||||
return formatCurrency(roundedFiatTotal, currentCurrency)
|
return formatCurrency(roundedFiatTotal, currentCurrency)
|
||||||
}
|
},
|
||||||
|
[
|
||||||
|
currentCurrency,
|
||||||
|
conversionRate,
|
||||||
|
contractExchangeRate,
|
||||||
|
fiatTransactionTotal,
|
||||||
|
tokenAmount,
|
||||||
|
])
|
||||||
|
|
||||||
render () {
|
const tokensText = `${tokenAmount} ${tokenSymbol}`
|
||||||
const {
|
|
||||||
toAddress,
|
|
||||||
tokenAddress,
|
|
||||||
tokenSymbol,
|
|
||||||
tokenAmount,
|
|
||||||
...restProps
|
|
||||||
} = this.props
|
|
||||||
|
|
||||||
const tokensText = `${tokenAmount} ${tokenSymbol}`
|
return (
|
||||||
|
<ConfirmTransactionBase
|
||||||
return (
|
toAddress={toAddress}
|
||||||
<ConfirmTransactionBase
|
identiconAddress={tokenAddress}
|
||||||
toAddress={toAddress}
|
title={tokensText}
|
||||||
identiconAddress={tokenAddress}
|
subtitleComponent={
|
||||||
title={tokensText}
|
contractExchangeRate === undefined
|
||||||
subtitleComponent={this.renderSubtitleComponent()}
|
? (
|
||||||
primaryTotalTextOverride={this.renderPrimaryTotalTextOverride()}
|
<span>
|
||||||
secondaryTotalTextOverride={this.getSecondaryTotalTextOverride()}
|
{ t('noConversionRateAvailable') }
|
||||||
{...restProps}
|
</span>
|
||||||
/>
|
) : (
|
||||||
)
|
<UserPreferencedCurrencyDisplay
|
||||||
}
|
value={hexWeiValue}
|
||||||
|
type={PRIMARY}
|
||||||
|
showEthLogo
|
||||||
|
hideLabel
|
||||||
|
/>
|
||||||
|
)
|
||||||
|
}
|
||||||
|
primaryTotalTextOverride={(
|
||||||
|
<div>
|
||||||
|
<span>{ `${tokensText} + ` }</span>
|
||||||
|
<img
|
||||||
|
src="/images/eth.svg"
|
||||||
|
height="18"
|
||||||
|
/>
|
||||||
|
<span>{ ethTransactionTotal }</span>
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
|
secondaryTotalTextOverride={secondaryTotalTextOverride}
|
||||||
|
/>
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
ConfirmTokenTransactionBase.propTypes = {
|
||||||
|
tokenAddress: PropTypes.string,
|
||||||
|
toAddress: PropTypes.string,
|
||||||
|
tokenAmount: PropTypes.string,
|
||||||
|
tokenSymbol: PropTypes.string,
|
||||||
|
fiatTransactionTotal: PropTypes.string,
|
||||||
|
ethTransactionTotal: PropTypes.string,
|
||||||
|
contractExchangeRate: PropTypes.number,
|
||||||
|
conversionRate: PropTypes.number,
|
||||||
|
currentCurrency: PropTypes.string,
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user