@ensofinance/checkout-widget 0.0.13 → 0.0.14

package/src/enso-api/model/swapArgsDtoAmountIn.ts

@@ -0,0 +1,16 @@
+/**
+ * Generated by orval v7.11.1 🍺
+ * Do not edit manually.
+ * #### Enso API
+- Find detailed documentation on [docs.enso.finance](https://docs.enso.finance).
+- To use the API, **you must include your API Key in the Authorization header** (Bearer format).
+- For testing, Swagger pre-authorizes you using the key: `1e02632d-6feb-4a75-a157-documentation` (1rps).
+- Get your own API Key at [enso.finance/developers](https://enso.finance/developers).
+ * OpenAPI spec version: 1.0
+ */
+import type { CallOutput } from "./callOutput";
+
+/**
+ * Amount to swap (or previous output reference)
+ */
+export type SwapArgsDtoAmountIn = string | CallOutput;

package/src/enso-api/model/tokenizedMultiDepositActionDto.ts

@@ -0,0 +1,18 @@
+/**
+ * Generated by orval v7.11.1 🍺
+ * Do not edit manually.
+ * #### Enso API
+- Find detailed documentation on [docs.enso.finance](https://docs.enso.finance).
+- To use the API, **you must include your API Key in the Authorization header** (Bearer format).
+- For testing, Swagger pre-authorizes you using the key: `1e02632d-6feb-4a75-a157-documentation` (1rps).
+- Get your own API Key at [enso.finance/developers](https://enso.finance/developers).
+ * OpenAPI spec version: 1.0
+ */
+import type { TokenizedMultiDepositArgsDto } from "./tokenizedMultiDepositArgsDto";
+
+export interface TokenizedMultiDepositActionDto {
+    /** Protocol */
+    protocol: string;
+    action: string;
+    args: TokenizedMultiDepositArgsDto;
+}

package/src/enso-api/model/tokenizedMultiDepositArgsDto.ts

@@ -0,0 +1,24 @@
+/**
+ * Generated by orval v7.11.1 🍺
+ * Do not edit manually.
+ * #### Enso API
+- Find detailed documentation on [docs.enso.finance](https://docs.enso.finance).
+- To use the API, **you must include your API Key in the Authorization header** (Bearer format).
+- For testing, Swagger pre-authorizes you using the key: `1e02632d-6feb-4a75-a157-documentation` (1rps).
+- Get your own API Key at [enso.finance/developers](https://enso.finance/developers).
+ * OpenAPI spec version: 1.0
+ */
+import type { TokenizedMultiDepositArgsDtoAmountInItem } from "./tokenizedMultiDepositArgsDtoAmountInItem";
+
+export interface TokenizedMultiDepositArgsDto {
+    /** Input token addresses */
+    tokenIn: string[];
+    /** Output token address */
+    tokenOut: string;
+    /** Amounts to deposit (or previous output references) */
+    amountIn: TokenizedMultiDepositArgsDtoAmountInItem[];
+    /** Primary contract address */
+    primaryAddress: string;
+    /** Receiver address */
+    receiver?: string;
+}

package/src/enso-api/model/tokenizedMultiDepositArgsDtoAmountInItem.ts

@@ -0,0 +1,17 @@
+/**
+ * Generated by orval v7.11.1 🍺
+ * Do not edit manually.
+ * #### Enso API
+- Find detailed documentation on [docs.enso.finance](https://docs.enso.finance).
+- To use the API, **you must include your API Key in the Authorization header** (Bearer format).
+- For testing, Swagger pre-authorizes you using the key: `1e02632d-6feb-4a75-a157-documentation` (1rps).
+- Get your own API Key at [enso.finance/developers](https://enso.finance/developers).
+ * OpenAPI spec version: 1.0
+ */
+import type { TokenizedMultiDepositArgsDtoAmountInItemAnyOf } from "./tokenizedMultiDepositArgsDtoAmountInItemAnyOf";
+
+export type TokenizedMultiDepositArgsDtoAmountInItem =
+    | string
+    | number
+    | boolean
+    | TokenizedMultiDepositArgsDtoAmountInItemAnyOf;

