Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Enable xcm #461

Merged
merged 2 commits into from
Feb 12, 2024
Merged

Enable xcm #461

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ce386fb
Enable xcm
vkulinich-cl Feb 9, 2024
b8942e6
Fix basilisk & tinkernet xcm multiloc
nohaapav Feb 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
1 change: 0 additions & 1 deletion src/components/Layout/Header/Header.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,6 @@ export const Header = () => {
text={
<div>
<p>{t("depeg.modal.desx")}</p>
<p>{t("depeg.modal.desx.crossChain")}</p>
</div>
}
modalContent={
Expand Down
2 changes: 0 additions & 2 deletions src/components/Layout/Header/MobileNavBar/MobileNavBar.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand Down Expand Up @@ -69,7 +68,6 @@ export const MobileNavBar = () => {

return (
<Link
disabled={item.key === "cross-chain"}
key={index}
to={item.href}
search={account ? { account } : undefined}
Expand Down
5 changes: 1 addition & 4 deletions src/components/Layout/Header/menu/HeaderMenu.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
)
Expand Down
4 changes: 0 additions & 4 deletions src/sections/xcm/XcmPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
8 changes: 4 additions & 4 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
Loading