Forge-Trade · Mrsirdev · Feb 26, 2023 · Feb 26, 2023 · Feb 28, 2023 · Mar 6, 2023
diff --git a/.gitignore b/.gitignore
@@ -8,8 +8,6 @@
 /src/locales/**/en-US.po
 /src/locales/**/pseudo.po
 
-# generated graphql types
-schema.graphql
 
 # dependencies
 /node_modules
@@ -43,3 +41,8 @@ cypress/videos
 cypress/screenshots
 
 .vercel
+
+#front page test images
+src/components/About/images/nftCard_*.png
+src/components/About/images/swapCard_*.png
+.vscode/settings.json
diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-# Uniswap Labs Interface
+# ForgeDEX | Capital Efficiency has arrived, IBC! 
 
 [![codecov](https://codecov.io/gh/Uniswap/interface/branch/main/graph/badge.svg?token=YVT2Y86O82)](https://codecov.io/gh/Uniswap/interface)
 

diff --git a/package.json b/package.json
@@ -16,7 +16,7 @@
     "i18n:extract": "lingui extract --locale en-US",
     "i18n:compile": "yarn i18n:extract && lingui compile",
     "i18n:pseudo": "lingui extract --locale pseudo && lingui compile",
-    "prepare": "yarn contracts:compile && yarn graphql:fetch && yarn graphql:generate && yarn i18n:compile",
+    "prepare": "yarn contracts:compile && yarn i18n:compile",
     "start": "craco start",
     "build": "craco build",
     "serve": "serve build -l 3000",
@@ -127,6 +127,7 @@
     "@looksrare/sdk": "^0.10.2",
     "@metamask/jazzicon": "^2.0.0",
     "@opensea/seaport-js": "^1.0.10",
+    "@orbitalapes/smart-order-router": "^3.5.4",
     "@popperjs/core": "^2.4.4",
     "@reach/dialog": "^0.10.3",
     "@reach/portal": "^0.10.3",
@@ -136,7 +137,7 @@
     "@types/react-window-infinite-loader": "^1.0.6",
     "@uniswap/analytics": "^1.3.1",
     "@uniswap/analytics-events": "^2.6.0",
-    "@uniswap/conedison": "^1.4.0",
+    "@uniswap/conedison": "^1.5.3",
     "@uniswap/governance": "^1.0.2",
     "@uniswap/liquidity-staker": "^1.0.2",
     "@uniswap/merkle-distributor": "1.0.1",
@@ -192,6 +193,7 @@
     "inter-ui": "^3.13.1",
     "jotai": "^1.3.7",
     "jsbi": "^3.1.4",
+    "lightweight-charts": "^4.0.0",
     "make-plural": "^7.0.0",
     "multicodec": "^3.0.1",
     "multihashes": "^4.0.2",

diff --git a/public/android-chrome-192x192.png b/public/android-chrome-192x192.png
diff --git a/public/android-chrome-512x512.png b/public/android-chrome-512x512.png
diff --git a/public/apple-touch-icon.png b/public/apple-touch-icon.png
diff --git a/public/favicon-16x16.png b/public/favicon-16x16.png
diff --git a/public/favicon-32x32.png b/public/favicon-32x32.png
diff --git a/public/favicon.ico b/public/favicon.ico
diff --git a/public/favicon.png b/public/favicon.png
diff --git a/public/images/ForgeIcon.png b/public/images/ForgeIcon.png
diff --git a/public/images/ForgeLogoFinal.png b/public/images/ForgeLogoFinal.png
diff --git a/public/images/forge-header.png b/public/images/forge-header.png
diff --git a/public/index.html b/public/index.html
@@ -3,31 +3,31 @@
   <head>
     <meta charset="utf-8" />
 
-    <title>Uniswap Interface</title>
-    <meta name="description" content="Swap or provide liquidity on the Uniswap Protocol" />
+    <title>Forge</title>
+    <meta name="description" content="Swap or provide liquidity on Forge DEX" />
 
     <!--
       %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="apple-touch-icon" sizes="180x180" href="/apple-touch-icon.png">
+    <link rel="icon" type="image/png" sizes="32x32" href="/favicon-32x32.png">
+    <link rel="icon" type="image/png" sizes="16x16" href="/favicon-16x16.png">
+    <meta name="twitter:card" content="summary_large_image" />
+    <meta name="twitter:site" content="@ForgeDEX" />
+    <meta name="twitter:creator" content="@ForgeDEX" />
+    <meta name="twitter:title" content="Forge" />
+    <meta name="twitter:description" content="Swap, earn, and build on the strongest Evmos community owned DEX." />
+    <meta name="twitter:image" content="/og-social.png" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no" />
-    <meta name="theme-color" content="#FC72FF" />
-    <meta
-      http-equiv="Content-Security-Policy"
-      content="script-src 'self' https://www.google-analytics.com https://www.googletagmanager.com 'unsafe-inline'"
-    />
+    <meta name="theme-color" content="#111212" />
 
     <!--
       manifest.json provides metadata used when the app is installed as a PWA.
       See https://developers.google.com/web/fundamentals/web-app-manifest/
     -->
     <link rel="manifest" href="%PUBLIC_URL%/manifest.json" />
 
-    <link rel="preconnect" href="https://www.google-analytics.com/" />
 
     <link rel="preload" href="%PUBLIC_URL%/fonts/Inter-roman.var.woff2" as="font" type="font/woff2" crossorigin />
 
@@ -97,13 +97,13 @@
 
       @media (prefers-color-scheme: dark) {
         html {
-          background: linear-gradient(180deg, #202738 0%, #070816 100%);
+          background: linear-gradient(180deg, #0D0E0E 0%, #0D0E0E 100%);
         }
       }
 
       @media (prefers-color-scheme: light) {
         html {
-          background: radial-gradient(100% 100% at 50% 0%, rgba(255, 184, 226, 0.51) 0%, rgba(255, 255, 255, 0) 100%), #FFFFFF
+          background: linear-gradient(180deg, #0D0E0E 0%, #0D0E0E 100%);
         }
       }
     </style>

diff --git a/public/manifest.json b/public/manifest.json
@@ -3,28 +3,28 @@
   "display": "standalone",
   "homepage_url": "https://app.uniswap.org",
   "providedBy": {
-    "name": "Uniswap",
+    "name": "Forge",
     "url": "https://uniswap.org"
   },
   "icons": [
     {
-      "src": "./images/192x192_App_Icon.png",
+      "src": "./images/android-chrome-192x192.png",
       "sizes": "192x192",
       "type": "image/png",
       "purpose": "any maskable"
     },
     {
-      "src": "./images/512x512_App_Icon.png",
+      "src": "./images/android-chrome-512x512.png",
       "sizes": "512x512",
       "type": "image/png",
       "purpose": "any maskable"
     }
   ],
   "orientation": "portrait",
-  "name": "Uniswap",
+  "name": "Forge",
   "description": "Swap or provide liquidity on the Uniswap Protocol",
   "iconPath": "./images/256x256_App_Icon_Pink.svg",
   "short_name": "Uniswap",
   "start_url": ".",
-  "theme_color": "#FC72FF"
+  "theme_color": "#111212"
 }
diff --git a/public/og-social.png b/public/og-social.png
diff --git a/public/site.webmanifest b/public/site.webmanifest
@@ -0,0 +1 @@
+{"name":"","short_name":"","icons":[{"src":"/android-chrome-192x192.png","sizes":"192x192","type":"image/png"},{"src":"/android-chrome-512x512.png","sizes":"512x512","type":"image/png"}],"theme_color":"#ffffff","background_color":"#ffffff","display":"standalone"}
diff --git a/src/components/About/AboutFooter.tsx b/src/components/About/AboutFooter.tsx
@@ -1,12 +1,10 @@
 import { TraceEvent } from '@uniswap/analytics'
 import { BrowserEvent, InterfaceElementName, SharedEventName } from '@uniswap/analytics-events'
-import { useIsDarkMode } from 'state/user/hooks'
 import styled from 'styled-components/macro'
-import { BREAKPOINTS, ExternalLink, StyledRouterLink } from 'theme'
+import { BREAKPOINTS, ExternalLink } from 'theme'
 
-import { DiscordIcon, GithubIcon, TwitterIcon } from './Icons'
-import darkUnicornImgSrc from './images/unicornEmbossDark.png'
-import lightUnicornImgSrc from './images/unicornEmbossLight.png'
+import Telegram from '../../pages/Landing/images/telegram.svg'
+import { GithubIcon, TwitterIcon } from './Icons'
 
 const Footer = styled.div`
   display: flex;
@@ -42,16 +40,6 @@ const LogoSectionBottom = styled(LogoSection)`
   }
 `
 
-const StyledLogo = styled.img`
-  width: 72px;
-  height: 72px;
-  display: none;
-
-  @media screen and (min-width: ${BREAKPOINTS.lg}px) {
-    display: block;
-  }
-`
-
 const SocialLinks = styled.div`
   display: flex;
   align-items: center;
@@ -96,12 +84,6 @@ const ExternalTextLink = styled(ExternalLink)`
   color: ${({ theme }) => theme.textSecondary};
 `
 
-const TextLink = styled(StyledRouterLink)`
-  font-size: 16px;
-  line-height: 20px;
-  color: ${({ theme }) => theme.textSecondary};
-`
-
 const Copyright = styled.span`
   font-size: 16px;
   line-height: 20px;
@@ -110,28 +92,27 @@ const Copyright = styled.span`
 `
 
 const LogoSectionContent = () => {
-  const isDarkMode = useIsDarkMode()
   return (
     <>
-      <StyledLogo src={isDarkMode ? darkUnicornImgSrc : lightUnicornImgSrc} alt="Uniswap Logo" />
+      <img style={{ width: '220px', height: '40px' }} src="/images/ForgeLogoFinal.png" />{' '}
       <SocialLinks>
-        <SocialLink href="https://discord.gg/FCfyBSbCU5" target="_blank" rel="noopener noreferrer">
-          <DiscordIcon size={32} />
+        <SocialLink href="https://t.me/forgeDEX" target="_blank" rel="noopener noreferrer">
+          <img src={Telegram} style={{ width: '28px', height: '28px' }} />
         </SocialLink>
         <TraceEvent
           events={[BrowserEvent.onClick]}
           name={SharedEventName.ELEMENT_CLICKED}
           element={InterfaceElementName.TWITTER_LINK}
         >
-          <SocialLink href="https://twitter.com/uniswap" target="_blank" rel="noopener noreferrer">
-            <TwitterIcon size={32} />
+          <SocialLink href="https://twitter.com/forgeDEX" target="_blank" rel="noopener noreferrer">
+            <TwitterIcon fill="white" size={28} />
           </SocialLink>
         </TraceEvent>
-        <SocialLink href="https://github.com/Uniswap" target="_blank" rel="noopener noreferrer">
-          <GithubIcon size={32} />
+        <SocialLink href="https://github.com/Forge-Trade" target="_blank" rel="noopener noreferrer">
+          <GithubIcon fill="white" size={28} />
         </SocialLink>
       </SocialLinks>
-      <Copyright>© {new Date().getFullYear()} Uniswap Labs</Copyright>
+      <Copyright>© {new Date().getFullYear()} Evmos community</Copyright>
     </>
   )
 }
@@ -145,57 +126,30 @@ export const AboutFooter = () => {
 
       <FooterLinks>
         <LinkGroup>
-          <LinkGroupTitle>App</LinkGroupTitle>
-          <TextLink to="/swap">Swap</TextLink>
-          <TextLink to="/tokens">Tokens</TextLink>
-          <TextLink to="/nfts">NFTs</TextLink>
-          <TextLink to="/pool">Pools</TextLink>
+          <LinkGroupTitle>Orbital Apes</LinkGroupTitle>
+          <ExternalTextLink href="https://orbitalapes.com">Validator</ExternalTextLink>
+          <ExternalTextLink href="https://www.orbitmarket.io">Orbit Market</ExternalTextLink>
+          <ExternalTextLink href="https://hub.orbitalapes.com">OA Hub</ExternalTextLink>
+          <ExternalTextLink href="https://www.orbitrumble.com/">Rumble</ExternalTextLink>
         </LinkGroup>
         <LinkGroup>
-          <LinkGroupTitle>Protocol</LinkGroupTitle>
-          <ExternalTextLink href="https://uniswap.org/community">Community</ExternalTextLink>
-          <ExternalTextLink href="https://uniswap.org/governance">Governance</ExternalTextLink>
-          <ExternalTextLink href="https://uniswap.org/developers">Developers</ExternalTextLink>
+          <LinkGroupTitle>Evmos DAO</LinkGroupTitle>
+          <ExternalTextLink href="https://gov.evmos.community">Governance Overview</ExternalTextLink>
+          <ExternalTextLink href="https://docs.evmos.community">Governance Docs</ExternalTextLink>
+          <ExternalTextLink href="https://twitter.com/EvmosDAO">EvmosDAO Twitter</ExternalTextLink>
+          <ExternalTextLink href="https://t.me/EvmosDAO">EvmosDAO Telegram</ExternalTextLink>
         </LinkGroup>
         <LinkGroup>
-          <LinkGroupTitle>Company</LinkGroupTitle>
-          <TraceEvent
-            events={[BrowserEvent.onClick]}
-            name={SharedEventName.ELEMENT_CLICKED}
-            element={InterfaceElementName.CAREERS_LINK}
-          >
-            <ExternalTextLink href="https://boards.greenhouse.io/uniswaplabs">Careers</ExternalTextLink>
-          </TraceEvent>
-          <TraceEvent
-            events={[BrowserEvent.onClick]}
-            name={SharedEventName.ELEMENT_CLICKED}
-            element={InterfaceElementName.BLOG_LINK}
-          >
-            <ExternalTextLink href="https://uniswap.org/blog">Blog</ExternalTextLink>
-          </TraceEvent>
+          <LinkGroupTitle>Evmos Network</LinkGroupTitle>
+          <ExternalTextLink href="https://app.evmos.org">Dashboard</ExternalTextLink>
+          <ExternalTextLink href="https://docs.evmos.org/">Developers</ExternalTextLink>
+          <ExternalTextLink href="https://wallet.keplr.app/chains/evmos?tab=governance">Stake & Vote</ExternalTextLink>
         </LinkGroup>
         <LinkGroup>
           <LinkGroupTitle>Get Help</LinkGroupTitle>
-          <TraceEvent
-            events={[BrowserEvent.onClick]}
-            name={SharedEventName.ELEMENT_CLICKED}
-            element={InterfaceElementName.SUPPORT_LINK}
-          >
-            <ExternalTextLink
-              href="https://support.uniswap.org/hc/en-us/requests/new"
-              target="_blank"
-              rel="noopener noreferrer"
-            >
-              Contact Us
-            </ExternalTextLink>
-          </TraceEvent>
-          <TraceEvent
-            events={[BrowserEvent.onClick]}
-            name={SharedEventName.ELEMENT_CLICKED}
-            element={InterfaceElementName.SUPPORT_LINK}
-          >
-            <ExternalTextLink href="https://support.uniswap.org/hc/en-us">Help Center</ExternalTextLink>
-          </TraceEvent>
+          <ExternalTextLink href="https://t.me/forgeDEX" target="_blank" rel="noopener noreferrer">
+            Telegram
+          </ExternalTextLink>
         </LinkGroup>
       </FooterLinks>
 

diff --git a/src/components/About/Icons.tsx b/src/components/About/Icons.tsx
@@ -1,16 +1,8 @@
 import styled from 'styled-components/macro'
 
-import { ReactComponent as DiscordI } from './images/discord.svg'
 import { ReactComponent as GithubI } from './images/github.svg'
 import { ReactComponent as TwitterI } from './images/twitter-safe.svg'
 
-export const DiscordIcon = styled(DiscordI)<{ size?: number; fill?: string }>`
-  height: ${({ size }) => (size ? size + 'px' : '32px')};
-  width: ${({ size }) => (size ? size + 'px' : '32px')};
-  fill: ${({ fill }) => fill ?? '#98A1C0'};
-  opacity: 1;
-`
-
 export const TwitterIcon = styled(TwitterI)<{ size?: number; fill?: string }>`
   height: ${({ size }) => (size ? size + 'px' : '32px')};
   width: ${({ size }) => (size ? size + 'px' : '32px')};
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		{"name":"","short_name":"","icons":[{"src":"/android-chrome-192x192.png","sizes":"192x192","type":"image/png"},{"src":"/android-chrome-512x512.png","sizes":"512x512","type":"image/png"}],"theme_color":"#ffffff","background_color":"#ffffff","display":"standalone"}