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

Add isHex check for addresses supplied to icons (#11071)

Browse Source
This commit is contained in:
Thomas Huang 2021-05-12 15:25:37 -07:00 committed by ryanml
parent d53bb61d47
commit 42a72aa352
2 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ui/app/components/ui/identicon/identicon.component.js
View File

@ -3,7 +3,7 @@ import PropTypes from 'prop-types';
import classnames from 'classnames'; import classnames from 'classnames';
import contractMap from '@metamask/contract-metadata'; import contractMap from '@metamask/contract-metadata';
import { checksumAddress } from '../../../helpers/utils/util'; import { checksumAddress, isHex } from '../../../helpers/utils/util';
import Jazzicon from '../jazzicon'; import Jazzicon from '../jazzicon';
import BlockieIdenticon from './blockieIdenticon'; import BlockieIdenticon from './blockieIdenticon';
@ -85,10 +85,12 @@ export default class Identicon extends PureComponent {
} }
if (address) { if (address) {
const checksummedAddress = checksumAddress(address); if (isHex(address)) {
const checksummedAddress = checksumAddress(address);
if (contractMap[checksummedAddress]?.logo) { if (contractMap[checksummedAddress]?.logo) {
return this.renderJazzicon(); return this.renderJazzicon();
}
} }
return ( return (

9
ui/lib/icon-factory.js
View File

@ -1,5 +1,5 @@
import contractMap from '@metamask/contract-metadata'; import contractMap from '@metamask/contract-metadata';
import { isValidAddress, checksumAddress } from '../app/helpers/utils/util'; import { isValidAddress, checksumAddress, isHex } from '../app/helpers/utils/util';
let iconFactory; let iconFactory;
@ -16,7 +16,12 @@ function IconFactory(jazzicon) {
} }
IconFactory.prototype.iconForAddress = function (address, diameter) { IconFactory.prototype.iconForAddress = function (address, diameter) {
const addr = checksumAddress(address); let addr = address;
if (isHex(address)) {
addr = checksumAddress(address);
}
if (iconExistsFor(addr)) { if (iconExistsFor(addr)) {
return imageElFor(addr); return imageElFor(addr);
} }