chore: Fixed conflicts with main branch

ApeSwapFinance · Oct 19, 2022 · 6614fa9 · 6614fa9
2 parents 3aeb610 + 5246a95
commit 6614fa9
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 11 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@ape.swap/uikit",
-  "version": "1.3.31-alpha.7",
+  "version": "1.3.34",
   "description": "Set of UI components for apeswap projects",
   "main": "dist/index.cjs.js",
   "resolutions": {

diff --git a/src/__tests__/widgets/menu.test.tsx b/src/__tests__/widgets/menu.test.tsx
@@ -426,7 +426,7 @@ it("renders correctly", () => {
                   </a>
                   <a
                     class="sc-kLgnNl iobZJR"
-                    href="https://t.me/ape_swap"
+                    href="https://discord.gg/apeswap"
                     rel="noopener noreferrer"
                     target="_blank"
                   >

diff --git a/src/components/Footer/config.tsx b/src/components/Footer/config.tsx
@@ -5,7 +5,7 @@ export const supportLinks = [
   },
   {
     label: "Discord",
-    href: "https://discord.com/invite/ApeSwapOfficial",
+    href: "https://discord.gg/apeswap",
   },
   {
     label: "Tokenomics",

diff --git a/src/widgets/Navbar/MobileNavMenu.tsx b/src/widgets/Navbar/MobileNavMenu.tsx
@@ -218,13 +218,11 @@ const MobileNavMenu: React.FC<MobileNavMenuProps> = ({
                 onClick={() => trackClick(track, event, position, chainId, "telegram", "https://t.me/ape_swap")}
               />
             </StyledLink>
-            <StyledLink href="https://t.me/ape_swap" target="_blank" rel="noopener noreferrer">
+            <StyledLink href="https://discord.gg/apeswap" target="_blank" rel="noopener noreferrer">
               <DiscordIcon
                 color="white3"
                 fill={iconFillColor}
-                onClick={() =>
-                  trackClick(track, event, position, chainId, "discord", "https://discord.com/invite/ApeSwapOfficial")
-                }
+                onClick={() => trackClick(track, event, position, chainId, "discord", "https://discord.gg/apeswap")}
               />
             </StyledLink>
           </div>

diff --git a/src/widgets/Navbar/SubNavbar.tsx b/src/widgets/Navbar/SubNavbar.tsx
@@ -151,13 +151,11 @@ const SubNavbar: React.FC<SubNavbarProps> = ({
                 onClick={() => trackClick(track, event, position, chainId, "telegram", "https://t.me/ape_swap")}
               />
             </StyledLink>
-            <StyledLink href="https://discord.com/invite/ApeSwap" target="_blank" rel="noopener noreferrer">
+            <StyledLink href="https://discord.gg/apeswap" target="_blank" rel="noopener noreferrer">
               <DiscordIcon
                 color="white3"
                 fill={iconFillColor}
-                onClick={() =>
-                  trackClick(track, event, position, chainId, "discord", "https://discord.com/invite/ApeSwapOfficial")
-                }
+                onClick={() => trackClick(track, event, position, chainId, "discord", "https://discord.gg/apeswap")}
               />
             </StyledLink>
           </Flex>