@ensofinance/checkout-widget 0.0.16 → 0.0.17

package/orval.config.ts

@@ -2,6 +2,7 @@ export default {
     enso: {
         output: {
             baseUrl: "https://api.enso.finance",
+            // baseUrl: "http://localhost:3000",
             mode: "single",
             prettier: true,
             target: "src/enso-api/index.ts",
@@ -24,17 +25,21 @@ export default {
                 transformer: (spec: any) => {
                     // Fix all malformed array schemas that have items: { type: 'array' } without proper definition
                     const fixArraySchema = (obj: any) => {
-                        if (!obj || typeof obj !== 'object') return;
+                        if (!obj || typeof obj !== "object") return;
 
                         // Fix array items that are themselves arrays without proper items definition
-                        if (obj.type === 'array' && obj.items?.type === 'array' && !obj.items.items) {
+                        if (
+                            obj.type === "array" &&
+                            obj.items?.type === "array" &&
+                            !obj.items.items
+                        ) {
                             obj.items = {
                                 anyOf: [
-                                    { type: 'string' },
-                                    { type: 'number' },
-                                    { type: 'boolean' },
-                                    { type: 'object' },
-                                ]
+                                    { type: "string" },
+                                    { type: "number" },
+                                    { type: "boolean" },
+                                    { type: "object" },
+                                ],
                             };
                         }
 
@@ -52,8 +57,8 @@ export default {
                     }
 
                     return spec;
-                }
-            }
+                },
+            },
         },
     },
 };

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@ensofinance/checkout-widget",
-    "version": "0.0.16",
+    "version": "0.0.17",
     "type": "module",
     "homepage": "https://www.enso.build/",
     "repository": {

package/src/components/steps/ExchangeFlow.tsx

@@ -191,7 +191,6 @@ const useHandleMeshAccessPayload = () => {
         (accessTokenPayload: AccessTokenPayload, sessionId: string) => {
             setMeshAccessToken(accessTokenPayload); // Persist access token and session id for future reloads
 
-            debugger;
             sessionStorage.setItem(
                 `${deviceKey}:${selectedIntegration?.type}`,
                 JSON.stringify({
@@ -349,7 +348,6 @@ const CheckSessionKeyStep = ({
             `${deviceKey}:${selectedIntegration.type}`,
         );
         // On load: check for persisted connection and hydrate state
-        debugger;
         if (saved) {
             try {
                 const parsed = JSON.parse(saved);

package/src/enso-api/api.ts

@@ -1,6 +1,5 @@
 import { useAccount, useConfig } from "wagmi";
 import {
-    useRouterControllerPostRouteShortcutTransaction,
     useRouterControllerRouteShortcutTransaction,
     useTokensControllerTokens,
     useWalletControllerCreateApproveTransaction,
@@ -15,11 +14,9 @@ import { Token } from "@/util/common";
 import { useAppStore } from "@/store";
 import { Address } from "viem";
 import { formatNumber, normalizeValue } from "@/util";
-import { VITALIK_ADDRESS } from "@/util/constants";
 import {
     RouterControllerRouteShortcutTransactionParams,
     NontokenizedControllerRouteNontokenizedShorcutTransactionParams,
-    NonTokenizedModel,
     ProtocolModel,
 } from "./model";
 
@@ -284,54 +281,34 @@ export const useProtocolData = (protocolSlug?: string) => {
     return { protocolData, isLoading };
 };
 
-export const useNontokenizedTokens = () => {
-    const config = useConfig();
-
-    const supportedChainIds = useMemo(
-        () => config.chains.map((chain) => chain.id),
-        [config.chains],
-    );
-
+export const useIsNontokenized = (tokenAddress?: string, chainId?: number) => {
     const { data, isLoading } = useNonTokenizedControllerTokens(
-        {},
+        {
+            positionId: tokenAddress ? [tokenAddress] : undefined,
+            chainId,
+        },
         {
             query: {
-                enabled: true,
+                enabled: !!tokenAddress && !!chainId,
+            },
+        },
+    );
+    const { data: addressData } = useNonTokenizedControllerTokens(
+        {
+            address: tokenAddress ? [tokenAddress] : undefined,
+            chainId,
+        },
+        {
+            query: {
+                enabled: !!tokenAddress && !!chainId,
             },
         },
     );
 
-    const nontokenizedMap = useMemo(() => {
-        if (!data?.data) return new Map<string, NonTokenizedModel>();
-
-        const map = new Map<string, NonTokenizedModel>();
-        data.data.forEach((token) => {
-            if (supportedChainIds.includes(token.chainId)) {
-                const key = `${token.chainId}-${token.address.toLowerCase()}`;
-                map.set(key, token);
-            }
-        });
-
-        return map;
-    }, [data, supportedChainIds]);
-
-    console.log(nontokenizedMap);
-
-    return { nontokenizedMap, isLoading };
-};
-
-export const useIsNontokenized = (tokenAddress?: string, chainId?: number) => {
-    const { nontokenizedMap, isLoading } = useNontokenizedTokens();
-
-    const nontokenizedData = useMemo(() => {
-        if (!tokenAddress || !chainId) return null;
-
-        const key = `${chainId}-${tokenAddress.toLowerCase()}`;
-        return nontokenizedMap.get(key) || null;
-    }, [tokenAddress, chainId, nontokenizedMap]);
+    const nontokenizedData = data?.data?.[0] || addressData?.data?.[0] || null;
 
     return {
-        isNontokenized: !!nontokenizedData,
+        isNontokenized: Boolean(nontokenizedData),
         nontokenizedData,
         isLoading,
     };