Merge branch 'master' of https://github.com/Uniswap/uniswap-interface

callil · callil · commit ce1263533269 · 2020-08-26T15:15:06.000-04:00
diff --git a/src/components/SearchModal/ListSelect.tsx b/src/components/SearchModal/ListSelect.tsx
@@ -71,6 +71,10 @@ function ListOrigin({ listUrl }: { listUrl: string }) {
   const ensName = useMemo(() => parseENSAddress(listUrl)?.ensName, [listUrl])
   const host = useMemo(() => {
     if (ensName) return undefined
+    const lowerListUrl = listUrl.toLowerCase()
+    if (lowerListUrl.startsWith('ipfs://') || lowerListUrl.startsWith('ipns://')) {
+      return listUrl
+    }
     try {
       const url = new URL(listUrl)
       return url.host
diff --git a/src/constants/lists.ts b/src/constants/lists.ts
@@ -12,6 +12,9 @@ export const DEFAULT_LIST_OF_LISTS: string[] = [
   'stablecoin.cmc.eth',
   'tokenlist.zerion.eth',
   'https://www.coingecko.com/tokens_list/uniswap/defi_100/v_0_0_0.json',
+  'https://app.tryroll.com/tokens.json',
+  'https://raw.githubusercontent.com/compound-finance/token-list/master/compound.tokenlist.json',
+  'ipfs://QmVNCFc3y1DMt8n4K42d8BYubUhQ7FgcNxzEHxSEHszUhL', // aave token list
   'https://defiprime.com/defiprime.tokenlist.json',
   'https://umaproject.org/uma.tokenlist.json'
 ]
