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

Merge branch 'i3554-fix-editing-dapp-token-txs' of https://github.com/danjm/metamask-extension into danjm-i3554-fix-editing-dapp-token-txs

Browse Source
This commit is contained in:
kumavis 2018-03-21 12:53:28 -07:00
commit 3595d71c2d
3 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ui/app/components/pending-tx/confirm-send-token.js
View File

@ -87,6 +87,7 @@ function mapDispatchToProps (dispatch, ownProps) {
amount: tokenAmountInHex, amount: tokenAmountInHex,
errors: { to: null, amount: null }, errors: { to: null, amount: null },
editingTransactionId: id, editingTransactionId: id,
token: ownProps.token,
})) }))
dispatch(actions.showSendTokenPage()) dispatch(actions.showSendTokenPage())
}, },

14
ui/app/components/pending-tx/index.js
View File

@ -63,14 +63,17 @@ PendingTx.prototype.componentWillMount = async function () {
isFetching: false, isFetching: false,
}) })
} }
const tokenData = txParams && abiDecoder.decodeMethod(txParams.data)
const { name: tokenMethodName } = tokenData || {}
const isTokenTransaction = ['transfer', 'approve', 'transferFrom']
.find(possibleName => tokenMethodName === possibleName)
try { if (isTokenTransaction) {
const token = util.getContractAtAddress(txParams.to) const token = util.getContractAtAddress(txParams.to)
const results = await Promise.all([ const results = await Promise.all([
token.symbol(), token.symbol(),
token.decimals(), token.decimals(),
]) ])
const [ symbol, decimals ] = results const [ symbol, decimals ] = results
if (symbol[0] && decimals[0]) { if (symbol[0] && decimals[0]) {
@ -83,11 +86,14 @@ PendingTx.prototype.componentWillMount = async function () {
}) })
} else { } else {
this.setState({ this.setState({
transactionType: TX_TYPES.SEND_ETHER, transactionType: TX_TYPES.SEND_TOKEN,
tokenAddress: txParams.to,
tokenSymbol: null,
tokenDecimals: null,
isFetching: false, isFetching: false,
}) })
} }
} catch (e) { } else {
this.setState({ this.setState({
transactionType: TX_TYPES.SEND_ETHER, transactionType: TX_TYPES.SEND_ETHER,
isFetching: false, isFetching: false,

3
ui/app/selectors.js
View File

@ -56,8 +56,9 @@ function getSelectedToken (state) {
const tokens = state.metamask.tokens || [] const tokens = state.metamask.tokens || []
const selectedTokenAddress = state.metamask.selectedTokenAddress const selectedTokenAddress = state.metamask.selectedTokenAddress
const selectedToken = tokens.filter(({ address }) => address === selectedTokenAddress)[0] const selectedToken = tokens.filter(({ address }) => address === selectedTokenAddress)[0]
const sendToken = state.metamask.send.token
return selectedToken || null return selectedToken || sendToken || null
} }
function getSelectedTokenExchangeRate (state) { function getSelectedTokenExchangeRate (state) {