Merge pull request #462 from galacticcouncil/master

Merge master to production
galacticcouncil · Feb 13, 2024 · 4611830 · 4611830
2 parents 836bd22 + 0c9e724
commit 4611830
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 16 deletions.
diff --git a/package.json b/package.json
@@ -27,7 +27,7 @@
     "@emotion/styled": "^11.10.4",
     "@galacticcouncil/api-augment": "^0.0.3",
     "@galacticcouncil/apps": "1.4.3-1",
-    "@galacticcouncil/bridge": "0.0.3-1",
+    "@galacticcouncil/bridge": "0.0.16",
     "@galacticcouncil/math-lbp": "^0.1.3",
     "@galacticcouncil/math-liquidity-mining": "^0.1.3",
     "@galacticcouncil/math-xyk": "^0.1.3",

diff --git a/src/components/Layout/Header/Header.tsx b/src/components/Layout/Header/Header.tsx
@@ -53,7 +53,6 @@ export const Header = () => {
           text={
             <div>
               <p>{t("depeg.modal.desx")}</p>
-              <p>{t("depeg.modal.desx.crossChain")}</p>
             </div>
           }
           modalContent={

diff --git a/src/components/Layout/Header/MobileNavBar/MobileNavBar.tsx b/src/components/Layout/Header/MobileNavBar/MobileNavBar.tsx
@@ -39,7 +39,6 @@ export const MobileNavBar = () => {
 
   const hiddenTabItems = hiddenTabs.map((hiddenTab, index) => (
     <Link
-      disabled={hiddenTab.key === "cross-chain"}
       key={index}
       to={hiddenTab.href}
       search={account ? { account } : undefined}
@@ -69,7 +68,6 @@ export const MobileNavBar = () => {
 
         return (
           <Link
-            disabled={item.key === "cross-chain"}
             key={index}
             to={item.href}
             search={account ? { account } : undefined}

diff --git a/src/components/Layout/Header/menu/HeaderMenu.tsx b/src/components/Layout/Header/menu/HeaderMenu.tsx
@@ -23,15 +23,12 @@ export const HeaderMenu = () => {
 
         return (
           <Link
-            disabled={item.key === "cross-chain"}
             key={i}
             to={item.href}
             search={account ? { account } : undefined}
           >
             {({ isActive }) => (
-              <SItem isActive={isActive} disabled={item.key === "cross-chain"}>
-                {t(item.translationKey)}
-              </SItem>
+              <SItem isActive={isActive}>{t(item.translationKey)}</SItem>
             )}
           </Link>
         )

diff --git a/src/sections/xcm/XcmPage.tsx b/src/sections/xcm/XcmPage.tsx
@@ -6,22 +6,18 @@ import * as Apps from "@galacticcouncil/apps"
 import { createComponent } from "@lit-labs/react"
 import { useAccountStore } from "state/store"
 import { GcTransactionCenter } from "./TransactionCenter"
-import { Navigate } from "@tanstack/react-location"
 
 export const XcmApp = createComponent({
   tagName: "gc-xcm-app",
   elementClass: Apps.XcmApp,
   react: React,
 })
-const disabled = true
 
 export function XcmPage() {
   const { account } = useAccountStore()
 
   const ref = React.useRef<Apps.XcmApp>(null)
 
-  if (disabled) return <Navigate to="/trade" search />
-
   return (
     <GcTransactionCenter>
       <Page>

diff --git a/yarn.lock b/yarn.lock
@@ -1958,10 +1958,10 @@
     patch-package "^7.0.0"
     short-uuid "^4.2.0"
 
-"@galacticcouncil/bridge@0.0.3-1":
-  version "0.0.3-1"
-  resolved "https://registry.yarnpkg.com/@galacticcouncil/bridge/-/bridge-0.0.3-1.tgz#2df1bcae61c5150fd6e1c5ca3618572aefe0b66d"
-  integrity sha512-bdpPsFc21NSkw6/MZkTjgANvFxLfDlVtGx0/H2xdmUXEVlSs/YQQrJzpKSHj11XtDKF3eeCKNzCbu4nX+JiGfQ==
+"@galacticcouncil/bridge@0.0.16":
+  version "0.0.16"
+  resolved "https://registry.yarnpkg.com/@galacticcouncil/bridge/-/bridge-0.0.16.tgz#83cd0e57d1be4c8f05d361244c6fae35ba32e2e4"
+  integrity sha512-+qoby2hx5WuGtWhkPQugmZeqOhy5czWDUQdGHtpjVTfYkIB6PGUuKNv7gnNgl38lJcVo1XB/tn91eLTZwq+9og==
   dependencies:
     "@acala-network/api" "^5"
     "@acala-network/sdk" "^4.1.9-2"