mirror of
https://github.com/kremalicious/metamask-extension.git
synced 2024-11-24 11:01:41 +01:00
87cf0ced13
The token amount displayed when confirming a token transaction was wrongly being converted to a string in the container. As a result, the conversion into the user's preferred currency would fail. A default value of '0' was added for the token amount as well, to prevent `undefined` from being rendered as the value. Really the value should never be undefined, but it was rather difficult to handle that case without a deeper investigation into how it might occur. The 0 default is consistent with existing rendering logic.
62 lines
1.9 KiB
JavaScript
62 lines
1.9 KiB
JavaScript
import { connect } from 'react-redux'
|
|
import { compose } from 'recompose'
|
|
import { withRouter } from 'react-router-dom'
|
|
import ConfirmTokenTransactionBase from './confirm-token-transaction-base.component'
|
|
import {
|
|
contractExchangeRateSelector,
|
|
transactionFeeSelector,
|
|
} from '../../selectors/confirm-transaction'
|
|
import { tokenSelector } from '../../selectors/tokens'
|
|
import {
|
|
getTokenData,
|
|
} from '../../helpers/utils/transactions.util'
|
|
import {
|
|
calcTokenAmount,
|
|
getTokenToAddress,
|
|
getTokenValue,
|
|
} from '../../helpers/utils/token-util'
|
|
|
|
|
|
const mapStateToProps = (state, ownProps) => {
|
|
const { match: { params = {} } } = ownProps
|
|
const { id: paramsTransactionId } = params
|
|
const { confirmTransaction, metamask: { currentCurrency, conversionRate, selectedAddressTxList } } = state
|
|
|
|
const {
|
|
txData: { id: transactionId, txParams: { to: tokenAddress, data } = {} } = {},
|
|
} = confirmTransaction
|
|
|
|
const transaction = selectedAddressTxList.find(({ id }) => id === (Number(paramsTransactionId) || transactionId)) || {}
|
|
|
|
const {
|
|
ethTransactionTotal,
|
|
fiatTransactionTotal,
|
|
} = transactionFeeSelector(state, transaction)
|
|
const tokens = tokenSelector(state)
|
|
const currentToken = tokens && tokens.find(({ address }) => tokenAddress === address)
|
|
const { decimals, symbol: tokenSymbol } = currentToken || {}
|
|
|
|
const tokenData = getTokenData(data)
|
|
const tokenValue = tokenData && getTokenValue(tokenData.params)
|
|
const toAddress = tokenData && getTokenToAddress(tokenData.params)
|
|
const tokenAmount = tokenData && calcTokenAmount(tokenValue, decimals).toNumber()
|
|
const contractExchangeRate = contractExchangeRateSelector(state)
|
|
|
|
return {
|
|
toAddress,
|
|
tokenAddress,
|
|
tokenAmount,
|
|
tokenSymbol,
|
|
currentCurrency,
|
|
conversionRate,
|
|
contractExchangeRate,
|
|
fiatTransactionTotal,
|
|
ethTransactionTotal,
|
|
}
|
|
}
|
|
|
|
export default compose(
|
|
withRouter,
|
|
connect(mapStateToProps)
|
|
)(ConfirmTokenTransactionBase)
|