Icons on activity details for claim (#2356)

* Removing unused page/component Rewards/About * Moved cowswap assets to custom/assets/cow-swap folder * Tiny refactor to V_COW contract address type * Overwriting vCOW, GNO and USDC logos on rinkeby and xdai * Displaying vCOW logo on activity modal when activity type is claim Co-authored-by: Leandro <[email protected]>
gnosis · Jan 31, 2022 · f86ed9f · f86ed9f
1 parent b7ac116
commit f86ed9f
Show file tree

Hide file tree

Showing 8 changed files with 55 additions and 137 deletions.
diff --git a/src/assets/images/cows.png b/src/assets/images/cows.png
diff --git a/src/assets/images/xdai.png b/src/assets/images/xdai.png
diff --git a/src/assets/images/wxdai.png → src/custom/assets/cow-swap/wxdai.png b/src/assets/images/wxdai.png → src/custom/assets/cow-swap/wxdai.png
diff --git a/src/custom/components/AccountDetails/Transaction/ActivityDetails.tsx b/src/custom/components/AccountDetails/Transaction/ActivityDetails.tsx
@@ -17,7 +17,7 @@ import {
 } from './styled'
 
 import { getLimitPrice, getExecutionPrice } from 'state/orders/utils'
-import { DEFAULT_PRECISION } from 'constants/index'
+import { DEFAULT_PRECISION, V_COW_CONTRACT_ADDRESS } from 'constants/index'
 import { ActivityDerivedState } from './index'
 import { GnosisSafeLink } from './StatusDetails'
 import CurrencyLogo from 'components/CurrencyLogo'
@@ -160,7 +160,9 @@ export function ActivityDetails(props: {
   const { activityDerivedState, chainId, activityLinkUrl, disableMouseActions, creationTime } = props
   const { id, isOrder, summary, order, enhancedTransaction, isCancelled, isExpired, isUnfillable } =
     activityDerivedState
-  const approvalToken = useToken(enhancedTransaction?.approval?.tokenAddress) || null
+  const tokenAddress =
+    enhancedTransaction?.approval?.tokenAddress || (enhancedTransaction?.claim && V_COW_CONTRACT_ADDRESS[chainId])
+  const singleToken = useToken(tokenAddress) || null
 
   if (!order && !enhancedTransaction) return null
 
@@ -235,9 +237,9 @@ export function ActivityDetails(props: {
         {creationTime && <CreationTimeText>{creationTime}</CreationTimeText>}
 
         {/* Token Approval Currency Logo */}
-        {!isOrder && approvalToken && (
+        {!isOrder && singleToken && (
           <ActivityVisual>
-            <CurrencyLogo currency={approvalToken} size={'24px'} />
+            <CurrencyLogo currency={singleToken} size={'24px'} />
           </ActivityVisual>
         )}
 

diff --git a/src/custom/components/CurrencyLogo/CurrencyLogoMod.tsx b/src/custom/components/CurrencyLogo/CurrencyLogoMod.tsx
@@ -4,7 +4,7 @@ import { useMemo } from 'react'
 import styled from 'styled-components/macro'
 
 import EthereumLogo from 'assets/images/ethereum-logo.png'
-import xDaiLogo from 'assets/images/xdai.png'
+import xDaiLogo from 'assets/cow-swap/xdai.png'
 import useHttpLocations from 'hooks/useHttpLocations'
 import { WrappedTokenInfo } from 'state/lists/wrappedTokenInfo'
 import Logo from 'components/Logo'

diff --git a/src/custom/constants/index.ts b/src/custom/constants/index.ts
@@ -50,7 +50,7 @@ export const GP_VAULT_RELAYER: Partial<Record<number, string>> = {
   [ChainId.XDAI]: GPv2VaultRelayer[ChainId.XDAI].address,
 }
 
-export const V_COW_CONTRACT_ADDRESS: Partial<Record<number, string>> = {
+export const V_COW_CONTRACT_ADDRESS: Record<number, string> = {
   [ChainId.MAINNET]: '0x6d04B3ad33594978D0D4B01CdB7c3bA4a90a7DFe',
   [ChainId.XDAI]: '0xA3A674a40709A837A5E742C2866eda7d3b35a7c0',
   [ChainId.RINKEBY]: '0xD7Dd9397Fb942565959c77f8e112ec5aa7D8C92c',

diff --git a/src/custom/constants/tokens/index.ts b/src/custom/constants/tokens/index.ts
@@ -3,10 +3,14 @@ import { WETH9, Token } from '@uniswap/sdk-core'
 import { DAI_RINKEBY, USDC_RINKEBY, USDT_RINKEBY, WBTC_RINKEBY } from 'utils/rinkeby/constants'
 import { DAI, USDC as USDC_MAINNET, USDT, WBTC } from '@src/constants/tokens'
 import { USDC_XDAI, /*USDT_XDAI,*/ WBTC_XDAI, WETH_XDAI, WXDAI } from 'utils/xdai/constants'
-import wxDaiLogo from 'assets/images/wxdai.png'
 import { SupportedChainId } from 'constants/chains'
 import { V_COW_CONTRACT_ADDRESS } from 'constants/index'
 
+import wxDaiLogo from 'assets/cow-swap/wxdai.png'
+import vCowLogo from 'assets/cow-swap/cowprotocol.svg'
+import gnoLogo from 'assets/cow-swap/gno.png'
+import usdcLogo from 'assets/cow-swap/usdc.png'
+
 export * from './tokensMod'
 
 function getTrustImage(mainnetAddress: string): string {
@@ -15,22 +19,6 @@ function getTrustImage(mainnetAddress: string): string {
 
 const WETH_ADDRESS_MAINNET = WETH9[ChainId.MAINNET].address
 
-export const ADDRESS_IMAGE_OVERRIDE = {
-  // Rinkeby
-  [DAI_RINKEBY.address]: getTrustImage(DAI.address),
-  [USDC_RINKEBY.address]: getTrustImage(USDC_MAINNET.address),
-  [USDT_RINKEBY.address]: getTrustImage(USDT.address),
-  [WBTC_RINKEBY.address]: getTrustImage(WBTC.address),
-  [WETH9[ChainId.RINKEBY].address]: getTrustImage(WETH_ADDRESS_MAINNET),
-
-  // xDai
-  [USDC_XDAI.address]: getTrustImage(USDC_MAINNET.address),
-  // [USDT_XDAI.address]: getTrustImage(USDT.address),
-  [WBTC_XDAI.address]: getTrustImage(WBTC.address),
-  [WXDAI.address]: wxDaiLogo,
-  [WETH_XDAI.address]: getTrustImage(WETH_ADDRESS_MAINNET),
-}
-
 const V_COW_TOKEN_MAINNET = new Token(
   SupportedChainId.MAINNET,
   V_COW_CONTRACT_ADDRESS[SupportedChainId.MAINNET] || '',
@@ -61,32 +49,53 @@ export const V_COW: Record<number, Token> = {
   [SupportedChainId.RINKEBY]: V_COW_TOKEN_RINKEBY,
 }
 
+const GNO_MAINNET = new Token(
+  SupportedChainId.MAINNET,
+  '0x6810e776880c02933d47db1b9fc05908e5386b96',
+  18,
+  'GNO',
+  'Gnosis'
+)
+const GNO_XDAI = new Token(SupportedChainId.XDAI, '0x9c58bacc331c9aa871afd802db6379a98e80cedb', 18, 'GNO', 'Gnosis')
+const GNO_RINKEBY = new Token(
+  SupportedChainId.RINKEBY,
+  '0xd0dab4e640d95e9e8a47545598c33e31bdb53c7c',
+  18,
+  'GNO',
+  'Gnosis'
+)
+
 export const GNO: Record<SupportedChainId, Token> = {
-  [SupportedChainId.MAINNET]: new Token(
-    SupportedChainId.MAINNET,
-    '0x6810e776880c02933d47db1b9fc05908e5386b96',
-    18,
-    'GNO',
-    'Gnosis'
-  ),
-  [SupportedChainId.XDAI]: new Token(
-    SupportedChainId.XDAI,
-    '0x9c58bacc331c9aa871afd802db6379a98e80cedb',
-    18,
-    'GNO',
-    'Gnosis'
-  ),
-  [SupportedChainId.RINKEBY]: new Token(
-    SupportedChainId.RINKEBY,
-    '0xd0dab4e640d95e9e8a47545598c33e31bdb53c7c',
-    18,
-    'GNO',
-    'Gnosis'
-  ),
+  [SupportedChainId.MAINNET]: GNO_MAINNET,
+  [SupportedChainId.XDAI]: GNO_XDAI,
+  [SupportedChainId.RINKEBY]: GNO_RINKEBY,
 }
 
 export const USDC_BY_CHAIN: Record<SupportedChainId, Token> = {
   [SupportedChainId.MAINNET]: USDC_MAINNET,
   [SupportedChainId.XDAI]: USDC_XDAI,
   [SupportedChainId.RINKEBY]: USDC_RINKEBY,
 }
+
+export const ADDRESS_IMAGE_OVERRIDE = {
+  // Rinkeby
+  [DAI_RINKEBY.address]: getTrustImage(DAI.address),
+  [USDC_RINKEBY.address]: getTrustImage(USDC_MAINNET.address),
+  [USDT_RINKEBY.address]: getTrustImage(USDT.address),
+  [WBTC_RINKEBY.address]: getTrustImage(WBTC.address),
+  [WETH9[ChainId.RINKEBY].address]: getTrustImage(WETH_ADDRESS_MAINNET),
+  [V_COW_TOKEN_RINKEBY.address]: vCowLogo,
+  [GNO_RINKEBY.address]: gnoLogo,
+  [USDC_RINKEBY.address]: usdcLogo,
+  // xDai
+  [USDC_XDAI.address]: getTrustImage(USDC_MAINNET.address),
+  // [USDT_XDAI.address]: getTrustImage(USDT.address),
+  [WBTC_XDAI.address]: getTrustImage(WBTC.address),
+  [WXDAI.address]: wxDaiLogo,
+  [WETH_XDAI.address]: getTrustImage(WETH_ADDRESS_MAINNET),
+  [V_COW_TOKEN_XDAI.address]: vCowLogo,
+  [GNO_XDAI.address]: gnoLogo,
+  [USDC_XDAI.address]: usdcLogo,
+  // Mainnet
+  [V_COW_TOKEN_MAINNET.address]: vCowLogo,
+}
diff --git a/src/custom/pages/Rewards/index.tsx b/src/custom/pages/Rewards/index.tsx