diff --git a/ui/app/components/ui/identicon/identicon.component.js b/ui/app/components/ui/identicon/identicon.component.js index bad826dc9..d52717d05 100644 --- a/ui/app/components/ui/identicon/identicon.component.js +++ b/ui/app/components/ui/identicon/identicon.component.js @@ -3,7 +3,7 @@ import PropTypes from 'prop-types'; import classnames from 'classnames'; import contractMap from '@metamask/contract-metadata'; -import { checksumAddress } from '../../../helpers/utils/util'; +import { checksumAddress, isHex } from '../../../helpers/utils/util'; import Jazzicon from '../jazzicon'; import BlockieIdenticon from './blockieIdenticon'; @@ -85,10 +85,12 @@ export default class Identicon extends PureComponent { } if (address) { - const checksummedAddress = checksumAddress(address); + if (isHex(address)) { + const checksummedAddress = checksumAddress(address); - if (contractMap[checksummedAddress]?.logo) { - return this.renderJazzicon(); + if (contractMap[checksummedAddress]?.logo) { + return this.renderJazzicon(); + } } return ( diff --git a/ui/lib/icon-factory.js b/ui/lib/icon-factory.js index c72f5dfd9..503e20fe1 100644 --- a/ui/lib/icon-factory.js +++ b/ui/lib/icon-factory.js @@ -1,5 +1,5 @@ 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; @@ -16,7 +16,12 @@ function IconFactory(jazzicon) { } IconFactory.prototype.iconForAddress = function (address, diameter) { - const addr = checksumAddress(address); + let addr = address; + + if (isHex(address)) { + addr = checksumAddress(address); + } + if (iconExistsFor(addr)) { return imageElFor(addr); }