package/src/enso-api/model/tokenizedMultiDepositArgsDtoAmountInItemAnyOf.ts

@@ -0,0 +1,14 @@
+/**
+ * Generated by orval v7.11.1 🍺
+ * Do not edit manually.
+ * #### Enso API
+- Find detailed documentation on [docs.enso.finance](https://docs.enso.finance).
+- To use the API, **you must include your API Key in the Authorization header** (Bearer format).
+- For testing, Swagger pre-authorizes you using the key: `1e02632d-6feb-4a75-a157-documentation` (1rps).
+- Get your own API Key at [enso.finance/developers](https://enso.finance/developers).
+ * OpenAPI spec version: 1.0
+ */
+
+export type TokenizedMultiDepositArgsDtoAmountInItemAnyOf = {
+    [key: string]: unknown;
+};

package/src/enso-api/model/tokenizedMultiRedeemActionDto.ts

@@ -0,0 +1,18 @@
+/**
+ * Generated by orval v7.11.1 🍺
+ * Do not edit manually.
+ * #### Enso API
+- Find detailed documentation on [docs.enso.finance](https://docs.enso.finance).
+- To use the API, **you must include your API Key in the Authorization header** (Bearer format).
+- For testing, Swagger pre-authorizes you using the key: `1e02632d-6feb-4a75-a157-documentation` (1rps).
+- Get your own API Key at [enso.finance/developers](https://enso.finance/developers).
+ * OpenAPI spec version: 1.0
+ */
+import type { TokenizedMultiRedeemArgsDto } from "./tokenizedMultiRedeemArgsDto";
+
+export interface TokenizedMultiRedeemActionDto {
+    /** Protocol */
+    protocol: string;
+    action: string;
+    args: TokenizedMultiRedeemArgsDto;
+}

package/src/enso-api/model/tokenizedMultiRedeemArgsDto.ts

@@ -0,0 +1,24 @@
+/**
+ * Generated by orval v7.11.1 🍺
+ * Do not edit manually.
+ * #### Enso API
+- Find detailed documentation on [docs.enso.finance](https://docs.enso.finance).
+- To use the API, **you must include your API Key in the Authorization header** (Bearer format).
+- For testing, Swagger pre-authorizes you using the key: `1e02632d-6feb-4a75-a157-documentation` (1rps).
+- Get your own API Key at [enso.finance/developers](https://enso.finance/developers).
+ * OpenAPI spec version: 1.0
+ */
+import type { TokenizedMultiRedeemArgsDtoAmountIn } from "./tokenizedMultiRedeemArgsDtoAmountIn";
+
+export interface TokenizedMultiRedeemArgsDto {
+    /** Input token address */
+    tokenIn: string;
+    /** Output token addresses */
+    tokenOut: string[];
+    /** Amount to redeem (or previous output reference) */
+    amountIn: TokenizedMultiRedeemArgsDtoAmountIn;
+    /** Primary contract address */
+    primaryAddress: string;
+    /** Receiver address */
+    receiver?: string;
+}

package/src/enso-api/model/tokenizedMultiRedeemArgsDtoAmountIn.ts

@@ -0,0 +1,16 @@
+/**
+ * Generated by orval v7.11.1 🍺
+ * Do not edit manually.
+ * #### Enso API
+- Find detailed documentation on [docs.enso.finance](https://docs.enso.finance).
+- To use the API, **you must include your API Key in the Authorization header** (Bearer format).
+- For testing, Swagger pre-authorizes you using the key: `1e02632d-6feb-4a75-a157-documentation` (1rps).
+- Get your own API Key at [enso.finance/developers](https://enso.finance/developers).
+ * OpenAPI spec version: 1.0
+ */
+import type { CallOutput } from "./callOutput";
+
+/**
+ * Amount to redeem (or previous output reference)
+ */
+export type TokenizedMultiRedeemArgsDtoAmountIn = string | CallOutput;

package/src/enso-api/model/tokenizedSingleDepositActionDto.ts

