Skip to content

Commit

Permalink
Merge pull request #199 from luxfi/dev/migrate2chain
Browse files Browse the repository at this point in the history
update: serveral UI issues
  • Loading branch information
venuswhispers authored Nov 12, 2024
2 parents 1128913 + ba4c788 commit 0db0b69
Show file tree
Hide file tree
Showing 42 changed files with 2,594 additions and 2,544 deletions.
18 changes: 7 additions & 11 deletions apps/bridge/src/app/layout.tsx
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import React, { type PropsWithChildren } from 'react'

import {
RootLayout as RootLayoutCore,
viewport as ViewportCode,
import {
RootLayout as RootLayoutCore,
viewport as ViewportCode,
} from '@luxfi/ui/root-layout'

import { Footer } from '@luxfi/ui'
Expand All @@ -19,16 +19,12 @@ import Contexts from '@/components/Contexts'
import Main from '@/components/main'

export const metadata = { ..._metadata }
export const viewport = { ...ViewportCode}
export const viewport = { ...ViewportCode }

const RootLayout: React.FC<PropsWithChildren> = async ({
children
}) => (
const RootLayout: React.FC<PropsWithChildren> = async ({ children }) => (
<RootLayoutCore siteDef={siteDef} showHeader>
<Contexts >
<Main>
{children}
</Main>
<Contexts>
<Main>{children}</Main>
</Contexts>
<Footer siteDef={siteDef} />
</RootLayoutCore>
Expand Down
39 changes: 20 additions & 19 deletions apps/bridge/src/app/swap/teleporter/[swapId]/page.tsx
Original file line number Diff line number Diff line change
@@ -1,30 +1,31 @@
import React from "react"
import React from 'react'
import { redirect } from 'next/navigation'

import { useSettingsContainer } from '@/context/settings'

import { BridgeAppSettings } from '@/Models/BridgeAppSettings'
import SwapProcess from "@/components/lux/teleport/process"
import SwapProcess from '@/components/lux/teleport/process'
import getBridgeSettings from '@/util/getBridgeSettings'

const SwapDetails: React.FC<{
params: { swapId: string }
}> = async ({
params
}) => {
const SwapDetails: React.FC<{
params: { swapId: string }
}> = ({ params }) => {
// const settings = await getBridgeSettings(params.swapId)
// const settingsContainer = useSettingsContainer()
// if (
// settings &&
// 'error' in settings &&
// settings.error.startsWith('invalid guid')
// ) {
// redirect('/')
// }

const settings = await getBridgeSettings(params.swapId)
const settingsContainer = useSettingsContainer()
if (settings && 'error' in settings && settings.error.startsWith('invalid guid')) {
redirect('/')
}

if (settingsContainer) {
settingsContainer.settings = new BridgeAppSettings((settings && 'networks' in settings) ? settings : {})
}
return (
<SwapProcess swapId={params.swapId} />
)
// if (settingsContainer) {
// settingsContainer.settings = new BridgeAppSettings(
// settings && 'networks' in settings ? settings : {}
// )
// }
return <SwapProcess swapId={params.swapId} className="my-20" />
}

export default SwapDetails
Loading

0 comments on commit 0db0b69

Please sign in to comment.