hydrogenesis · w982541479 · Sep 18, 2022 · Sep 26, 2022 · Sep 27, 2022 · Sep 27, 2022
diff --git a/package.json b/package.json
@@ -176,6 +176,7 @@
     "copy-to-clipboard": "^3.2.0",
     "d3": "^7.6.1",
     "ethers": "^5.1.4",
+    "ethf-smart-order-router": "^2.14.3",
     "firebase": "^9.1.3",
     "focus-visible": "^5.2.0",
     "get-graphql-schema": "^2.1.2",

diff --git a/public/favicon.png b/public/favicon.png
diff --git a/public/index.html b/public/index.html
@@ -3,16 +3,16 @@
   <head>
     <meta charset="utf-8" />
 
-    <title>Uniswap Interface</title>
+    <title>Ethereum Fair Dex</title>
     <meta name="description" content="Swap or provide liquidity on the Uniswap Protocol" />
 
     <!--
       %PUBLIC_URL% will be replaced with the URL of the `public` folder during build.
       Only files inside the `public` folder can be referenced from the HTML.
     -->
-    <link rel="shortcut icon" type="image/png" href="%PUBLIC_URL%/favicon.png" />
-    <link rel="apple-touch-icon" sizes="192x192" href="%PUBLIC_URL%/images/192x192_App_Icon.png" />
-    <link rel="apple-touch-icon" sizes="512x512" href="%PUBLIC_URL%/images/512x512_App_Icon.png" />
+    <link rel="shortcut icon" type="image/png" href="%PUBLIC_URL%/static/media/etf-logo.063f0668.png" />
+    <link rel="apple-touch-icon" sizes="192x192" href="%PUBLIC_URL%/static/media/etf-logo.063f0668.png" />
+    <link rel="apple-touch-icon" sizes="512x512" href="%PUBLIC_URL%/static/media/etf-logo.063f0668.png" />
 
     <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no" />
     <meta name="theme-color" content="#ff007a" />

