fix: chain-registry merge conflicts

Author: ericHgorski

package-lock.json

@@ -30,6 +30,8 @@
     "@radix-ui/react-dialog": "^1.0.5",
     "@radix-ui/react-scroll-area": "^1.0.5",
     "@radix-ui/react-tooltip": "^1.0.7",
+    "@skip-go/client": "^0.16.3",
+    "@skip-go/widget": "^3.1.5",
     "@solana/web3.js": "^1.95.8",
     "@tailwindcss/forms": "^0.5.7",
     "@tanstack/query-sync-storage-persister": "^5.18.1",
@@ -64,8 +66,6 @@
     "undici": "^6.6.1",
     "viem": "^2.16.4",
     "wagmi": "^2.5.7",
-    "widgetv1": "npm:@skip-go/widget@^2.5.2",
-    "widgetv2": "npm:@skip-go/widget@3.1.4",
     "zod": "^3.22.4",
     "zustand": "^4.5.0"
   },

package.json

@@ -39,6 +39,7 @@ export async function parseChainPaths({
       parseAssetListJson({ registryPath: _registryPath, chainPath }),
       parseChainJson({ registryPath: _registryPath, chainPath }),
     ]);
+
     if (!assetlist) return;
     if (!chain) return;
 

public/widgetv2-dark-bg.svg public/dark-bg.svgpublic/widgetv2-dark-bg.svg renamed to public/dark-bg.svg

@@ -1,8 +1,8 @@
-import { SwapWidgetProviderProps } from "widgetv1";
+import { WidgetProps } from "@skip-go/widget";
 
 import { appUrl } from "@/constants/api";
 
-export const endpointOptions: SwapWidgetProviderProps["endpointOptions"] = {
+export const endpointOptions: WidgetProps["endpointOptions"] = {
   getRpcEndpointForChain: async (chainID) => {
     return `${appUrl}/api/rpc/${chainID}`;
   },

public/widgetv2-light-bg.svg public/light-bg.svgpublic/widgetv2-light-bg.svg renamed to public/light-bg.svg

@@ -1,11 +1,11 @@
 import "@/styles/globals.css";
 
+import { QueryClient, QueryClientProvider } from "@tanstack/react-query";
 import { Analytics } from "@vercel/analytics/react";
 import { AppProps } from "next/app";
+import React from "react";
 
 import { DefaultSeo } from "@/components/DefaultSeo";
-import { QueryClient, QueryClientProvider } from "@tanstack/react-query";
-import React from "react";
 
 export default function App({ Component, pageProps }: AppProps) {
   const [queryClient] = React.useState(() => new QueryClient());

src/ast/parse-chain-paths.ts

@@ -1,21 +1,17 @@
-import { useMemo } from "react";
-import { defaultTheme, lightTheme, Widget } from "widgetv2";
+import { Widget } from "@skip-go/widget";
 
 import DiscordButton from "@/components/DiscordButton";
 import { LogoGo } from "@/components/LogoGo";
 import WidgetButton from "@/components/WidgetButton";
-import { useFeatureEnabled } from "@/hooks/useFeatureEnabled";
+// import { useFeatureEnabled } from "@/hooks/useFeatureEnabled";
 import { useTheme } from "@/hooks/useTheme";
 import { useURLQueryParams } from "@/hooks/useURLQueryParams";
 import { apiURL, endpointOptions } from "@/lib/skip-go-widget";
-import { isMobile } from "@/utils/os";
 import { cn } from "@/utils/ui";
 
 export default function Home() {
   const defaultRoute = useURLQueryParams();
-  const goFast = useFeatureEnabled("goFastEnabled");
   const theme = useTheme();
-  const mobile = useMemo(() => isMobile(), []);
 
   if (!theme) return null;
   return (
@@ -25,11 +21,7 @@ export default function Home() {
         "relative overflow-x-hidden overflow-y-hidden",
         "before:fixed before:inset-x-0 before:bottom-0 before:h-[100vh] before:content-['']",
         "before:bg-cover before:bg-[center_top] before:bg-no-repeat",
-        theme === "dark"
-          ? "before:bg-[url(/widgetv2-dark-bg.svg)]"
-          : theme === "light"
-            ? "before:bg-[url(/widgetv2-light-bg.svg)]"
-            : "",
+        theme === "dark" ? "before:bg-[url(/dark-bg.svg)]" : theme === "light" ? "before:bg-[url(/light-bg.svg)]" : "",
       )}
     >
       <main className="relative flex min-h-screen flex-col items-center">
@@ -52,13 +44,10 @@ export default function Home() {
             }}
           >
             <Widget
-              theme={theme === "dark" ? defaultTheme : lightTheme}
+              theme={theme}
               endpointOptions={endpointOptions}
               apiUrl={apiURL}
               defaultRoute={defaultRoute}
-              routeConfig={{
-                goFast,
-              }}
               onlyTestnet={process.env.NEXT_PUBLIC_IS_TESTNET}
             />
           </div>