diff --git a/apps/dashboard/src/app/(dashboard)/(bridge)/routes/components/server/routelist-card.tsx b/apps/dashboard/src/app/(dashboard)/(bridge)/routes/components/server/routelist-card.tsx index 1d2f71b326e..46774ad78bf 100644 --- a/apps/dashboard/src/app/(dashboard)/(bridge)/routes/components/server/routelist-card.tsx +++ b/apps/dashboard/src/app/(dashboard)/(bridge)/routes/components/server/routelist-card.tsx @@ -1,59 +1,42 @@ import { Card, CardContent, CardHeader } from "@/components/ui/card"; import { getThirdwebClient } from "@/constants/thirdweb.server"; import { resolveSchemeWithErrorHandler } from "@/lib/resolveSchemeWithErrorHandler"; -import { NATIVE_TOKEN_ADDRESS, defineChain, getContract } from "thirdweb"; +import { defineChain } from "thirdweb"; import { getChainMetadata } from "thirdweb/chains"; -import { name } from "thirdweb/extensions/common"; type RouteListCardProps = { originChainId: number; originTokenAddress: string; - originTokenIconUri: string | null; + originTokenIconUri?: string | null; + originTokenSymbol: string; + originTokenName: string; destinationChainId: number; destinationTokenAddress: string; - destinationTokenIconUri: string | null; + destinationTokenIconUri?: string | null; + destinationTokenSymbol: string; + destinationTokenName: string; }; export async function RouteListCard({ originChainId, originTokenAddress, originTokenIconUri, + originTokenName, destinationChainId, destinationTokenAddress, destinationTokenIconUri, + destinationTokenName, }: RouteListCardProps) { const [ originChain, - originTokenName, destinationChain, - destinationTokenName, resolvedOriginTokenIconUri, resolvedDestinationTokenIconUri, ] = await Promise.all([ // eslint-disable-next-line no-restricted-syntax getChainMetadata(defineChain(originChainId)), - originTokenAddress.toLowerCase() === NATIVE_TOKEN_ADDRESS - ? "ETH" - : name({ - contract: getContract({ - address: originTokenAddress, - // eslint-disable-next-line no-restricted-syntax - chain: defineChain(originChainId), - client: getThirdwebClient(), - }), - }).catch(() => undefined), // eslint-disable-next-line no-restricted-syntax getChainMetadata(defineChain(destinationChainId)), - destinationTokenAddress.toLowerCase() === NATIVE_TOKEN_ADDRESS - ? "ETH" - : name({ - contract: getContract({ - address: destinationTokenAddress, - // eslint-disable-next-line no-restricted-syntax - chain: defineChain(destinationChainId), - client: getThirdwebClient(), - }), - }).catch(() => undefined), originTokenIconUri ? resolveSchemeWithErrorHandler({ uri: originTokenIconUri, @@ -78,17 +61,17 @@ export async function RouteListCard({ {originTokenAddress} ) : ( -
+
)} {resolvedDestinationTokenIconUri ? ( // eslint-disable-next-line @next/next/no-img-element {destinationTokenAddress} ) : (
diff --git a/apps/dashboard/src/app/(dashboard)/(bridge)/routes/components/server/routelist-row.tsx b/apps/dashboard/src/app/(dashboard)/(bridge)/routes/components/server/routelist-row.tsx index 207b3d05e2c..27b68ca458f 100644 --- a/apps/dashboard/src/app/(dashboard)/(bridge)/routes/components/server/routelist-row.tsx +++ b/apps/dashboard/src/app/(dashboard)/(bridge)/routes/components/server/routelist-row.tsx @@ -2,59 +2,41 @@ import { CopyTextButton } from "@/components/ui/CopyTextButton"; import { TableCell, TableRow } from "@/components/ui/table"; import { getThirdwebClient } from "@/constants/thirdweb.server"; import { resolveSchemeWithErrorHandler } from "@/lib/resolveSchemeWithErrorHandler"; -import { NATIVE_TOKEN_ADDRESS, getContract } from "thirdweb"; import { defineChain, getChainMetadata } from "thirdweb/chains"; -import { symbol } from "thirdweb/extensions/common"; type RouteListRowProps = { originChainId: number; originTokenAddress: string; - originTokenIconUri: string | null; + originTokenIconUri?: string | null; + originTokenSymbol?: string; + originTokenName?: string; destinationChainId: number; destinationTokenAddress: string; - destinationTokenIconUri: string | null; + destinationTokenIconUri?: string | null; + destinationTokenSymbol?: string; + destinationTokenName?: string; }; export async function RouteListRow({ originChainId, originTokenAddress, originTokenIconUri, + originTokenSymbol, destinationChainId, destinationTokenAddress, destinationTokenIconUri, + destinationTokenSymbol, }: RouteListRowProps) { const [ originChain, - originTokenSymbol, destinationChain, - destinationTokenSymbol, resolvedOriginTokenIconUri, resolvedDestinationTokenIconUri, ] = await Promise.all([ // eslint-disable-next-line no-restricted-syntax getChainMetadata(defineChain(originChainId)), - originTokenAddress.toLowerCase() === NATIVE_TOKEN_ADDRESS - ? "ETH" - : symbol({ - contract: getContract({ - address: originTokenAddress, - // eslint-disable-next-line no-restricted-syntax - chain: defineChain(originChainId), - client: getThirdwebClient(), - }), - }).catch(() => undefined), // eslint-disable-next-line no-restricted-syntax getChainMetadata(defineChain(destinationChainId)), - destinationTokenAddress.toLowerCase() === NATIVE_TOKEN_ADDRESS - ? "ETH" - : symbol({ - contract: getContract({ - address: destinationTokenAddress, - // eslint-disable-next-line no-restricted-syntax - chain: defineChain(destinationChainId), - client: getThirdwebClient(), - }), - }).catch(() => undefined), originTokenIconUri ? resolveSchemeWithErrorHandler({ uri: originTokenIconUri, @@ -80,7 +62,7 @@ export async function RouteListRow({ {originTokenAddress} ) : (
@@ -115,7 +97,7 @@ export async function RouteListRow({ {destinationTokenAddress} ) : (
diff --git a/apps/dashboard/src/app/(dashboard)/(bridge)/routes/components/server/routes-table.tsx b/apps/dashboard/src/app/(dashboard)/(bridge)/routes/components/server/routes-table.tsx index 1ae7b052cca..7afc527ad43 100644 --- a/apps/dashboard/src/app/(dashboard)/(bridge)/routes/components/server/routes-table.tsx +++ b/apps/dashboard/src/app/(dashboard)/(bridge)/routes/components/server/routes-table.tsx @@ -50,7 +50,7 @@ async function getRoutesToRender(params: SearchParams) { } } // Temporary, will update this after the /routes endpoint - filters.limit = 10_000; + filters.limit = 50_000; const routes = await getRoutes(filters); @@ -107,9 +107,13 @@ export async function RoutesData(props: { originChainId={route.originToken.chainId} originTokenAddress={route.originToken.address} originTokenIconUri={route.originToken.iconUri} + originTokenSymbol={route.originToken.symbol} + originTokenName={route.originToken.name} destinationChainId={route.destinationToken.chainId} destinationTokenAddress={route.destinationToken.address} destinationTokenIconUri={route.destinationToken.iconUri} + destinationTokenSymbol={route.destinationToken.symbol} + destinationTokenName={route.destinationToken.name} /> ))} @@ -126,9 +130,13 @@ export async function RoutesData(props: { originChainId={route.originToken.chainId} originTokenAddress={route.originToken.address} originTokenIconUri={route.originToken.iconUri} + originTokenSymbol={route.originToken.symbol} + originTokenName={route.originToken.name} destinationChainId={route.destinationToken.chainId} destinationTokenAddress={route.destinationToken.address} destinationTokenIconUri={route.destinationToken.iconUri} + destinationTokenSymbol={route.destinationToken.symbol} + destinationTokenName={route.destinationToken.name} /> ))} diff --git a/apps/dashboard/src/app/(dashboard)/(bridge)/routes/opengraph-image.png b/apps/dashboard/src/app/(dashboard)/(bridge)/routes/opengraph-image.png deleted file mode 100644 index aceb6dba56b..00000000000 Binary files a/apps/dashboard/src/app/(dashboard)/(bridge)/routes/opengraph-image.png and /dev/null differ diff --git a/apps/dashboard/src/app/(dashboard)/(bridge)/routes/page.tsx b/apps/dashboard/src/app/(dashboard)/(bridge)/routes/page.tsx index cc18d49a74b..30d336d881b 100644 --- a/apps/dashboard/src/app/(dashboard)/(bridge)/routes/page.tsx +++ b/apps/dashboard/src/app/(dashboard)/(bridge)/routes/page.tsx @@ -22,7 +22,7 @@ export const metadata: Metadata = { }, }; -export default async function ChainListPage(props: { +export default async function RoutesPage(props: { searchParams: Promise; }) { const authToken = await getAuthToken(); diff --git a/apps/dashboard/src/app/(dashboard)/(bridge)/types/route.ts b/apps/dashboard/src/app/(dashboard)/(bridge)/types/route.ts index 40595f0c031..72684d9f4df 100644 --- a/apps/dashboard/src/app/(dashboard)/(bridge)/types/route.ts +++ b/apps/dashboard/src/app/(dashboard)/(bridge)/types/route.ts @@ -4,11 +4,15 @@ export type Route = { originToken: { address: Address; chainId: number; - iconUri: string; + iconUri?: string; + name: string; + symbol: string; }; destinationToken: { address: Address; chainId: number; - iconUri: string; + iconUri?: string; + name: string; + symbol: string; }; };