mirror of
https://github.com/kremalicious/metamask-extension.git
synced 2024-10-23 11:46:13 +02:00
59a1746afc
The custom spend limit was previously not validated. It did have a minimum of zero set, but this didn't have any affect (that minimum is used for form constraint validation, and this field wasn't in a form). The field was never checked to ensure the contents didn't exceed the maximum. The field is now checked for values that exceed the maximum, and invalid values in general (including negative values). The parameters to the `showEditApprovalPermissionModal` were also alphabetized to make them easier to read. In the course of doing this, I noticed that the origin was missing from one of the calls. This was responsible for the modal saying "Spend limit requested by undefined" when clicking "Edit" under the transaction details. This has been fixed.
105 lines
3.0 KiB
JavaScript
105 lines
3.0 KiB
JavaScript
import { connect } from 'react-redux'
|
|
import { compose } from 'recompose'
|
|
import { withRouter } from 'react-router-dom'
|
|
import {
|
|
contractExchangeRateSelector,
|
|
transactionFeeSelector,
|
|
} from '../../selectors/confirm-transaction'
|
|
import { showModal } from '../../store/actions'
|
|
import { tokenSelector } from '../../selectors/tokens'
|
|
import {
|
|
getTokenData,
|
|
} from '../../helpers/utils/transactions.util'
|
|
import withTokenTracker from '../../helpers/higher-order-components/with-token-tracker'
|
|
import {
|
|
calcTokenAmount,
|
|
getTokenToAddress,
|
|
getTokenValue,
|
|
} from '../../helpers/utils/token-util'
|
|
import ConfirmApprove from './confirm-approve.component'
|
|
|
|
const mapStateToProps = (state, ownProps) => {
|
|
const { match: { params = {} } } = ownProps
|
|
const { id: paramsTransactionId } = params
|
|
const {
|
|
confirmTransaction,
|
|
metamask: { currentCurrency, conversionRate, selectedAddressTxList, domainMetadata = {}, selectedAddress },
|
|
} = 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).toString(10)
|
|
const contractExchangeRate = contractExchangeRateSelector(state)
|
|
|
|
const { origin } = transaction
|
|
const formattedOrigin = origin
|
|
? origin[0].toUpperCase() + origin.slice(1)
|
|
: ''
|
|
|
|
const { icon: siteImage = '' } = domainMetadata[origin] || {}
|
|
return {
|
|
toAddress,
|
|
tokenAddress,
|
|
tokenAmount,
|
|
currentCurrency,
|
|
conversionRate,
|
|
contractExchangeRate,
|
|
fiatTransactionTotal,
|
|
ethTransactionTotal,
|
|
tokenSymbol,
|
|
siteImage,
|
|
token: { address: tokenAddress },
|
|
userAddress: selectedAddress,
|
|
origin: formattedOrigin,
|
|
data,
|
|
decimals: Number(decimals),
|
|
txData: transaction,
|
|
}
|
|
}
|
|
|
|
const mapDispatchToProps = (dispatch) => {
|
|
return {
|
|
showCustomizeGasModal: (txData) => dispatch(showModal({ name: 'CUSTOMIZE_GAS', txData })),
|
|
showEditApprovalPermissionModal: ({
|
|
customTokenAmount,
|
|
decimals,
|
|
origin,
|
|
setCustomAmount,
|
|
tokenAmount,
|
|
tokenBalance,
|
|
tokenSymbol,
|
|
}) => dispatch(showModal({
|
|
name: 'EDIT_APPROVAL_PERMISSION',
|
|
customTokenAmount,
|
|
decimals,
|
|
origin,
|
|
setCustomAmount,
|
|
tokenAmount,
|
|
tokenBalance,
|
|
tokenSymbol,
|
|
})),
|
|
}
|
|
}
|
|
|
|
export default compose(
|
|
withRouter,
|
|
connect(mapStateToProps, mapDispatchToProps),
|
|
withTokenTracker,
|
|
)(ConfirmApprove)
|
|
|