fix: e2e test formatting, remove Maybe<>

cypress/e2e/swap.test.ts

@@ -1,5 +1,7 @@
-import { USDC_MAINNET } from '../../src/constants/tokens'
-import { UNI_GOERLI, WETH_GOERLI } from '../fixtures/constants'
+import { WETH9 } from '@uniswap/sdk-core'
+
+import { UNI as UNI_MAINNET, USDC_MAINNET } from '../../src/constants/tokens'
+import { WETH_GOERLI } from '../fixtures/constants'
 import { HardhatProvider } from '../support/hardhat'
 import { getTestSelector } from '../utils'
 
@@ -180,69 +182,67 @@ describe('Swap', () => {
           })
         })
     })
+  })
 
-    describe('Swap on Token Detail Page', () => {
-      beforeEach(() => {
-        // On mobile widths, we just link back to /swap instead of rendering the swap component.
-        cy.viewport(1200, 800)
-        cy.visit(`/tokens/goerli/${UNI_GOERLI}`).then(() => {
-          cy.wait('@eth_blockNumber')
-          cy.scrollTo('top')
-        })
+  describe('Swap on Token Detail Page', () => {
+    beforeEach(() => {
+      // On mobile widths, we just link back to /swap instead of rendering the swap component.
+      cy.viewport(1200, 800)
+      cy.visit(`/tokens/ethereum/${UNI_MAINNET[1].address}`, { ethereum: 'hardhat' }).then(() => {
+        cy.wait('@eth_blockNumber')
+        cy.scrollTo('top')
       })
+    })
 
-      it('should have the expected output for a tokens detail page', () => {
-        verifyAmount('input', '')
-        verifyToken('input', null)
-        verifyAmount('output', null)
-        verifyToken('output', 'UNI')
-      })
+    it('should have the expected output for a tokens detail page', () => {
+      verifyAmount('input', '')
+      verifyToken('input', null)
+      verifyAmount('output', null)
+      verifyToken('output', 'UNI')
+    })
 
-      it('should automatically navigate to the new TDP', () => {
-        selectToken('WETH', 'output')
-        cy.url().should('include', `${WETH_GOERLI}`)
-        cy.url().should('not.include', `${UNI_GOERLI}`)
-      })
+    it('should automatically navigate to the new TDP', () => {
+      selectToken('WETH', 'output')
+      cy.url().should('include', `${WETH9[1].address}`)
+      cy.url().should('not.include', `${UNI_MAINNET[1].address}`)
+    })
 
-      it('should not share swap state with the main swap page', () => {
-        verifyToken('output', 'UNI')
-        selectToken('WETH', 'input')
-        cy.visit('/swap')
-        cy.contains('UNI').should('not.exist')
-        cy.contains('WETH').should('not.exist')
-      })
+    it('should not share swap state with the main swap page', () => {
+      verifyToken('output', 'UNI')
+      selectToken('WETH', 'input')
+      cy.visit('/swap')
+      cy.contains('UNI').should('not.exist')
+      cy.contains('WETH').should('not.exist')
+    })
 
-      it('can enter an amount into input', () => {
-        cy.get('#swap-currency-input .token-amount-input').clear().type('0.001').should('have.value', '0.001')
-      })
+    it('can enter an amount into input', () => {
+      cy.get('#swap-currency-input .token-amount-input').clear().type('0.001').should('have.value', '0.001')
+    })
 
-      it('zero swap amount', () => {
-        cy.get('#swap-currency-input .token-amount-input').clear().type('0.0').should('have.value', '0.0')
-      })
+    it('zero swap amount', () => {
+      cy.get('#swap-currency-input .token-amount-input').clear().type('0.0').should('have.value', '0.0')
+    })
 
-      it('invalid swap amount', () => {
-        cy.get('#swap-currency-input .token-amount-input').clear().type('\\').should('have.value', '')
-      })
+    it('invalid swap amount', () => {
+      cy.get('#swap-currency-input .token-amount-input').clear().type('\\').should('have.value', '')
+    })
 
-      it('can enter an amount into output', () => {
-        cy.get('#swap-currency-output .token-amount-input').clear().type('0.001').should('have.value', '0.001')
-      })
+    it('can enter an amount into output', () => {
+      cy.get('#swap-currency-output .token-amount-input').clear().type('0.001').should('have.value', '0.001')
+    })
 
-      it('zero output amount', () => {
-        cy.get('#swap-currency-output .token-amount-input').clear().type('0.0').should('have.value', '0.0')
-      })
+    it('zero output amount', () => {
+      cy.get('#swap-currency-output .token-amount-input').clear().type('0.0').should('have.value', '0.0')
+    })
 
-      it('should show a L2 token even if the user is connected to a different network', () => {
-        cy.visit('/tokens').then(() => {
-          cy.wait('@eth_blockNumber')
-        })
-        cy.get(getTestSelector('tokens-network-filter-selected')).click()
-        cy.get(getTestSelector('tokens-network-filter-option-arbitrum')).click()
-        cy.get(getTestSelector('tokens-network-filter-selected')).should('contain', 'Arbitrum')
-        cy.get(getTestSelector('token-table-row-ARB')).click()
-        verifyToken('output', 'ARB')
-        cy.contains('Connect to Arbitrum').should('exist')
-      })
+    it('should show a L2 token even if the user is connected to a different network', () => {
+      cy.visit('/tokens', { ethereum: 'hardhat' })
+      cy.get(getTestSelector('tokens-network-filter-selected')).click()
+      cy.get(getTestSelector('tokens-network-filter-option-arbitrum')).click()
+      cy.get(getTestSelector('tokens-network-filter-selected')).should('contain', 'Arbitrum')
+      cy.get(getTestSelector('token-table-row-ARB')).click()
+      verifyToken('output', 'ARB')
+      cy.contains('Connect to Arbitrum').should('exist')
     })
   })
 })

src/constants/tokens.ts

@@ -519,10 +519,7 @@ export function getSwapCurrencyId(currency: Currency): string {
   if (currency.isToken) {
     return currency.address
   }
-  if (currency.isNative) {
-    return NATIVE_CHAIN_ID
-  }
-  return ''
+  return NATIVE_CHAIN_ID
 }
 
 export const TOKEN_SHORTHANDS: { [shorthand: string]: { [chainId in SupportedChainId]?: string } } = {

src/hooks/Tokens.ts

@@ -3,7 +3,6 @@ import { useWeb3React } from '@web3-react/core'
 import { getChainInfo } from 'constants/chainInfo'
 import { SupportedChainId } from 'constants/chains'
 import { DEFAULT_INACTIVE_LIST_URLS, DEFAULT_LIST_OF_LISTS } from 'constants/lists'
-import { Maybe } from 'graphql/jsutils/Maybe'
 import { useCurrencyFromMap, useTokenFromMapOrNetwork } from 'lib/hooks/useCurrency'
 import { getTokenFilter } from 'lib/hooks/useTokenList/filtering'
 import { useMemo } from 'react'
@@ -14,6 +13,8 @@ import { WrappedTokenInfo } from '../state/lists/wrappedTokenInfo'
 import { useUserAddedTokens } from '../state/user/hooks'
 import { TokenAddressMap, useUnsupportedTokenList } from './../state/lists/hooks'
 
+type Maybe<T> = T | null | undefined
+
 // reduce token map into standard address <-> Token mapping, optionally include user added tokens
 function useTokensFromMap(tokenMap: TokenAddressMap, chainId: Maybe<SupportedChainId>): { [address: string]: Token } {
   return useMemo(() => {

src/lib/hooks/useCurrency.ts

@@ -3,7 +3,6 @@ import { parseBytes32String } from '@ethersproject/strings'
 import { Currency, Token } from '@uniswap/sdk-core'
 import { useWeb3React } from '@web3-react/core'
 import { isSupportedChain, SupportedChainId } from 'constants/chains'
-import { Maybe } from 'graphql/jsutils/Maybe'
 import { useBytes32TokenContract, useTokenContract } from 'hooks/useContract'
 import { NEVER_RELOAD, useSingleCallResult } from 'lib/hooks/multicall'
 import useNativeCurrency from 'lib/hooks/useNativeCurrency'
@@ -95,7 +94,7 @@ export function useTokenFromMapOrNetwork(tokens: TokenMap, tokenAddress?: string
  */
 export function useCurrencyFromMap(
   tokens: TokenMap,
-  chainId: Maybe<SupportedChainId>,
+  chainId: SupportedChainId | undefined,
   currencyId?: string | null
 ): Currency | null | undefined {
   const nativeCurrency = useNativeCurrency(chainId)

src/lib/hooks/useNativeCurrency.ts

@@ -1,10 +1,9 @@
 import { NativeCurrency, Token } from '@uniswap/sdk-core'
 import { SupportedChainId } from 'constants/chains'
 import { nativeOnChain } from 'constants/tokens'
-import { Maybe } from 'graphql/jsutils/Maybe'
 import { useMemo } from 'react'
 
-export default function useNativeCurrency(chainId: Maybe<SupportedChainId>): NativeCurrency | Token {
+export default function useNativeCurrency(chainId: SupportedChainId | null | undefined): NativeCurrency | Token {
   return useMemo(
     () =>
       chainId

src/pages/Swap/index.tsx

@@ -53,7 +53,6 @@ import { ArrowWrapper, PageWrapper, SwapCallbackError, SwapWrapper } from '../..
 import SwapHeader from '../../components/swap/SwapHeader'
 import { SwitchLocaleLink } from '../../components/SwitchLocaleLink'
 import { getSwapCurrencyId, TOKEN_SHORTHANDS } from '../../constants/tokens'
-import { NATIVE_CHAIN_ID } from '../../constants/tokens'
 import { useCurrency, useDefaultActiveTokens } from '../../hooks/Tokens'
 import { useIsSwapUnsupported } from '../../hooks/useIsSwapUnsupported'
 import useWrapCallback, { WrapErrorText, WrapType } from '../../hooks/useWrapCallback'
@@ -502,7 +501,7 @@ export function Swap({
       onCurrencyChange?.({
         [Field.INPUT]: state[Field.INPUT],
         [Field.OUTPUT]: {
-          currencyId: outputCurrency.isToken ? outputCurrency.address : outputCurrency.isNative ? NATIVE_CHAIN_ID : '',
+          currencyId: getSwapCurrencyId(outputCurrency),
         },
       })
     },

src/utils/addressesAreEquivalent.ts

@@ -1,6 +1,4 @@
-import { Maybe } from 'graphql/jsutils/Maybe'
-
-export function addressesAreEquivalent(a: Maybe<string>, b: Maybe<string>) {
+export function addressesAreEquivalent(a: string | null | undefined, b: string | null | undefined) {
   if (!a || !b) return false
   return a === b || a.toLowerCase() === b.toLowerCase()
 }

src/utils/supportedChainId.ts

@@ -1,11 +1,10 @@
 import { SupportedChainId } from 'constants/chains'
-import { Maybe } from 'graphql/jsutils/Maybe'
 
 /**
  * Returns the input chain ID if chain is supported. If not, return undefined
  * @param chainId a chain ID, which will be returned if it is a supported chain ID
  */
-export function supportedChainId(chainId: Maybe<number>): SupportedChainId | undefined {
+export function supportedChainId(chainId: number | null | undefined): SupportedChainId | undefined {
   if (typeof chainId === 'number' && chainId in SupportedChainId) {
     return chainId
   }