From c5424d2dcc330f690e6d5eaa7ba3ada915d2bf17 Mon Sep 17 00:00:00 2001
From: Moody Salem <moody.salem@gmail.com>
Date: Thu, 29 Apr 2021 10:26:12 -0500
Subject: [PATCH] some tweaks to the token logo

---
 src/components/CurrencyInputPanel/index.tsx | 5 ++++-
 src/components/CurrencyLogo/index.tsx       | 8 ++++----
 src/components/Logo/index.tsx               | 9 ++++++---
 src/hooks/useColor.ts                       | 2 +-
 4 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/src/components/CurrencyInputPanel/index.tsx b/src/components/CurrencyInputPanel/index.tsx
index 03ac7fd382..0a621bebcc 100644
--- a/src/components/CurrencyInputPanel/index.tsx
+++ b/src/components/CurrencyInputPanel/index.tsx
@@ -216,10 +216,13 @@ export default function CurrencyInputPanel({
               <TYPE.body color={theme.text3} fontWeight={500} fontSize={14}>
                 {label}
               </TYPE.body>
-              {fiatValueOfTypedAmount ? <TYPE.label>${fiatValueOfTypedAmount?.toFixed(2)}</TYPE.label> : null}
+              <TYPE.label>
+                {fiatValueOfTypedAmount ? '~' : ''}${fiatValueOfTypedAmount?.toSignificant(4) ?? '-'}
+              </TYPE.label>
             </RowBetween>
           </LabelRow>
         )}
+
         <InputRow style={hideInput ? { padding: '0', borderRadius: '8px' } : {}} selected={!onCurrencySelect}>
           <CurrencySelect
             selected={!!currency}
diff --git a/src/components/CurrencyLogo/index.tsx b/src/components/CurrencyLogo/index.tsx
index 6c68faae88..e8cf746298 100644
--- a/src/components/CurrencyLogo/index.tsx
+++ b/src/components/CurrencyLogo/index.tsx
@@ -1,7 +1,6 @@
-import { Currency, ETHER, Token } from '@uniswap/sdk-core'
+import { ChainId, Currency, ETHER, Token } from '@uniswap/sdk-core'
 import React, { useMemo } from 'react'
 import styled from 'styled-components'
-
 import EthereumLogo from '../../assets/images/ethereum-logo.png'
 import useHttpLocations from '../../hooks/useHttpLocations'
 import { WrappedTokenInfo } from '../../state/lists/hooks'
@@ -41,10 +40,11 @@ export default function CurrencyLogo({
     if (currency === ETHER) return []
 
     if (currency instanceof Token) {
+      const defaultUrls = currency.chainId === ChainId.MAINNET ? [getTokenLogoURL(currency.address)] : []
       if (currency instanceof WrappedTokenInfo) {
-        return [...uriLocations, getTokenLogoURL(currency.address)]
+        return [...uriLocations, ...defaultUrls]
       }
-      return [getTokenLogoURL(currency.address)]
+      return defaultUrls
     }
     return []
   }, [currency, uriLocations])
diff --git a/src/components/Logo/index.tsx b/src/components/Logo/index.tsx
index 4de1df3e8b..fa7124aad5 100644
--- a/src/components/Logo/index.tsx
+++ b/src/components/Logo/index.tsx
@@ -1,6 +1,7 @@
 import React, { useState } from 'react'
-import { HelpCircle } from 'react-feather'
+import { Slash } from 'react-feather'
 import { ImageProps } from 'rebass'
+import useTheme from '../../hooks/useTheme'
 
 const BAD_SRCS: { [tokenAddress: string]: true } = {}
 
@@ -11,9 +12,11 @@ export interface LogoProps extends Pick<ImageProps, 'style' | 'alt' | 'className
 /**
  * Renders an image by sequentially trying a list of URIs, and then eventually a fallback triangle alert
  */
-export default function Logo({ srcs, alt, ...rest }: LogoProps) {
+export default function Logo({ srcs, alt, style, ...rest }: LogoProps) {
   const [, refresh] = useState<number>(0)
 
+  const theme = useTheme()
+
   const src: string | undefined = srcs.find((src) => !BAD_SRCS[src])
 
   if (src) {
@@ -30,5 +33,5 @@ export default function Logo({ srcs, alt, ...rest }: LogoProps) {
     )
   }
 
-  return <HelpCircle {...rest} />
+  return <Slash {...rest} style={{ ...style, color: theme.bg4 }} />
 }
diff --git a/src/hooks/useColor.ts b/src/hooks/useColor.ts
index 3dc438847b..56a243ffe4 100644
--- a/src/hooks/useColor.ts
+++ b/src/hooks/useColor.ts
@@ -6,7 +6,7 @@ import { Token, ChainId } from '@uniswap/sdk-core'
 import uriToHttp from 'utils/uriToHttp'
 
 async function getColorFromToken(token: Token): Promise<string | null> {
-  if (token.chainId === ChainId.RINKEBY && token.address === '0xc7AD46e0b8a400Bb3C915120d284AafbA8fc4735') {
+  if (token.chainId !== ChainId.MAINNET) {
     return Promise.resolve('#FAAB14')
   }