Update components using FastCoinIcon to pass network instead of asset…

…Type
rainbow-me · Oct 26, 2023 · 4fc812d · 4fc812d
1 parent c4b72c7
commit 4fc812d
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 9 deletions.
diff --git a/src/components/asset-list/RecyclerAssetList2/FastComponents/FastBalanceCoinRow.tsx b/src/components/asset-list/RecyclerAssetList2/FastComponents/FastBalanceCoinRow.tsx
@@ -140,7 +140,7 @@ const MemoizedBalanceCoinRow = React.memo(
           <View style={[sx.container]}>
             <FastCoinIcon
               address={item.address}
-              assetType={item.type}
+              network={item.network}
               mainnetAddress={item.mainnet_address}
               symbol={item.symbol}
               theme={theme}

diff --git a/src/components/asset-list/RecyclerAssetList2/FastComponents/FastCurrencySelectionRow.tsx b/src/components/asset-list/RecyclerAssetList2/FastComponents/FastCurrencySelectionRow.tsx
@@ -14,7 +14,7 @@ import FastCoinIcon from './FastCoinIcon';
 import ContextMenuButton from '@/components/native-context-menu/contextMenu';
 import { Text } from '@/design-system';
 import { isNativeAsset } from '@/handlers/assets';
-import { Network } from '@/helpers';
+import { Network } from '@/networks/types';
 import { useAccountAsset } from '@/hooks';
 import { colors, fonts, fontWithWidth, getFontSize } from '@/styles';
 import { deviceUtils, ethereumUtils } from '@/utils';
@@ -151,7 +151,7 @@ export default React.memo(function FastCurrencySelectionRow({
         <View style={sx.rootContainer}>
           <FastCoinIcon
             address={address || item?.address}
-            assetType={type ?? item?.type}
+            network={network}
             mainnetAddress={mainnet_address ?? item?.mainnet_address}
             symbol={symbol ?? item?.symbol}
             theme={theme}

diff --git a/src/components/coin-icon/CoinIcon.tsx b/src/components/coin-icon/CoinIcon.tsx
@@ -8,7 +8,12 @@ import { Network } from '@/networks/types';
 import { useColorForAsset } from '@/hooks';
 import { ImgixImage } from '@/components/images';
 import styled from '@/styled-thing';
-import { isETH, magicMemo, CoinIcon as ReactCoinIcon } from '@/utils';
+import {
+  ethereumUtils,
+  isETH,
+  magicMemo,
+  CoinIcon as ReactCoinIcon,
+} from '@/utils';
 import { ChainBadgeType } from '@/components/coin-icon/ChainBadgeSizeConfigs';
 
 export const CoinIconSize = 40;
@@ -62,6 +67,12 @@ const CoinIcon: React.FC<Props> = ({
 
   const theme = useTheme();
 
+  const network = mainnet_address
+    ? Network.mainnet
+    : type
+    ? ethereumUtils.getNetworkFromType(type)
+    : Network.mainnet;
+
   return (
     <View>
       {isNotContractInteraction ? (
@@ -78,7 +89,7 @@ const CoinIcon: React.FC<Props> = ({
           }
           size={size}
           symbol={symbol}
-          network={mainnet_address ? Network.mainnet : type}
+          network={network}
           theme={theme}
         />
       ) : (

diff --git a/src/components/coin-row/FastTransactionCoinRow.tsx b/src/components/coin-row/FastTransactionCoinRow.tsx
@@ -1,4 +1,4 @@
-import React, { useCallback, useMemo } from 'react';
+import React, { useCallback } from 'react';
 import { StyleSheet, View } from 'react-native';
 import { ButtonPressAnimation } from '../animations';
 import FastCoinIcon from '../asset-list/RecyclerAssetList2/FastComponents/FastCoinIcon';
@@ -154,7 +154,7 @@ export default React.memo(function TransactionCoinRow({
           ) : (
             <FastCoinIcon
               address={mainnetAddress || item.address}
-              assetType={item.network}
+              network={item.network}
               mainnetAddress={mainnetAddress}
               symbol={item.symbol}
               theme={theme}

diff --git a/src/components/exchange/ExchangeTokenRow.tsx b/src/components/exchange/ExchangeTokenRow.tsx
@@ -2,7 +2,7 @@ import React from 'react';
 import isEqual from 'react-fast-compare';
 import { Box, Column, Columns, Inline, Stack, Text } from '@/design-system';
 import { isNativeAsset } from '@/handlers/assets';
-import { Network } from '@/helpers';
+import { Network } from '@/networks/types';
 import { useAccountAsset, useDimensions } from '@/hooks';
 import { ethereumUtils } from '@/utils';
 import FastCoinIcon from '../asset-list/RecyclerAssetList2/FastComponents/FastCoinIcon';
@@ -69,7 +69,7 @@ export default React.memo(function ExchangeTokenRow({
               <Box
                 as={FastCoinIcon}
                 address={address || item?.address}
-                assetType={type ?? item?.type}
+                network={network}
                 mainnetAddress={mainnet_address ?? item?.mainnet_address}
                 symbol={symbol ?? item?.symbol}
                 theme={theme}