remove fallback url for token icon to trust wallet assets (#1042)

Fixes #960

configs/app/config.ts

@@ -108,7 +108,6 @@ const config = Object.freeze({
       decimals: Number(getEnvValue(process.env.NEXT_PUBLIC_NETWORK_CURRENCY_DECIMALS)) || DEFAULT_CURRENCY_DECIMALS,
       address: getEnvValue(process.env.NEXT_PUBLIC_NETWORK_TOKEN_ADDRESS),
     },
-    assetsPathname: getEnvValue(process.env.NEXT_PUBLIC_NETWORK_ASSETS_PATHNAME),
     explorers: parseEnvJson<Array<NetworkExplorer>>(getEnvValue(process.env.NEXT_PUBLIC_NETWORK_EXPLORERS)) || [],
     verificationType: getEnvValue(process.env.NEXT_PUBLIC_NETWORK_VERIFICATION_TYPE) || 'mining',
     rpcUrl: getEnvValue(process.env.NEXT_PUBLIC_NETWORK_RPC_URL),

configs/envs/.env.eth

@@ -17,7 +17,6 @@ NEXT_PUBLIC_API_SPEC_URL=https://raw.githubusercontent.com/blockscout/blockscout
 # network config
 NEXT_PUBLIC_NETWORK_NAME=Ethereum
 NEXT_PUBLIC_NETWORK_SHORT_NAME=ETH
-NEXT_PUBLIC_NETWORK_ASSETS_PATHNAME=ethereum
 NEXT_PUBLIC_NETWORK_LOGO=
 NEXT_PUBLIC_NETWORK_ICON=
 NEXT_PUBLIC_NETWORK_ID=1

configs/envs/.env.eth_goerli

@@ -17,7 +17,6 @@ NEXT_PUBLIC_API_SPEC_URL=https://raw.githubusercontent.com/blockscout/blockscout
 # network config
 NEXT_PUBLIC_NETWORK_NAME=Goerli
 NEXT_PUBLIC_NETWORK_SHORT_NAME=Goerli
-NEXT_PUBLIC_NETWORK_ASSETS_PATHNAME=
 NEXT_PUBLIC_NETWORK_LOGO=https://raw.githubusercontent.com/blockscout/frontend-configs/dev/configs/network-logos/goerli.svg
 NEXT_PUBLIC_NETWORK_ICON=https://raw.githubusercontent.com/blockscout/frontend-configs/dev/configs/network-icons/goerli.svg
 NEXT_PUBLIC_NETWORK_ID=5

configs/envs/.env.jest

@@ -28,7 +28,6 @@ NEXT_PUBLIC_IS_L2_NETWORK=false
 # network config
 NEXT_PUBLIC_NETWORK_NAME=Blockscout
 NEXT_PUBLIC_NETWORK_SHORT_NAME=Blockscout
-NEXT_PUBLIC_NETWORK_ASSETS_PATHNAME=
 NEXT_PUBLIC_NETWORK_ID=1
 NEXT_PUBLIC_NETWORK_CURRENCY_NAME=Ether
 NEXT_PUBLIC_NETWORK_CURRENCY_SYMBOL=ETH

configs/envs/.env.localhost

@@ -18,7 +18,6 @@ NEXT_PUBLIC_API_SPEC_URL=https://raw.githubusercontent.com/blockscout/blockscout
 # network config
 NEXT_PUBLIC_NETWORK_NAME=POA
 NEXT_PUBLIC_NETWORK_SHORT_NAME=POA
-NEXT_PUBLIC_NETWORK_ASSETS_PATHNAME=
 NEXT_PUBLIC_NETWORK_ID=99
 NEXT_PUBLIC_NETWORK_CURRENCY_NAME=POA
 NEXT_PUBLIC_NETWORK_CURRENCY_SYMBOL=POA

configs/envs/.env.main

@@ -17,7 +17,6 @@ NEXT_PUBLIC_API_SPEC_URL=https://raw.githubusercontent.com/blockscout/blockscout
 # network config
 NEXT_PUBLIC_NETWORK_NAME=Goerli
 NEXT_PUBLIC_NETWORK_SHORT_NAME=Goerli
-NEXT_PUBLIC_NETWORK_ASSETS_PATHNAME=
 NEXT_PUBLIC_NETWORK_LOGO=https://raw.githubusercontent.com/blockscout/frontend-configs/dev/configs/network-logos/goerli.svg
 NEXT_PUBLIC_NETWORK_ICON=https://raw.githubusercontent.com/blockscout/frontend-configs/dev/configs/network-icons/goerli.svg
 NEXT_PUBLIC_NETWORK_ID=5

configs/envs/.env.main.L2

@@ -20,7 +20,6 @@ NEXT_PUBLIC_API_SPEC_URL=https://raw.githubusercontent.com/blockscout/blockscout
 # network config
 NEXT_PUBLIC_NETWORK_NAME=Base Göerli
 NEXT_PUBLIC_NETWORK_SHORT_NAME=Base
-NEXT_PUBLIC_NETWORK_ASSETS_PATHNAME=
 NEXT_PUBLIC_NETWORK_LOGO=https://raw.githubusercontent.com/blockscout/frontend-configs/dev/configs/network-logos/base.svg
 NEXT_PUBLIC_NETWORK_ICON=https://raw.githubusercontent.com/blockscout/frontend-configs/dev/configs/network-icons/base.svg
 NEXT_PUBLIC_NETWORK_ID=84531

configs/envs/.env.poa_core

@@ -21,7 +21,6 @@ NEXT_PUBLIC_API_SPEC_URL=https://raw.githubusercontent.com/blockscout/blockscout
 # network config
 NEXT_PUBLIC_NETWORK_NAME=POA
 NEXT_PUBLIC_NETWORK_SHORT_NAME=POA
-NEXT_PUBLIC_NETWORK_ASSETS_PATHNAME=poa
 NEXT_PUBLIC_NETWORK_ID=99
 NEXT_PUBLIC_NETWORK_CURRENCY_NAME=POA
 NEXT_PUBLIC_NETWORK_CURRENCY_SYMBOL=POA

configs/envs/.env.pw

@@ -29,7 +29,6 @@ NEXT_PUBLIC_AD_BANNER_PROVIDER=slise
 # network config
 NEXT_PUBLIC_NETWORK_NAME=Blockscout
 NEXT_PUBLIC_NETWORK_SHORT_NAME=Blockscout
-NEXT_PUBLIC_NETWORK_ASSETS_PATHNAME=
 NEXT_PUBLIC_NETWORK_ID=1
 NEXT_PUBLIC_NETWORK_CURRENCY_NAME=Ether
 NEXT_PUBLIC_NETWORK_CURRENCY_SYMBOL=ETH

docs/ENVS.md

@@ -16,7 +16,6 @@ The app instance could be customized by passing following variables to NodeJS en
 | NEXT_PUBLIC_NETWORK_CURRENCY_SYMBOL | `string` | Network currency symbol | - | - | `ETH` |
 | NEXT_PUBLIC_NETWORK_CURRENCY_DECIMALS | `string` | Network currency decimals | - | `18` | `6` |
 | NEXT_PUBLIC_NETWORK_TOKEN_ADDRESS | `string` | Address of network's native token | - | - | `0x029a799563238d0e75e20be2f4bda0ea68d00172` |
-| NEXT_PUBLIC_NETWORK_ASSETS_PATHNAME | `string` | Network name for constructing url of token logos according to template `https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/${assetsNamePath}/assets/${tokenAddress}/logo.png`. It should match network name in TrustWallet assets repo, see the full list [here](https://github.com/trustwallet/assets/tree/master/blockchains) | - | - | `ethereum` |
 | NEXT_PUBLIC_NETWORK_LOGO | `string` | Network logo; if not provided, placeholder will be shown; *Note* the logo height should be 20px and width less than 120px | - | - | `https://placekitten.com/240/40` |
 | NEXT_PUBLIC_NETWORK_LOGO_DARK | `string` | Network logo for dark color mode; if not provided, **inverted** regular logo will be used instead | - | - | `https://placekitten.com/240/40` |
 | NEXT_PUBLIC_NETWORK_ICON | `string` | Network icon; used as a replacement for regular network logo when nav bar is collapsed; if not provided, placeholder will be shown; *Note* the icon size should be at least 60px by 60px | - | - | `https://placekitten.com/60/60` |

ui/shared/TokenLogo.tsx

@@ -3,7 +3,6 @@ import React from 'react';
 
 import type { TokenInfo } from 'types/api/token';
 
-import appConfig from 'configs/app/config';
 import TokenLogoPlaceholder from 'ui/shared/TokenLogoPlaceholder';
 
 export interface Props {
@@ -18,27 +17,11 @@ const TokenLogo = ({ className, isLoading, data }: Props) => {
     return <Skeleton className={ className } borderRadius="base" flexShrink={ 0 }/>;
   }
 
-  const logoSrc = (() => {
-    if (data?.icon_url) {
-      return data.icon_url;
-    }
-
-    if (appConfig.network.assetsPathname && data?.address) {
-      return [
-        'https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/',
-        appConfig.network.assetsPathname,
-        '/assets/',
-        data.address,
-        '/logo.png',
-      ].join('');
-    }
-  })();
-
   return (
     <Image
       borderRadius="base"
       className={ className }
-      src={ logoSrc }
+      src={ data?.icon_url ?? undefined }
       alt={ `${ data?.name || 'token' } logo` }
       fallback={ <TokenLogoPlaceholder className={ className }/> }
     />