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 pull request #6481 from MetaMask/address-prop-types-errors

Browse Source 
Address prop types errors
This commit is contained in:
Thomas Huang 2019-04-18 08:22:45 -06:00 committed by GitHub
commit 4fa9576cc1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ui/app/pages/confirm-add-suggested-token/confirm-add-suggested-token.container.js
View File

@ -18,7 +18,7 @@ const mapStateToProps = ({ metamask }) => {
const mapDispatchToProps = dispatch => {
return {
addToken: ({address, symbol, decimals, image}) => dispatch(addToken(address, symbol, decimals, image)),
addToken: ({address, symbol, decimals, image}) => dispatch(addToken(address, symbol, Number(decimals), image)),
removeSuggestedTokens: () => dispatch(removeSuggestedTokens()),
}
}

2
ui/app/pages/send/send-content/send-asset-row/send-asset-row.component.js
View File

@ -11,7 +11,7 @@ export default class SendAssetRow extends Component {
tokens: PropTypes.arrayOf(
PropTypes.shape({
address: PropTypes.string,
decimals: PropTypes.number,
decimals: PropTypes.oneOfType([PropTypes.string, PropTypes.number]),
symbol: PropTypes.string,
})
).isRequired,

3
ui/app/selectors/selectors.js
View File

@ -91,7 +91,8 @@ function getAccountType (state) {
}
function getSelectedAsset (state) {
return getSelectedToken(state) || 'ETH'
const selectedToken = getSelectedToken(state)
return selectedToken && selectedToken.symbol || 'ETH'
}
function getCurrentNetworkId (state) {