6.001
diff --git a/web/cashtab/src/components/Wallet/TokenListItem.js b/web/cashtab/src/components/Wallet/TokenListItem.js
--- a/web/cashtab/src/components/Wallet/TokenListItem.js
+++ b/web/cashtab/src/components/Wallet/TokenListItem.js
@@ -1,14 +1,7 @@
import React from 'react';
import PropTypes from 'prop-types';
import styled from 'styled-components';
-import makeBlockie from 'ethereum-blockies-base64';
-import { Img } from 'react-image';
-import { currency } from '@components/Common/Ticker';
-
-const TokenIcon = styled.div`
- height: 32px;
- width: 32px;
-`;
+import TokenIcon from '@components/Tokens/TokenIcon';
const BalanceAndTicker = styled.div`
font-size: 1rem;
@@ -36,38 +29,7 @@
const TokenListItem = ({ ticker, balance, tokenId }) => {
return (
-
- {currency.tokenIconsUrl !== '' ? (
-
- }
- />
- ) : (
-
- )}
-
+
{balance} {ticker}
diff --git a/web/cashtab/src/components/Wallet/Tx.js b/web/cashtab/src/components/Wallet/Tx.js
--- a/web/cashtab/src/components/Wallet/Tx.js
+++ b/web/cashtab/src/components/Wallet/Tx.js
@@ -9,10 +9,11 @@
ExclamationOutlined,
} from '@ant-design/icons';
import { currency } from '@components/Common/Ticker';
-import makeBlockie from 'ethereum-blockies-base64';
-import { Img } from 'react-image';
+
import { fromLegacyDecimals } from '@utils/cashMethods';
import { formatBalance, formatDate } from '@utils/formatting';
+
+import TokenIcon from '@components/Tokens/TokenIcon';
const SentTx = styled(ArrowUpOutlined)`
color: ${props => props.theme.secondary} !important;
`;
@@ -255,35 +256,10 @@
{data.tokenTx && data.tokenInfo ? (
<>
- {currency.tokenIconsUrl !== '' ? (
-
- }
- />
- ) : (
-
- )}
+
{data.outgoingTx ? (
<>
diff --git a/web/cashtab/src/components/Wallet/__tests__/__snapshots__/Wallet.test.js.snap b/web/cashtab/src/components/Wallet/__tests__/__snapshots__/Wallet.test.js.snap
--- a/web/cashtab/src/components/Wallet/__tests__/__snapshots__/Wallet.test.js.snap
+++ b/web/cashtab/src/components/Wallet/__tests__/__snapshots__/Wallet.test.js.snap
@@ -3,7 +3,7 @@
exports[`Wallet with BCH balances 1`] = `
Array [
,
0
@@ -119,16 +119,16 @@
,
XEC
eToken
@@ -140,7 +140,7 @@
exports[`Wallet with BCH balances and tokens 1`] = `
Array [
,
0
@@ -256,16 +256,16 @@
,
XEC
eToken
@@ -277,14 +277,14 @@
exports[`Wallet with BCH balances and tokens and state field 1`] = `
Array [
0.06
XEC
,
$
NaN
@@ -375,16 +375,16 @@
,
XEC
eToken
@@ -396,7 +396,7 @@
exports[`Wallet without BCH balance 1`] = `
Array [
,
0
@@ -512,16 +512,16 @@
,