m/metamask-extension
1
0
Fork 0
mirror of https://github.com/kremalicious/metamask-extension.git synced 2024-12-23 09:52:26 +01:00
Code

Fix confirm token transaction amount display (#7081)

Browse Source 
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.
This commit is contained in:
Mark Stacey 2019-08-31 13:26:49 -03:00 committed by GitHub
parent 887b2572f5
commit 87cf0ced13
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ui/app/pages/confirm-token-transaction-base/confirm-token-transaction-base.component.js
View File

@ -28,6 +28,10 @@ export default class ConfirmTokenTransactionBase extends Component {
currentCurrency: PropTypes.string, currentCurrency: PropTypes.string,
} }
static defaultProps = {
tokenAmount: 0,
}
getFiatTransactionAmount () { getFiatTransactionAmount () {
const { tokenAmount, currentCurrency, conversionRate, contractExchangeRate } = this.props const { tokenAmount, currentCurrency, conversionRate, contractExchangeRate } = this.props

2
ui/app/pages/confirm-token-transaction-base/confirm-token-transaction-base.container.js
View File

@ -39,7 +39,7 @@ const mapStateToProps = (state, ownProps) => {
const tokenData = getTokenData(data) const tokenData = getTokenData(data)
const tokenValue = tokenData && getTokenValue(tokenData.params) const tokenValue = tokenData && getTokenValue(tokenData.params)
const toAddress = tokenData && getTokenToAddress(tokenData.params) const toAddress = tokenData && getTokenToAddress(tokenData.params)
const tokenAmount = tokenData && calcTokenAmount(tokenValue, decimals).toString() const tokenAmount = tokenData && calcTokenAmount(tokenValue, decimals).toNumber()
const contractExchangeRate = contractExchangeRateSelector(state) const contractExchangeRate = contractExchangeRateSelector(state)
return { return {