mirror of
https://github.com/kremalicious/metamask-extension.git
synced 2024-11-23 18:41:38 +01:00
ddaa492751
The chosen token in the `send` flow was set from one of two places: `metamask.selectedTokenAddress` or `metamask.send.token`. The former is used most of the time, but the latter is used for the 'Edit' button shown in the upper-left of the confirmation UI. The send flow will now exclusively use `metamask.send.token` for the token state during the send flow. `metamask.selectedTokenAddress` is now only used for the selected token state on the Home screen. This simplifies the Redux state, as the send token is now in one place instead of two, and `metamask.selectedTokenAddress` has only one purpose.
65 lines
1.7 KiB
JavaScript
65 lines
1.7 KiB
JavaScript
import { connect } from 'react-redux'
|
|
import { compose } from 'redux'
|
|
import { withRouter } from 'react-router-dom'
|
|
import ConfirmSendToken from './confirm-send-token.component'
|
|
import { clearConfirmTransaction } from '../../ducks/confirm-transaction/confirm-transaction.duck'
|
|
import { updateSend, showSendTokenPage } from '../../store/actions'
|
|
import { conversionUtil } from '../../helpers/utils/conversion-util'
|
|
import { sendTokenTokenAmountAndToAddressSelector } from '../../selectors'
|
|
|
|
const mapStateToProps = (state) => {
|
|
const { tokenAmount } = sendTokenTokenAmountAndToAddressSelector(state)
|
|
|
|
return {
|
|
tokenAmount,
|
|
}
|
|
}
|
|
|
|
const mapDispatchToProps = (dispatch) => {
|
|
return {
|
|
editTransaction: ({ txData, tokenData, tokenProps }) => {
|
|
|
|
const {
|
|
id,
|
|
txParams: {
|
|
from,
|
|
to: tokenAddress,
|
|
gas: gasLimit,
|
|
gasPrice,
|
|
} = {},
|
|
} = txData
|
|
|
|
const { params = [] } = tokenData
|
|
const { value: to } = params[0] || {}
|
|
const { value: tokenAmountInDec } = params[1] || {}
|
|
|
|
const tokenAmountInHex = conversionUtil(tokenAmountInDec, {
|
|
fromNumericBase: 'dec',
|
|
toNumericBase: 'hex',
|
|
})
|
|
|
|
dispatch(updateSend({
|
|
from,
|
|
gasLimit,
|
|
gasPrice,
|
|
gasTotal: null,
|
|
to,
|
|
amount: tokenAmountInHex,
|
|
errors: { to: null, amount: null },
|
|
editingTransactionId: id && id.toString(),
|
|
token: {
|
|
...tokenProps,
|
|
address: tokenAddress,
|
|
},
|
|
}))
|
|
dispatch(clearConfirmTransaction())
|
|
dispatch(showSendTokenPage())
|
|
},
|
|
}
|
|
}
|
|
|
|
export default compose(
|
|
withRouter,
|
|
connect(mapStateToProps, mapDispatchToProps)
|
|
)(ConfirmSendToken)
|