@@ -0,0 +1,18 @@
+/**
+ * Generated by orval v7.11.1 🍺
+ * Do not edit manually.
+ * #### Enso API
+- Find detailed documentation on [docs.enso.finance](https://docs.enso.finance).
+- To use the API, **you must include your API Key in the Authorization header** (Bearer format).
+- For testing, Swagger pre-authorizes you using the key: `1e02632d-6feb-4a75-a157-documentation` (1rps).
+- Get your own API Key at [enso.finance/developers](https://enso.finance/developers).
+ * OpenAPI spec version: 1.0
+ */
+import type { TokenizedSingleDepositArgsDto } from "./tokenizedSingleDepositArgsDto";
+
+export interface TokenizedSingleDepositActionDto {
+    /** Protocol */
+    protocol: string;
+    action: string;
+    args: TokenizedSingleDepositArgsDto;
+}

package/src/enso-api/model/tokenizedSingleDepositArgsDto.ts

@@ -0,0 +1,24 @@
+/**
+ * Generated by orval v7.11.1 🍺
+ * Do not edit manually.
+ * #### Enso API
+- Find detailed documentation on [docs.enso.finance](https://docs.enso.finance).
+- To use the API, **you must include your API Key in the Authorization header** (Bearer format).
+- For testing, Swagger pre-authorizes you using the key: `1e02632d-6feb-4a75-a157-documentation` (1rps).
+- Get your own API Key at [enso.finance/developers](https://enso.finance/developers).
+ * OpenAPI spec version: 1.0
+ */
+import type { TokenizedSingleDepositArgsDtoAmountIn } from "./tokenizedSingleDepositArgsDtoAmountIn";
+
+export interface TokenizedSingleDepositArgsDto {
+    /** Input token address */
+    tokenIn: string;
+    /** Output token address */
+    tokenOut: string;
+    /** Amount to deposit (or previous output reference) */
+    amountIn: TokenizedSingleDepositArgsDtoAmountIn;
+    /** Primary contract address */
+    primaryAddress: string;
+    /** Receiver address */
+    receiver?: string;
+}

package/src/enso-api/model/tokenizedSingleDepositArgsDtoAmountIn.ts

@@ -0,0 +1,16 @@
+/**
+ * Generated by orval v7.11.1 🍺
+ * Do not edit manually.
+ * #### Enso API
+- Find detailed documentation on [docs.enso.finance](https://docs.enso.finance).
+- To use the API, **you must include your API Key in the Authorization header** (Bearer format).
+- For testing, Swagger pre-authorizes you using the key: `1e02632d-6feb-4a75-a157-documentation` (1rps).
+- Get your own API Key at [enso.finance/developers](https://enso.finance/developers).
+ * OpenAPI spec version: 1.0
+ */
+import type { CallOutput } from "./callOutput";
+
+/**
+ * Amount to deposit (or previous output reference)
+ */
+export type TokenizedSingleDepositArgsDtoAmountIn = string | CallOutput;

package/src/enso-api/model/tokenizedSingleRedeemActionDto.ts

@@ -0,0 +1,18 @@
+/**
+ * Generated by orval v7.11.1 🍺
+ * Do not edit manually.
+ * #### Enso API
+- Find detailed documentation on [docs.enso.finance](https://docs.enso.finance).
+- To use the API, **you must include your API Key in the Authorization header** (Bearer format).
+- For testing, Swagger pre-authorizes you using the key: `1e02632d-6feb-4a75-a157-documentation` (1rps).
+- Get your own API Key at [enso.finance/developers](https://enso.finance/developers).
+ * OpenAPI spec version: 1.0
+ */
+import type { TokenizedSingleRedeemArgsDto } from "./tokenizedSingleRedeemArgsDto";
+
+export interface TokenizedSingleRedeemActionDto {
+    /** Protocol */
+    protocol: string;
+    action: string;
+    args: TokenizedSingleRedeemArgsDto;
+}

package/src/enso-api/model/tokenizedSingleRedeemArgsDto.ts