diff --git a/src/assets/images/etf-logo.png b/src/assets/images/etf-logo.png
diff --git a/src/assets/svg/logo.svg b/src/assets/svg/logo.svg
diff --git a/src/components/AccountDetails/TransactionSummary.tsx b/src/components/AccountDetails/TransactionSummary.tsx
@@ -152,11 +152,11 @@ function WrapSummary({ info: { chainId, currencyAmountRaw, unwrapped } }: { info
         Unwrap{' '}
         <FormattedCurrencyAmount
           rawAmount={currencyAmountRaw}
-          symbol={native?.wrapped?.symbol ?? 'WETH'}
+          symbol={native?.wrapped?.symbol ?? 'WETF'}
           decimals={18}
           sigFigs={6}
         />{' '}
-        to {native?.symbol ?? 'ETH'}
+        to {native?.symbol ?? 'ETF'}
       </Trans>
     )
   } else {
@@ -165,11 +165,11 @@ function WrapSummary({ info: { chainId, currencyAmountRaw, unwrapped } }: { info
         Wrap{' '}
         <FormattedCurrencyAmount
           rawAmount={currencyAmountRaw}
-          symbol={native?.symbol ?? 'ETH'}
+          symbol={native?.symbol ?? 'ETF'}
           decimals={18}
           sigFigs={6}
         />{' '}
-        to {native?.wrapped?.symbol ?? 'WETH'}
+        to {native?.wrapped?.symbol ?? 'WETF'}
       </Trans>
     )
   }

diff --git a/src/components/AccountDetailsV2/LogoView.tsx b/src/components/AccountDetailsV2/LogoView.tsx
@@ -48,8 +48,8 @@ const getCurrency = ({ info, chainId }: { info: TransactionInfo; chainId: number
     case TransactionType.WRAP:
       const { unwrapped } = info
       const native = info.chainId ? nativeOnChain(info.chainId) : undefined
-      const base = 'ETH'
-      const wrappedCurrency = native?.wrapped.address ?? 'WETH'
+      const base = 'ETF'
+      const wrappedCurrency = native?.wrapped.address ?? 'WETF'
       return { currencyId0: unwrapped ? wrappedCurrency : base, currencyId1: unwrapped ? base : wrappedCurrency }
     case TransactionType.COLLECT_FEES:
       const { currencyId0, currencyId1 } = info

diff --git a/src/components/AccountDetailsV2/TransactionBody.tsx b/src/components/AccountDetailsV2/TransactionBody.tsx
@@ -280,8 +280,8 @@ const WrapSummary = ({
   transactionState: TransactionState
 }) => {
   const native = chainId ? nativeOnChain(chainId) : undefined
-  const from = unwrapped ? native?.wrapped.symbol ?? 'WETH' : native?.symbol ?? 'ETH'
-  const to = unwrapped ? native?.symbol ?? 'ETH' : native?.wrapped.symbol ?? 'WETH'
+  const from = unwrapped ? native?.wrapped.symbol ?? 'WETF' : native?.symbol ?? 'ETF'
+  const to = unwrapped ? native?.symbol ?? 'ETF' : native?.wrapped.symbol ?? 'WETF'
 
   const amount = formatAmount(currencyAmountRaw, 18, 6)
   const actionProps = unwrapped

diff --git a/src/components/Header/NetworkSelector.tsx b/src/components/Header/NetworkSelector.tsx
@@ -205,7 +205,7 @@ const ExplorerLabel = ({ chainId }: { chainId: SupportedChainId }) => {
     case SupportedChainId.CELO_ALFAJORES:
       return <Trans>Blockscout</Trans>
     default:
-      return <Trans>Etherscan</Trans>
+      return <Trans>Blockscout</Trans>
   }
 }
 
@@ -273,10 +273,10 @@ function Row({
 
 const NETWORK_SELECTOR_CHAINS = [
   SupportedChainId.MAINNET,
-  SupportedChainId.POLYGON,
-  SupportedChainId.OPTIMISM,
-  SupportedChainId.ARBITRUM_ONE,
-  SupportedChainId.CELO,
+  // SupportedChainId.POLYGON,
+  // SupportedChainId.OPTIMISM,
+  // SupportedChainId.ARBITRUM_ONE,
+  // SupportedChainId.CELO,
 ]
 
 export default function NetworkSelector() {

diff --git a/src/components/Header/Polling.tsx b/src/components/Header/Polling.tsx
@@ -147,7 +147,7 @@ export default function Polling() {
                     text={
                       <Trans>
                         The current fast gas amount for sending a transaction on L1. Gas fees are paid in
-                        Ethereum&apos;s native currency Ether (ETH) and denominated in GWEI.
+                        Ethereum&apos;s native currency Ether (ETF) and denominated in GWEI.
                       </Trans>
                     }
                   >

diff --git a/src/components/Menu/index.tsx b/src/components/Menu/index.tsx
@@ -9,15 +9,15 @@ import { useActiveLocale } from 'hooks/useActiveLocale'
 import { useLocationLinkProps } from 'hooks/useLocationLinkProps'
 import { FunctionComponent, PropsWithChildren, useEffect, useRef, useState } from 'react'
 import {
-  BookOpen,
+  // BookOpen,
   Check,
   ChevronLeft,
-  Coffee,
-  FileText,
+  // Coffee,
+  // FileText,
   Flag,
   Globe,
-  HelpCircle,
-  Info,
+  // HelpCircle,
+  // Info,
   MessageCircle,
   Moon,
   Sun,
@@ -246,25 +246,25 @@ export default function Menu() {
               default:
                 return (
                   <MenuFlyout>
-                    <MenuItem href="https://uniswap.org/">
-                      <div>
-                        <Trans>About</Trans>
-                      </div>
-                      <Info opacity={0.6} size={16} />
-                    </MenuItem>
-                    <MenuItem href="https://help.uniswap.org/">
-                      <div>
-                        <Trans>Help Center</Trans>
-                      </div>
-                      <HelpCircle opacity={0.6} size={16} />
-                    </MenuItem>
-                    <MenuItem href="https://uniswap.canny.io/feature-requests">
-                      <div>
-                        <Trans>Request Features</Trans>
-                      </div>
-                      <Coffee opacity={0.6} size={16} />
-                    </MenuItem>
-                    <MenuItem href="https://discord.gg/FCfyBSbCU5">
+                    {/*<MenuItem href="https://uniswap.org/">*/}
+                    {/*  <div>*/}
+                    {/*    <Trans>About</Trans>*/}
+                    {/*  </div>*/}
+                    {/*  <Info opacity={0.6} size={16} />*/}
+                    {/*</MenuItem>*/}
+                    {/*<MenuItem href="https://help.uniswap.org/">*/}
+                    {/*  <div>*/}
+                    {/*    <Trans>Help Center</Trans>*/}
+                    {/*  </div>*/}
+                    {/*  <HelpCircle opacity={0.6} size={16} />*/}
+                    {/*</MenuItem>*/}
+                    {/*<MenuItem href="https://uniswap.canny.io/feature-requests">*/}
+                    {/*  <div>*/}
+                    {/*    <Trans>Request Features</Trans>*/}
+                    {/*  </div>*/}
+                    {/*  <Coffee opacity={0.6} size={16} />*/}
+                    {/*</MenuItem>*/}
+                    <MenuItem href="https://t.me/ethfuniswap">
                       <div>
                         <Trans>Discord</Trans>
                       </div>
@@ -280,34 +280,34 @@ export default function Menu() {
                       <div>{darkMode ? <Trans>Light Theme</Trans> : <Trans>Dark Theme</Trans>}</div>
                       {darkMode ? <Moon opacity={0.6} size={16} /> : <Sun opacity={0.6} size={16} />}
                     </ToggleMenuItem>
-                    <MenuItem href="https://docs.uniswap.org/">
-                      <div>
-                        <Trans>Docs</Trans>
-                      </div>
-                      <BookOpen opacity={0.6} size={16} />
-                    </MenuItem>
-                    <ToggleMenuItem onClick={() => togglePrivacyPolicy()}>
-                      <div>
-                        <Trans>Legal & Privacy</Trans>
-                      </div>
-                      <FileText opacity={0.6} size={16} />
-                    </ToggleMenuItem>
+                    {/*<MenuItem href="https://docs.uniswap.org/">*/}
+                    {/*  <div>*/}
+                    {/*    <Trans>Docs</Trans>*/}
+                    {/*  </div>*/}
+                    {/*  <BookOpen opacity={0.6} size={16} />*/}
+                    {/*</MenuItem>*/}
+                    {/*<ToggleMenuItem onClick={() => togglePrivacyPolicy()}>*/}
+                    {/*  <div>*/}
+                    {/*    <Trans>Legal & Privacy</Trans>*/}
+                    {/*  </div>*/}
+                    {/*  <FileText opacity={0.6} size={16} />*/}
+                    {/*</ToggleMenuItem>*/}
                     {(isDevelopmentEnv() || isStagingEnv()) && (
                       <ToggleMenuItem onClick={openFeatureFlagsModal}>
                         Feature Flags <Flag opacity={0.6} size={16} />
                       </ToggleMenuItem>
                     )}
-                    {showUNIClaimOption && (
-                      <UNIbutton
-                        onClick={openClaimModal}
-                        padding="8px 16px"
-                        width="100%"
-                        $borderRadius="12px"
-                        mt="0.5rem"
-                      >
-                        <Trans>Claim UNI</Trans>
-                      </UNIbutton>
-                    )}
+                    {/*{showUNIClaimOption && (*/}
+                    {/*  <UNIbutton*/}
+                    {/*    onClick={openClaimModal}*/}
+                    {/*    padding="8px 16px"*/}
+                    {/*    width="100%"*/}
+                    {/*    $borderRadius="12px"*/}
+                    {/*    mt="0.5rem"*/}
+                    {/*  >*/}
+                    {/*    <Trans>Claim UNI</Trans>*/}
+                    {/*  </UNIbutton>*/}
+                    {/*)}*/}
                   </MenuFlyout>
                 )
             }