@@ -0,0 +1,24 @@
+/**
+ * Generated by orval v7.11.1 🍺
+ * Do not edit manually.
+ * #### Enso API
+- Find detailed documentation on [docs.enso.finance](https://docs.enso.finance).
+- To use the API, **you must include your API Key in the Authorization header** (Bearer format).
+- For testing, Swagger pre-authorizes you using the key: `1e02632d-6feb-4a75-a157-documentation` (1rps).
+- Get your own API Key at [enso.finance/developers](https://enso.finance/developers).
+ * OpenAPI spec version: 1.0
+ */
+import type { TokenizedSingleRedeemArgsDtoAmountIn } from "./tokenizedSingleRedeemArgsDtoAmountIn";
+
+export interface TokenizedSingleRedeemArgsDto {
+    /** Input token address */
+    tokenIn: string;
+    /** Output token address */
+    tokenOut: string;
+    /** Amount to redeem (or previous output reference) */
+    amountIn: TokenizedSingleRedeemArgsDtoAmountIn;
+    /** Primary contract address */
+    primaryAddress: string;
+    /** Receiver address */
+    receiver?: string;
+}

package/src/enso-api/model/tokenizedSingleRedeemArgsDtoAmountIn.ts

@@ -0,0 +1,16 @@
+/**
+ * Generated by orval v7.11.1 🍺
+ * Do not edit manually.
+ * #### Enso API
+- Find detailed documentation on [docs.enso.finance](https://docs.enso.finance).
+- To use the API, **you must include your API Key in the Authorization header** (Bearer format).
+- For testing, Swagger pre-authorizes you using the key: `1e02632d-6feb-4a75-a157-documentation` (1rps).
+- Get your own API Key at [enso.finance/developers](https://enso.finance/developers).
+ * OpenAPI spec version: 1.0
+ */
+import type { CallOutput } from "./callOutput";
+
+/**
+ * Amount to redeem (or previous output reference)
+ */
+export type TokenizedSingleRedeemArgsDtoAmountIn = string | CallOutput;

package/src/enso-api/model/tokensControllerTokensLiquidityType.ts

@@ -0,0 +1,19 @@
+/**
+ * Generated by orval v7.11.1 🍺
+ * Do not edit manually.
+ * #### Enso API
+- Find detailed documentation on [docs.enso.finance](https://docs.enso.finance).
+- To use the API, **you must include your API Key in the Authorization header** (Bearer format).
+- For testing, Swagger pre-authorizes you using the key: `1e02632d-6feb-4a75-a157-documentation` (1rps).
+- Get your own API Key at [enso.finance/developers](https://enso.finance/developers).
+ * OpenAPI spec version: 1.0
+ */
+
+export type TokensControllerTokensLiquidityType =
+    (typeof TokensControllerTokensLiquidityType)[keyof typeof TokensControllerTokensLiquidityType];
+
+// eslint-disable-next-line @typescript-eslint/no-redeclare
+export const TokensControllerTokensLiquidityType = {
+    SingleToken: "SingleToken",
+    MultiToken: "MultiToken",
+} as const;

package/src/enso-api/model/tokensControllerTokensParams.ts

@@ -9,6 +9,7 @@
  * OpenAPI spec version: 1.0
  */
 import type { TokensControllerTokensType } from "./tokensControllerTokensType";
+import type { TokensControllerTokensLiquidityType } from "./tokensControllerTokensLiquidityType";
 
 export type TokensControllerTokensParams = {
     /**
@@ -53,6 +54,11 @@ export type TokensControllerTokensParams = {
  */
     type?: TokensControllerTokensType;
     /**
+ * Type of liquidity.
+      If not provided, both types will be taken into account
+ */
+    liquidityType?: TokensControllerTokensLiquidityType;
+    /**
      * Pagination page number. Pages are of length 1000
      */
     page?: number;

package/src/enso-api/model/transferActionDto.ts

@@ -0,0 +1,18 @@
+/**
+ * Generated by orval v7.11.1 🍺
+ * Do not edit manually.
+ * #### Enso API
+- Find detailed documentation on [docs.enso.finance](https://docs.enso.finance).
+- To use the API, **you must include your API Key in the Authorization header** (Bearer format).
+- For testing, Swagger pre-authorizes you using the key: `1e02632d-6feb-4a75-a157-documentation` (1rps).
+- Get your own API Key at [enso.finance/developers](https://enso.finance/developers).
+ * OpenAPI spec version: 1.0
+ */
+import type { TransferArgsDto } from "./transferArgsDto";
+
+export interface TransferActionDto {
+    /** Protocol */
+    protocol: string;
+    action: string;
+    args: TransferArgsDto;
+}

package/src/enso-api/model/transferArgsDto.ts

@@ -0,0 +1,22 @@
+/**
+ * Generated by orval v7.11.1 🍺
+ * Do not edit manually.
+ * #### Enso API
+- Find detailed documentation on [docs.enso.finance](https://docs.enso.finance).
+- To use the API, **you must include your API Key in the Authorization header** (Bearer format).
+- For testing, Swagger pre-authorizes you using the key: `1e02632d-6feb-4a75-a157-documentation` (1rps).
+- Get your own API Key at [enso.finance/developers](https://enso.finance/developers).
+ * OpenAPI spec version: 1.0
+ */
+import type { TransferArgsDtoAmount } from "./transferArgsDtoAmount";
+
+export interface TransferArgsDto {
+    /** Token address */
+    token: string;
+    /** Amount to transfer (or previous output reference) */
+    amount: TransferArgsDtoAmount;
+    /** Receiver address */
+    receiver: string;
+    /** Optional ERC721/1155 token id */
+    id?: string;
+}

package/src/enso-api/model/transferArgsDtoAmount.ts

@@ -0,0 +1,16 @@
+/**
+ * Generated by orval v7.11.1 🍺
+ * Do not edit manually.
+ * #### Enso API
+- Find detailed documentation on [docs.enso.finance](https://docs.enso.finance).
+- To use the API, **you must include your API Key in the Authorization header** (Bearer format).
+- For testing, Swagger pre-authorizes you using the key: `1e02632d-6feb-4a75-a157-documentation` (1rps).
+- Get your own API Key at [enso.finance/developers](https://enso.finance/developers).
+ * OpenAPI spec version: 1.0
+ */
+import type { CallOutput } from "./callOutput";
+
+/**
+ * Amount to transfer (or previous output reference)
+ */
+export type TransferArgsDtoAmount = string | CallOutput;

package/src/enso-api/model/transferFromActionDto.ts

@@ -0,0 +1,18 @@
+/**
+ * Generated by orval v7.11.1 🍺
+ * Do not edit manually.
+ * #### Enso API
+- Find detailed documentation on [docs.enso.finance](https://docs.enso.finance).
+- To use the API, **you must include your API Key in the Authorization header** (Bearer format).
+- For testing, Swagger pre-authorizes you using the key: `1e02632d-6feb-4a75-a157-documentation` (1rps).
+- Get your own API Key at [enso.finance/developers](https://enso.finance/developers).
+ * OpenAPI spec version: 1.0
+ */
+import type { TransferFromArgsDto } from "./transferFromArgsDto";
+
+export interface TransferFromActionDto {
+    /** Protocol */
+    protocol: string;
+    action: string;
+    args: TransferFromArgsDto;
+}

package/src/enso-api/model/transferFromArgsDto.ts

@@ -0,0 +1,24 @@
+/**
+ * Generated by orval v7.11.1 🍺
+ * Do not edit manually.
+ * #### Enso API
+- Find detailed documentation on [docs.enso.finance](https://docs.enso.finance).
+- To use the API, **you must include your API Key in the Authorization header** (Bearer format).
+- For testing, Swagger pre-authorizes you using the key: `1e02632d-6feb-4a75-a157-documentation` (1rps).
+- Get your own API Key at [enso.finance/developers](https://enso.finance/developers).
+ * OpenAPI spec version: 1.0
+ */
+import type { TransferFromArgsDtoAmount } from "./transferFromArgsDtoAmount";
+
+export interface TransferFromArgsDto {
+    /** Token address */
+    token: string;
+    /** Sender address */
+    sender: string;
+    /** Receiver address */
+    receiver: string;
+    /** Amount to transfer (or previous output reference) */
+    amount: TransferFromArgsDtoAmount;
+    /** Optional ERC721/1155 token id */
+    id?: string;
+}

package/src/enso-api/model/transferFromArgsDtoAmount.ts

@@ -0,0 +1,16 @@
+/**
+ * Generated by orval v7.11.1 🍺
+ * Do not edit manually.
+ * #### Enso API
+- Find detailed documentation on [docs.enso.finance](https://docs.enso.finance).
+- To use the API, **you must include your API Key in the Authorization header** (Bearer format).
+- For testing, Swagger pre-authorizes you using the key: `1e02632d-6feb-4a75-a157-documentation` (1rps).
+- Get your own API Key at [enso.finance/developers](https://enso.finance/developers).
+ * OpenAPI spec version: 1.0
+ */
+import type { CallOutput } from "./callOutput";
+
+/**
+ * Amount to transfer (or previous output reference)
+ */
+export type TransferFromArgsDtoAmount = string | CallOutput;

package/src/index.ts

@@ -17,3 +17,4 @@ export {
 
 // Export theme type for TypeScript users
 export type { WidgetTheme } from "./types";
+export { SupportedExchanges } from "./types";

package/src/store.ts

@@ -3,9 +3,15 @@ import { AccessTokenPayload } from "@meshconnect/web-link-sdk";
 import { DEFAULT_SLIPPAGE } from "./util/constants";
 
 type Store = {
-    // Exchange flow
-    activeExchange: string;
-    setActiveExchange: (activeExchange: string) => void;
+    // The selected integration object from Mesh /integrations
+    selectedIntegration?: {
+        id: string;
+        type: string; // brokerType
+        name: string;
+    } | null;
+    setSelectedIntegration: (
+        selectedIntegration: { id: string; type: string; name: string } | null,
+    ) => void;
 
     ensoApiToken: string;
     setEnsoApiToken: (ensoApiToken: string) => void;
@@ -36,8 +42,9 @@ type Store = {
 };
 
 export const useAppStore = create<Store>((set) => ({
-    activeExchange: "",
-    setActiveExchange: (activeExchange: string) => set({ activeExchange }),
+    selectedIntegration: null,
+    setSelectedIntegration: (selectedIntegration) =>
+        set({ selectedIntegration }),
 
     ensoApiToken: "",
     setEnsoApiToken: (ensoApiToken: string) => set({ ensoApiToken }),

package/src/types/index.ts

@@ -1,9 +1,12 @@
 // Re-export Chakra's SystemConfig as the theme type
 import type { SystemConfig as WidgetTheme } from "@chakra-ui/react";
 
-export type { WidgetTheme };
-
-export type SupportedExchanges = "binance";
+enum SupportedExchanges {
+    Binance = "binance",
+    Kraken = "kraken",
+    Coinbase = "coinbase",
+    Bybit = "bybit",
+}
 
 export type CheckoutConfig = {
     tokenOut: string;
@@ -19,3 +22,6 @@ export type CheckoutModalProps = {
     setIsActive: (active: boolean) => void;
     onClose?: () => void;
 };
+
+export type { WidgetTheme };
+export { SupportedExchanges };

package/src/util/common.tsx

@@ -260,6 +260,8 @@ const getAlternativeMeshSymbol = (
     if (symbol === "USDT") {
         if (chainId === SupportedChainId.BSC) {
             return "BSC-USD";
+        } else if (chainId === SupportedChainId.MAINNET) {
+            return "USDT";
         }
 
         return "USDT0";

package/src/util/enso-hooks.tsx

@@ -5,8 +5,10 @@ import { useCallback, useMemo } from "react";
 import {
     useEnsoToken,
     useEnsoPrice,
-    useEnsoData,
+    useTokenizedRouteData,
     useSmartAccountBalance,
+    useIsNontokenized,
+    useNontokenizedRouteData,
 } from "@/enso-api/api";
 import { getWalletDisplayName, getWalletIcon } from "@/util/wallet";
 import { formatUSD, normalizeValue } from "@/util";
@@ -78,7 +80,9 @@ export const useAppDetails = () => {
     const slippage = useAppStore((state) => state.slippage);
     const chainIdIn = useAppStore((state) => state.chainIdIn);
     const chainIdOut = useAppStore((state) => state.chainIdOut);
-    const isCheckout = useAppStore((state) => state.activeExchange);
+    const selectedIntegration = useAppStore(
+        (state) => state.selectedIntegration,
+    );
 
     const {
         data: [tokenInData],
@@ -89,6 +93,42 @@ export const useAppDetails = () => {
     const { data: tokenInPrice } = useEnsoPrice(chainIdIn, tokenIn);
     const { data: tokenOutPrice } = useEnsoPrice(chainIdOut, tokenOut);
 
+    const { isNontokenized, nontokenizedData } = useIsNontokenized(
+        tokenOut,
+        chainIdOut,
+    );
+
+    // Use underlying tokens if target is nontokenized, otherwise use tokenOutData
+    const effectiveTokenOutData = useMemo(() => {
+        if (isNontokenized && nontokenizedData?.underlyingTokens) {
+            // Map underlying tokens to Token format with logoURI
+            const underlyingTokens = nontokenizedData.underlyingTokens.map(
+                (token) => ({
+                    ...token,
+                    logoURI: token.logosUri?.[0],
+                }),
+            );
+
+            // Return first underlying token as primary, with all underlyingTokens available
+            return {
+                ...underlyingTokens[0],
+                underlyingTokens,
+                protocol: nontokenizedData.protocol,
+                name:
+                    nontokenizedData.protocol + " " + underlyingTokens[0].name,
+                isNontokenized: true,
+            };
+        }
+
+        return tokenOutData;
+    }, [isNontokenized, nontokenizedData, tokenOutData]);
+
+    const nontokenizedPrice = useEnsoPrice(
+        chainIdOut,
+        effectiveTokenOutData?.address,
+    );
+    const effectivePrice = isNontokenized ? nontokenizedPrice : tokenOutPrice;
+
     return {
         chainIdIn,
         chainIdOut,
@@ -101,7 +141,10 @@ export const useAppDetails = () => {
         tokenOutPrice,
         tokenIn,
         tokenOut,
-        isCheckout,
+        selectedIntegration,
+        effectiveTokenOutData,
+        effectivePrice,
+        isNontokenized,
     };
 };
 
@@ -209,16 +252,12 @@ export const useRouteData = () => {
         tokenInPrice,
         tokenIn,
         tokenOut,
-        isCheckout,
+        selectedIntegration,
+        isNontokenized,
     } = useAppDetails();
 
-    const {
-        data: routeData,
-        isLoading,
-        error,
-        isFetched,
-    } = useEnsoData({
-        routingStrategy: isCheckout ? "checkout" : "router",
+    const standardRoute = useTokenizedRouteData({
+        routingStrategy: selectedIntegration?.type ? "checkout" : "router",
         fromAddress: address,
         receiver: address,
         spender: address,
@@ -228,8 +267,30 @@ export const useRouteData = () => {
         slippage,
         chainId: chainIdIn,
         outChainId: chainIdOut,
+        enabled: !isNontokenized,
     });
 
+    const nontokenizedRoute = useNontokenizedRouteData({
+        routingStrategy: selectedIntegration?.type ? "checkout" : "router",
+        fromAddress: address,
+        receiver: address,
+        spender: address,
+        amountIn,
+        tokenIn,
+        positionOut: tokenOut,
+        slippage,
+        chainId: chainIdIn,
+        outChainId: chainIdOut,
+        enabled: isNontokenized,
+    });
+
+    const {
+        data: routeData,
+        isLoading,
+        error,
+        isFetched,
+    } = isNontokenized ? nontokenizedRoute : standardRoute;
+
     const usdAmountIn = useMemo(
         () =>
             formatUSD(