@funkit/connect 7.1.0-next.16 → 7.1.0-next.18

package/dist/index.js

@@ -779,7 +779,7 @@ var getRemoteImageStyles = (isRemoteImage, isRemoteImageLoaded, src) => {
 };
 
 // src/components/ConnectButton/ConnectButtonRenderer.tsx
-import { formatCurrencyAndStringify as formatCurrencyAndStringify15, isMobile as isMobile14, noop as noop9 } from "@funkit/utils";
+import { formatCurrencyAndStringify as formatCurrencyAndStringify15, isMobile as isMobile14, noop as noop10 } from "@funkit/utils";
 import React240 from "react";
 import { useAccount as useAccount12, useBalance, useConfig as useConfig8 } from "wagmi";
 
@@ -859,7 +859,7 @@ import {
   isTokenEquivalent as isTokenEquivalent7,
   round as round4
 } from "@funkit/utils";
-import { arbitrum as arbitrum5, base as base7, mainnet as mainnet12, optimism, polygon as polygon6 } from "viem/chains";
+import { arbitrum as arbitrum5, base as base7, mainnet as mainnet13, optimism, polygon as polygon6 } from "viem/chains";
 
 // src/modals/CheckoutModal/InputAmount/utils.ts
 import { formatCurrencyAndStringify } from "@funkit/utils";
@@ -1055,8 +1055,8 @@ import {
   isTokenEquivalent as isTokenEquivalent6,
   round as round3
 } from "@funkit/utils";
-import { getBalance, readContract } from "@wagmi/core";
-import { erc20Abi as erc20Abi3, isAddress as isAddress3 } from "viem";
+import { getBalance, readContract as readContract2 } from "@wagmi/core";
+import { erc20Abi as erc20Abi4, isAddress as isAddress3 } from "viem";
 
 // src/providers/FunkitCheckoutContext/index.tsx
 import {
@@ -1427,7 +1427,7 @@ function setFunkitConnectVersion({ version }) {
   localStorage.setItem(storageKey, version);
 }
 function getCurrentSdkVersion() {
-  return "7.1.0-next.16";
+  return "7.1.0-next.18";
 }
 function useFingerprint() {
   const fingerprint = useCallback3(() => {
@@ -1701,8 +1701,10 @@ var useTrack = () => {
 
 // src/hooks/useCheckoutDirectExecution.ts
 import { DirectExecutionType, getCheckoutQuoteV2 } from "@funkit/api-base";
-import { executeRelayQuote } from "@funkit/fun-relay";
+import { executeRelayQuote, shouldResetApproval } from "@funkit/fun-relay";
 import { useCallback as useCallback7 } from "react";
+import { decodeFunctionData, erc20Abi, getAddress } from "viem";
+import { readContract } from "viem/actions";
 import { useWalletClient } from "wagmi";
 
 // src/consts/checkout.ts
@@ -2461,6 +2463,111 @@ var default_configs_default = {
             }
           }
         ]
+      },
+      {
+        routeId: "LIGHTER_LINK_SPOT_NEW_USER",
+        rules: [
+          {
+            when: {
+              chainId: "1",
+              tokenAddress: "0x514910771AF9Ca656af840dff83E8264EcF986CA"
+            },
+            use: {
+              path: "FUN_MAINNET_DEPOSIT",
+              badge: "NATIVE"
+            }
+          },
+          {
+            when: "*",
+            use: {
+              path: "FUN_MAINNET_DEPOSIT"
+            }
+          }
+        ]
+      },
+      {
+        routeId: "LIGHTER_UNI_SPOT_NEW_USER",
+        rules: [
+          {
+            when: {
+              chainId: "1",
+              tokenAddress: "0x1f9840a85d5aF5bf1D1762F925BDADdC4201F984"
+            },
+            use: {
+              path: "FUN_MAINNET_DEPOSIT",
+              badge: "NATIVE"
+            }
+          },
+          {
+            when: "*",
+            use: {
+              path: "FUN_MAINNET_DEPOSIT"
+            }
+          }
+        ]
+      },
+      {
+        routeId: "LIGHTER_AAVE_SPOT_NEW_USER",
+        rules: [
+          {
+            when: {
+              chainId: "1",
+              tokenAddress: "0x7Fc66500c84A76Ad7e9c93437bFc5Ac33E2DDaE9"
+            },
+            use: {
+              path: "FUN_MAINNET_DEPOSIT",
+              badge: "NATIVE"
+            }
+          },
+          {
+            when: "*",
+            use: {
+              path: "FUN_MAINNET_DEPOSIT"
+            }
+          }
+        ]
+      },
+      {
+        routeId: "LIGHTER_SKY_SPOT_NEW_USER",
+        rules: [
+          {
+            when: {
+              chainId: "1",
+              tokenAddress: "0x56072C95FAA701256059aa122697B133aDEd9279"
+            },
+            use: {
+              path: "FUN_MAINNET_DEPOSIT",
+              badge: "NATIVE"
+            }
+          },
+          {
+            when: "*",
+            use: {
+              path: "FUN_MAINNET_DEPOSIT"
+            }
+          }
+        ]
+      },
+      {
+        routeId: "LIGHTER_LDO_SPOT_NEW_USER",
+        rules: [
+          {
+            when: {
+              chainId: "1",
+              tokenAddress: "0x5A98FcBEA516Cf06857215779Fd812CA3beF1B32"
+            },
+            use: {
+              path: "FUN_MAINNET_DEPOSIT",
+              badge: "NATIVE"
+            }
+          },
+          {
+            when: "*",
+            use: {
+              path: "FUN_MAINNET_DEPOSIT"
+            }
+          }
+        ]
       }
     ]
   },
@@ -2471,6 +2578,15 @@ var default_configs_default = {
     value: false
   },
   enablefiatdeposit: {
+    variants: [
+      {
+        condition: {
+          type: "country",
+          countryCodes: ["US"]
+        },
+        value: false
+      }
+    ],
     value: true
   },
   enablemeldpayment: {
@@ -2479,22 +2595,6 @@ var default_configs_default = {
   enabletokentransfer: {
     value: true
   },
-  enabletokentransfertest: {
-    variants: [
-      {
-        conditions: {
-          all: [
-            {
-              type: "allowedCountries",
-              countries: ["SG", "DE"]
-            }
-          ]
-        },
-        value: true
-      }
-    ],
-    value: false
-  },
   ismexico: {
     value: {
       mexico: false
@@ -2522,6 +2622,34 @@ var default_configs_default = {
       SGD: [130, 645, 1285]
     }
   },
+  mintokentransfervalue: {
+    variants: [
+      {
+        condition: {
+          type: "country",
+          countryCodes: ["CA"]
+        },
+        value: {
+          mainnet: 15,
+          nonMainnet: 3
+        }
+      },
+      {
+        condition: {
+          type: "country",
+          countryCodes: ["AU"]
+        },
+        value: {
+          mainnet: 15,
+          nonMainnet: 3
+        }
+      }
+    ],
+    value: {
+      mainnet: 10,
+      nonMainnet: 2.5
+    }
+  },
   showinfobanner: {
     value: {
       message: "",
@@ -2617,15 +2745,18 @@ import {
   AVANTIS_API_KEY as AVANTIS_API_KEY2,
   BANKR_API_KEY as BANKR_API_KEY2,
   BASED_API_KEY as BASED_API_KEY2,
+  BENTO_API_KEY,
   BULLPEN_API_KEY,
   ETHEREAL_API_KEY as ETHEREAL_API_KEY3,
   FELIX_API_KEY,
+  GINZA_API_KEY,
   HYENA_API_KEY as HYENA_API_KEY2,
   HYPERBEAT_API_KEY as HYPERBEAT_API_KEY2,
   HYPERDASH_API_KEY as HYPERDASH_API_KEY2,
   HYPEREDGE_API_KEY,
   HYPERSWAP_API_KEY,
   KATANA_API_KEY as KATANA_API_KEY2,
+  KURU_API_KEY,
   LIGHTERXYZ_API_KEY as LIGHTERXYZ_API_KEY2,
   MEGAPOT_API_KEY,
   MONAD_API_KEY as MONAD_API_KEY2,
@@ -2636,9 +2767,9 @@ import {
   SUSHI_API_KEY,
   VENTUALS_API_KEY
 } from "@funkit/api-base";
-import { MONAD_CHAIN_ID, bitcoinChain } from "@funkit/chains";
+import { MONAD_CHAIN_ID } from "@funkit/chains";
 import { FlagKey } from "@funkit/utils";
-import { arbitrum, base as base3, polygon } from "viem/chains";
+import { arbitrum, base as base3, mainnet as mainnet5, polygon } from "viem/chains";
 var FUN_INTERNAL_USERS = [
   "0x6ec0c2f25d323e7779925Cc20c3740101f990d9F",
   // Chloe
@@ -2738,8 +2869,9 @@ var QR_CODE_WITH_SOLANA = {
   1151111081099710: ["SOL", "USDC", "USDT", "TRUMP", "USDe"]
 };
 var QR_CODE_WITH_BITCOIN = {
-  ...QR_CODE_WITH_SOLANA,
-  [bitcoinChain.id]: ["BTC"]
+  ...QR_CODE_WITH_SOLANA
+  // uncomment to re-enable bitcoin
+  // [bitcoinChain.id]: ['BTC'],
 };
 var QR_CODE_WITH_MONAD = {
   ...QR_CODE_WITH_BITCOIN,
@@ -3002,7 +3134,7 @@ var flagConfig = {
             values: [POLYMARKET_API_KEY2]
           }
         ],
-        value: bitcoinChain.id.toString()
+        value: mainnet5.id.toString()
       }
     ]
   },
@@ -3189,13 +3321,16 @@ var flagConfig = {
             values: [
               AVANTIS_API_KEY2,
               BASED_API_KEY2,
+              BENTO_API_KEY,
               BULLPEN_API_KEY,
               ETHEREAL_API_KEY3,
               FELIX_API_KEY,
+              GINZA_API_KEY,
               HYENA_API_KEY2,
               HYPERBEAT_API_KEY2,
               HYPEREDGE_API_KEY,
               HYPERSWAP_API_KEY,
+              KURU_API_KEY,
               LIGHTERXYZ_API_KEY2,
               MEGAPOT_API_KEY,
               MONAD_API_KEY2,
@@ -3293,7 +3428,7 @@ var flagConfig = {
   },
   [FlagKey.EnableBitcoin]: {
     type: "boolean",
-    default_value: true,
+    default_value: false,
     overrides: [
       // Actually disable bitcoin for Ethereal
       {
@@ -3836,6 +3971,120 @@ function useCheckoutDirectExecution() {
     },
     [t, connector, switchChainAsync]
   );
+  const resetApproval = useCallback7(
+    async ({
+      tokenAddress,
+      spenderAddress
+    }) => {
+      const walletClient = _walletClient;
+      if (!walletClient) {
+        throw new Error("Viem wallet client is not defined");
+      }
+      const logPrefix3 = "resetApproval";
+      const logData = { tokenAddress, spenderAddress };
+      logger.info(logPrefix3, logData);
+      const txHash = await walletClient.writeContract({
+        address: tokenAddress,
+        abi: erc20Abi,
+        functionName: "approve",
+        args: [spenderAddress, BigInt(0)]
+      });
+      logData.txHash = txHash;
+      logger.info(`${logPrefix3}:success`, logData);
+      return txHash;
+    },
+    [_walletClient]
+  );
+  const checkAllowance = useCallback7(
+    async ({
+      tokenAddress,
+      ownerAddress,
+      spenderAddress
+    }) => {
+      const walletClient = _walletClient;
+      if (!walletClient) {
+        throw new Error("Viem wallet client is not defined");
+      }
+      const logPrefix3 = "checkAllowance";
+      const logData = {
+        tokenAddress,
+        ownerAddress,
+        spenderAddress
+      };
+      logger.info(logPrefix3, logData);
+      const allowance = await readContract(walletClient, {
+        address: tokenAddress,
+        abi: erc20Abi,
+        functionName: "allowance",
+        args: [ownerAddress, spenderAddress]
+      });
+      logData.allowance = allowance;
+      logger.info(`${logPrefix3}:success`, logData);
+      return allowance;
+    },
+    [_walletClient]
+  );
+  const resetApprovalIfNeeded = useCallback7(
+    async (relayQuote) => {
+      try {
+        const currencyInMetadata = relayQuote.details?.currencyIn?.currency;
+        const currencyInAddress = currencyInMetadata?.address ? getAddress(currencyInMetadata.address) : void 0;
+        const approveAction = relayQuote.steps.find(
+          (step) => currencyInAddress && step.id === "approve" && step.items[0]?.data && step.items[0].data.to.toLowerCase() === currencyInAddress.toLowerCase()
+        );
+        const approveActionItem = approveAction?.items[0];
+        const resetApprovalNeeded = approveActionItem && currencyInAddress && shouldResetApproval(currencyInAddress);
+        const logPrefix3 = "resetApprovalIfNeeded";
+        const logData = {
+          approveAction,
+          approveActionItem,
+          currencyInMetadata,
+          currencyInAddress,
+          resetApprovalNeeded
+        };
+        logger.info(logPrefix3, logData);
+        if (!resetApprovalNeeded) {
+          return;
+        }
+        const decodedFunctionData = decodeFunctionData({
+          abi: erc20Abi,
+          data: approveActionItem.data.data
+        });
+        logData.decodedFunctionData = decodedFunctionData;
+        if (!decodedFunctionData) {
+          logger.error(`${logPrefix3}:error:noData`, logData);
+          return;
+        }
+        const spenderAddress = decodedFunctionData.args[0];
+        logData.spenderAddress = spenderAddress;
+        if (!spenderAddress) {
+          logger.error(`${logPrefix3}:error:noSpenderAddress`, logData);
+          return;
+        }
+        const allowance = await checkAllowance({
+          tokenAddress: currencyInAddress,
+          ownerAddress: approveActionItem.data.from,
+          spenderAddress
+        });
+        logData.allowance = allowance;
+        if (allowance === BigInt(0)) {
+          logger.info(`${logPrefix3}:allowanceIsZero`, logData);
+          return;
+        }
+        logger.info(`${logPrefix3}:resettingApproval`, logData);
+        return await resetApproval({
+          tokenAddress: currencyInAddress,
+          spenderAddress
+        });
+      } catch (error) {
+        logger.error("resetApprovalIfNeeded:error", error, {
+          relayQuote
+        });
+        return;
+      }
+    },
+    [resetApproval, checkAllowance]
+  );
   const startRelayDirectExecution = useCallback7(
     async ({
       checkoutItem,
@@ -3858,6 +4107,7 @@ function useCheckoutDirectExecution() {
         throw new Error("Viem wallet client is not defined");
       }
       await checkAndSwitchChains({ executionChainId, stepMessageSetter });
+      await resetApprovalIfNeeded(relayQuote);
       const translateRelayMessage = (message) => {
         const messageMap2 = {
           "Confirm transaction in your wallet": t("relay.confirmTransaction"),
@@ -3925,18 +4175,18 @@ function useCheckoutDirectExecution() {
       };
       return await waitForConfirmation();
     },
-    [_walletClient, checkAndSwitchChains, t]
+    [_walletClient, checkAndSwitchChains, t, resetApprovalIfNeeded]
   );
   const getDirectExecutionInfo = useCallback7(
     (checkoutItem) => {
-      const noop10 = {
+      const noop11 = {
         isDirectExecution: false,
         directExecutionType: null,
         getDirectExecutionQuote: getDirectExecutionQuoteNoop,
         executeDirectExecution: executeDirectExecutionNoop
       };
       if (!checkoutItem) {
-        return noop10;
+        return noop11;
       }
       const isRelayDirectExecutionCase = getIsRelayEnabled({
         fromChainId: checkoutItem.selectedSourceAssetInfo.chainId,
@@ -3950,7 +4200,7 @@ function useCheckoutDirectExecution() {
       });
       const isDirectExecution = Boolean(isRelayDirectExecutionCase);
       if (!isDirectExecution) {
-        return noop10;
+        return noop11;
       }
       return {
         isDirectExecution: true,
@@ -4717,8 +4967,8 @@ function getCheckoutStateBooleans(checkoutState, refundState) {
 }
 
 // src/utils/lighter.ts
-import { getAddress } from "viem";
-var LIGHTER_DEPOSIT_ADDRESS = getAddress(
+import { getAddress as getAddress2 } from "viem";
+var LIGHTER_DEPOSIT_ADDRESS = getAddress2(
   "0x3b4d794a66304f130a4db8f2551b0070dfcf5ca7"
 );
 var LIGHTER_NATIVE_FLOW_TIME_ESTIMATE_SECONDS = 60 * 2;
@@ -4727,13 +4977,23 @@ var LIGHTER_DYNAMIC_ROUTING_ID = {
   ETH_SPOT: "LIGHTER_ETH_SPOT",
   USDC_PERPS: "LIGHTER_USDC_PERPS",
   ETH_SPOT_NEW_USER: "LIGHTER_ETH_SPOT_NEW_USER",
-  USDC_PERPS_NEW_USER: "LIGHTER_USDC_PERPS_NEW_USER"
+  USDC_PERPS_NEW_USER: "LIGHTER_USDC_PERPS_NEW_USER",
+  LINK_SPOT_NEW_USER: "LIGHTER_LINK_SPOT_NEW_USER",
+  UNI_SPOT_NEW_USER: "LIGHTER_UNI_SPOT_NEW_USER",
+  AAVE_SPOT_NEW_USER: "LIGHTER_AAVE_SPOT_NEW_USER",
+  SKY_SPOT_NEW_USER: "LIGHTER_SKY_SPOT_NEW_USER",
+  LDO_SPOT_NEW_USER: "LIGHTER_LDO_SPOT_NEW_USER"
 };
 var LIGHTER_TOKEN_ADDRESS_BY_ROUTING_ID = {
   ["0x0000000000000000000000000000000000000001".toLowerCase()]: LIGHTER_DYNAMIC_ROUTING_ID.ETH_SPOT,
   ["0x0000000000000000000000000000000000000000".toLowerCase()]: LIGHTER_DYNAMIC_ROUTING_ID.USDC_PERPS,
   ["0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2".toLowerCase()]: LIGHTER_DYNAMIC_ROUTING_ID.ETH_SPOT_NEW_USER,
-  ["0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48".toLowerCase()]: LIGHTER_DYNAMIC_ROUTING_ID.USDC_PERPS_NEW_USER
+  ["0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48".toLowerCase()]: LIGHTER_DYNAMIC_ROUTING_ID.USDC_PERPS_NEW_USER,
+  ["0x514910771AF9Ca656af840dff83E8264EcF986CA".toLowerCase()]: LIGHTER_DYNAMIC_ROUTING_ID.LINK_SPOT_NEW_USER,
+  ["0x1f9840a85d5aF5bf1D1762F925BDADdC4201F984".toLowerCase()]: LIGHTER_DYNAMIC_ROUTING_ID.UNI_SPOT_NEW_USER,
+  ["0x7Fc66500c84A76Ad7e9c93437bFc5Ac33E2DDaE9".toLowerCase()]: LIGHTER_DYNAMIC_ROUTING_ID.AAVE_SPOT_NEW_USER,
+  ["0x56072C95FAA701256059aa122697B133aDEd9279".toLowerCase()]: LIGHTER_DYNAMIC_ROUTING_ID.SKY_SPOT_NEW_USER,
+  ["0x5A98FcBEA516Cf06857215779Fd812CA3beF1B32".toLowerCase()]: LIGHTER_DYNAMIC_ROUTING_ID.LDO_SPOT_NEW_USER
 };
 var LIGHTER_ROUTING_ID_BY_TOKEN_ADDRESS = Object.fromEntries(
   Object.entries(LIGHTER_TOKEN_ADDRESS_BY_ROUTING_ID).map(
@@ -6238,7 +6498,7 @@ var ASSET_LOGO_SRCS = {
   IMX: "https://sdk-cdn.fun.xyz/images/imx.svg",
   INJ: "https://sdk-cdn.fun.xyz/images/inj.svg",
   LDO: "https://sdk-cdn.fun.xyz/images/ldo.svg",
-  LINK: "https://sdk-cdn.fun.xyz/images/link.svg",
+  LINK: "https://sdk-cdn.fun.xyz/images/link.png",
   LUCK: "https://sdk-cdn.fun.xyz/images/luck.png",
   MATIC: "https://sdk-cdn.fun.xyz/images/matic.svg",
   MFER: "https://sdk-cdn.fun.xyz/images/mfer.png",
@@ -6256,7 +6516,7 @@ var ASSET_LOGO_SRCS = {
   SOL: "https://sdk-cdn.fun.xyz/images/sol.svg",
   SUSDS: "https://sdk-cdn.fun.xyz/images/susds.svg",
   TYBG: "https://sdk-cdn.fun.xyz/images/tybg.png",
-  UNI: "https://sdk-cdn.fun.xyz/images/uni.svg",
+  UNI: "https://sdk-cdn.fun.xyz/images/uni.png",
   USDC: "https://sdk-cdn.fun.xyz/images/usdc.svg",
   "USDC.E": "https://sdk-cdn.fun.xyz/images/usdc.svg",
   USDE: "https://sdk-cdn.fun.xyz/images/usde.svg",
@@ -6298,7 +6558,8 @@ var ASSET_LOGO_SRCS = {
   WMON: "https://sdk-cdn.fun.xyz/images/wmon.svg",
   AUSD: "https://sdk-cdn.fun.xyz/images/ausd.svg",
   SUSHI: "https://sdk-cdn.fun.xyz/images/sushi.svg",
-  OP: "https://sdk-cdn.fun.xyz/images/optimism.svg"
+  OP: "https://sdk-cdn.fun.xyz/images/optimism.svg",
+  SKY: "https://sdk-cdn.fun.xyz/images/sky.svg"
 };
 var FALLBACK_ASSET = "https://sdk-cdn.fun.xyz/images/dollar_circle.png";
 function getAssetLogoSrc(symbol) {
@@ -7171,14 +7432,14 @@ import { createContext as createContext11 } from "react";
 
 // src/hooks/useTokenTransfer.ts
 import {
-  bitcoinChain as bitcoinChain2,
+  bitcoinChain,
   hyperEvmChain,
   monadChain,
   solanaChain
 } from "@funkit/chains";
 import { FlagKey as FlagKey6 } from "@funkit/utils";
 import { useMemo as useMemo15 } from "react";
-import { arbitrum as arbitrum2, mainnet as mainnet5, polygon as polygon2 } from "viem/chains";
+import { arbitrum as arbitrum2, mainnet as mainnet6, polygon as polygon2 } from "viem/chains";
 
 // src/utils/transfer.ts
 var getTransferTokenQrCodeUri = (props) => {
@@ -7234,12 +7495,12 @@ var useTokenTransfer = (selectedChainId, selectedToken, chainIds) => {
   const isUsdceOnPolygon = isPolygon && selectedToken === "USDC.e";
   const isUsdcOnPolygon = isPolygon && selectedToken === "USDC";
   const showOriginalRecipient = isBankrUsUser || !enableUniversal && (isUsdceOnPolygon || isUsdcOnPolygon);
-  const funDepositAddress = selectedChainId === solanaChain.id ? transferInit?.solanaAddr : selectedChainId === bitcoinChain2.id ? transferInit?.btcAddrSegwit : transferInit?.depositAddr;
+  const funDepositAddress = selectedChainId === solanaChain.id ? transferInit?.solanaAddr : selectedChainId === bitcoinChain.id ? transferInit?.btcAddrSegwit : transferInit?.depositAddr;
   const blockchainType = (() => {
     if (selectedChainId === solanaChain.id) {
       return "solana";
     }
-    if (selectedChainId === bitcoinChain2.id) {
+    if (selectedChainId === bitcoinChain.id) {
       return "bitcoin";
     }
     return "ethereum";
@@ -7278,7 +7539,7 @@ var useMinTransferLimits = () => {
   return limits ?? { mainnet: 0, nonMainnet: 0 };
 };
 function getMinTransferValueForChain(chainId, limits) {
-  const MAINNET_IDS = [mainnet5.id, bitcoinChain2.id];
+  const MAINNET_IDS = [mainnet6.id, bitcoinChain.id];
   return MAINNET_IDS.includes(chainId) ? limits.mainnet : limits.nonMainnet;
 }
 var useMinTransferValue = (selectedChainId) => {
@@ -11939,7 +12200,7 @@ import { useCallback as useCallback11, useMemo as useMemo17 } from "react";
 // src/domains/wallet.ts
 import { FUNKIT_CONNECT_SUPPORTED_CHAINS_INFO as FUNKIT_CONNECT_SUPPORTED_CHAINS_INFO3 } from "@funkit/chains";
 import { isNotNullish as isNotNullish2 } from "@funkit/utils";
-import { mainnet as mainnet6, polygon as polygon3 } from "viem/chains";
+import { mainnet as mainnet7, polygon as polygon3 } from "viem/chains";
 
 // src/utils/assets.ts
 import { isTokenAddressEquivalent as isTokenAddressEquivalent2 } from "@funkit/utils";
@@ -12234,7 +12495,7 @@ import { getCheckoutQuote as getApiCheckoutQuote } from "@funkit/api-base";
 import { getAssetPriceInfo } from "@funkit/api-base";
 import { FUNKIT_CONNECT_SUPPORTED_CHAINS_INFO as FUNKIT_CONNECT_SUPPORTED_CHAINS_INFO5 } from "@funkit/chains";
 import { estimateGas, getGasPrice } from "@wagmi/core";
-import { encodeFunctionData, erc20Abi, formatEther } from "viem";
+import { encodeFunctionData, erc20Abi as erc20Abi2, formatEther } from "viem";
 import { zksync } from "viem/zksync";
 function getFunFeeBreakdown(baseQuote) {
   return {
@@ -12256,7 +12517,7 @@ async function getTransferGas(baseQuote, selectedSourceAssetInfo, wagmiConfig) {
       to: selectedSourceAssetInfo.address,
       chainId: Number.parseInt(selectedSourceAssetInfo.chainId),
       data: encodeFunctionData({
-        abi: erc20Abi,
+        abi: erc20Abi2,
         functionName: "transfer",
         args: [
           DUMMY_TRANSFER_PARAMS.toAddress,
@@ -16467,7 +16728,7 @@ import {
 import React74, { useEffect as useEffect27, useMemo as useMemo21, useState as useState23 } from "react";
 import clsx13 from "clsx";
 import { motion as motion5, useAnimationControls } from "motion/react";
-import { mainnet as mainnet7 } from "viem/chains";
+import { mainnet as mainnet8 } from "viem/chains";
 
 // src/domains/relay.ts
 var KATANA_BRIDGE_ALERT_THRESHOLD_PERCENT = 0.5;
@@ -16733,7 +16994,7 @@ function computeDigest(relayQuoteMetadata, uiCustomizations, totalPriceImpactPer
       value: void 0
     };
   }
-  const isMainnet = details?.currencyIn?.currency?.chainId === mainnet7.id || details?.currencyOut?.currency?.chainId === mainnet7.id;
+  const isMainnet = details?.currencyIn?.currency?.chainId === mainnet8.id || details?.currencyOut?.currency?.chainId === mainnet8.id;
   const percent = formatPercent(totalPriceImpactPercent);
   return {
     isMainnet,
@@ -17532,7 +17793,7 @@ import { useEffect as useEffect29, useState as useState24 } from "react";
 import { polygon as polygon4 } from "viem/chains";
 
 // src/hooks/useEnabledTokenTransferChainTokens.ts
-import { bitcoinChain as bitcoinChain3, solanaChain as solanaChain3 } from "@funkit/chains";
+import { bitcoinChain as bitcoinChain2, solanaChain as solanaChain3 } from "@funkit/chains";
 import { FlagKey as FlagKey9 } from "@funkit/utils";
 import { base as base5 } from "viem/chains";
 function useEnabledTokenTransferChainTokens(transferInit, isWithdrawal) {
@@ -17559,7 +17820,7 @@ function useEnabledTokenTransferChainTokens(transferInit, isWithdrawal) {
       if (isSolana && !hasSolanaAddress && !isWithdrawal) {
         return acc;
       }
-      const isBitcoin = chainId === bitcoinChain3.id;
+      const isBitcoin = chainId === bitcoinChain2.id;
       if (isBitcoin && !hasBitcoinAddress && !isWithdrawal) {
         return acc;
       }
@@ -26881,19 +27142,19 @@ import { Trans as Trans10 } from "react-i18next";
 // src/modals/CheckoutModal/ConfirmationStep/useAccountBalanceTransfer.ts
 import { USDT_ABI } from "@funkit/utils";
 import { useCallback as useCallback32 } from "react";
-import { erc20Abi as erc20Abi2 } from "viem";
+import { erc20Abi as erc20Abi3 } from "viem";
 import { useAccount as useAccount6, useSendTransaction, useWriteContract } from "wagmi";
 
 // src/utils/isMainnetUsdt.ts
 import { isTokenEquivalent as isTokenEquivalent3 } from "@funkit/utils";
-import { mainnet as mainnet8 } from "viem/chains";
+import { mainnet as mainnet9 } from "viem/chains";
 var USDT_MAINNET_ADDRESS = "0xdAC17F958D2ee523a2206206994597C13D831ec7";
 function isMainnetUsdt(chainId, address) {
   return isTokenEquivalent3({
     firstTokenAddress: address,
     firstTokenChainId: chainId.toString(),
     secondTokenAddress: USDT_MAINNET_ADDRESS,
-    secondTokenChainId: mainnet8.id.toString()
+    secondTokenChainId: mainnet9.id.toString()
   });
 }
 
@@ -26963,7 +27224,7 @@ function useWeb3AccountBalancePostCheckout(setPostCheckoutStepMessage) {
             chainId: Number.parseInt(sourceAssetChainId),
             address: sourceAssetAddress,
             // USDT on mainnet has a different ABI
-            abi: isTokenMainnetUsdt ? USDT_ABI : erc20Abi2,
+            abi: isTokenMainnetUsdt ? USDT_ABI : erc20Abi3,
             functionName: "transfer",
             args: [depositAddress, sourceAssetAmountBaseUnit]
           };
@@ -30268,7 +30529,7 @@ import {
   katanaChain
 } from "@funkit/chains";
 import { useCallback as useCallback38, useState as useState56 } from "react";
-import { mainnet as mainnet9, mantle, zksync as zksync2 } from "viem/chains";
+import { mainnet as mainnet10, mantle, zksync as zksync2 } from "viem/chains";
 import { getAssetErc20ByChainAndSymbol as getAssetErc20ByChainAndSymbol2 } from "@funkit/api-base";
 var pickSourceAssetForCard = async (checkoutItem, userIpInfo, apiKey) => {
   if (!checkoutItem?.initSettings.config.targetChain) {
@@ -30302,7 +30563,7 @@ var pickSourceAssetForCard = async (checkoutItem, userIpInfo, apiKey) => {
     sourceTokenAddress = NATIVE_TOKEN;
     sourceTokenChainId = moonpayChainId;
   } else {
-    sourceTokenChainId = isNyOrTxOrVi ? mainnet9.id.toString() : moonpayChainId;
+    sourceTokenChainId = isNyOrTxOrVi ? mainnet10.id.toString() : moonpayChainId;
     if (isTargetAssetEthOrWeth) {
       sourceTokenTicker = "ETH" /* ETH */;
       sourceTokenAddress = NATIVE_TOKEN;
@@ -31240,7 +31501,7 @@ function usePaymentMethodEnablement({
   const isKatanaEarnFlowAction = isKatanaEarnFlow({ apiKey, checkoutConfig });
   const isFiatEnabled = isFiatFlagEnabled && !isKatanaEarnFlowAction;
   const isTokenTransferEnabled = isTokenTransferFlagEnabled && !isKatanaEarnFlowAction;
-  const isMeldEnabled = isMeldFlagEnabled && !isKatanaEarnFlowAction;
+  const isMeldEnabled = isMeldFlagEnabled && !isKatanaEarnFlowAction && isTokenTransferEnabled;
   const isBrokerageEnabled = isBrokerageFlagEnabled && isTokenTransferEnabled;
   return {
     isFiatEnabled,
@@ -31300,9 +31561,16 @@ var usePaymentSources = (paymentMethodInfo, targetChainId, checkoutConfig) => {
     isWalletInNewSources && "balance" /* ACCOUNT_BALANCE */,
     isBrokerageEnabled && "brokerage" /* BROKERAGE */
   ].filter((b) => !!b);
+  const comingSoon = [];
+  if (isLighterxyzCustomer(apiKey) && !isTokenTransferEnabled) {
+    comingSoon.push("token_transfer" /* TOKEN_TRANSFER */);
+    comingSoon.push("card" /* CARD */);
+    comingSoon.push("brokerage" /* BROKERAGE */);
+  }
   return {
     preferred: connected.length > 0 ? connected : fallback2,
-    moreSources: newSources
+    moreSources: newSources,
+    comingSoon
   };
 };
 
@@ -31925,7 +32193,7 @@ import {
 import { formatCurrencyAndStringify as formatCurrencyAndStringify11, isTokenEquivalent as isTokenEquivalent5 } from "@funkit/utils";
 import React188, { useEffect as useEffect50, useMemo as useMemo45, useState as useState58 } from "react";
 import { createPortal as createPortal18 } from "react-dom";
-import { mainnet as mainnet10 } from "viem/chains";
+import { mainnet as mainnet11 } from "viem/chains";
 
 // src/components/Dropdown/ReceiveTokenDropdown.tsx
 import React186 from "react";
@@ -31946,9 +32214,12 @@ var ReceiveTokenDropdown = ({
   onTokenSelected,
   label,
   activeItemLabel,
-  activeItemProps
+  activeItemProps,
+  maxDropdownHeight,
+  displayedChainId
 }) => {
   const allTokens = Array.from(new Set(Object.values(tokens).flat()));
+  const patchedChainId = displayedChainId ?? chainId;
   const tokenBadgeText = tokens.find(
     (token) => token.tokenSymbol === selectedToken
   )?.badgeText;
@@ -31961,6 +32232,7 @@ var ReceiveTokenDropdown = ({
   return /* @__PURE__ */ React186.createElement(
     BaseDropdown_default,
     {
+      maxDropdownHeight,
       horizontalIconGap: "8",
       label,
       openToTopOnMobile: false,
@@ -31971,7 +32243,7 @@ var ReceiveTokenDropdown = ({
             assetIconSize: TOKEN_ICON_SIZE2,
             assetName: selectedToken,
             assetSrc: getTokenIconUrl(selectedToken, tokens),
-            chainId,
+            chainId: patchedChainId,
             largeChainIcon: true
           }
         ),
@@ -32001,7 +32273,7 @@ var ReceiveTokenDropdown = ({
                 assetIconSize: TOKEN_ICON_SIZE2,
                 assetName: "receive-token-asset",
                 assetSrc: iconUrl,
-                chainId,
+                chainId: patchedChainId,
                 largeChainIcon: true
               }
             ),
@@ -32769,7 +33041,7 @@ function isTreatedAsNativeToken(apiKey, asset, dynamicTargetAssetCandidates, fin
   }
   if (isEtherealCustomer(apiKey)) {
     if (isTokenEquivalent5({
-      firstTokenChainId: mainnet10.id.toString(),
+      firstTokenChainId: mainnet11.id.toString(),
       firstTokenAddress: "0x90d2af7d622ca3141efa4d8f1f24d86e5974cc8f",
       // eUSDe (Ethereum)
       secondTokenChainId: asset.pickedChainId,
@@ -32812,6 +33084,8 @@ function showsNativeTokensOnTop(apiKey) {
 
 // src/modals/CheckoutModal/SourceChange/SourceChange.tsx
 import { BridgeCustomerStatus as BridgeCustomerStatus6, MeldServiceProvider as MeldServiceProvider4 } from "@funkit/api-base";
+import { LIGHTER_CHAIN_ID as LIGHTER_CHAIN_ID3 } from "@funkit/chains";
+import { noop as noop9 } from "@funkit/utils";
 import React190, { useCallback as useCallback41, useEffect as useEffect51, useState as useState59 } from "react";
 import { createPortal as createPortal19 } from "react-dom";
 
@@ -33026,6 +33300,7 @@ function SourceChange({
   const [selectedTargetAsset, setSelectedTargetAsset] = useState59(
     () => getDefaultDynamicTargetAsset(checkoutConfig)
   );
+  const isLighter = isLighterxyzCustomer(apiKey);
   useEffect51(() => {
     if (!paymentMethodInfo) {
       return;
@@ -33142,7 +33417,7 @@ function SourceChange({
       targetAssetMinAmount: token.targetAssetMinAmount,
       iconSrc: token.iconSrc
     });
-    if (isLighterxyzCustomer(apiKey)) {
+    if (isLighter) {
       const routingId = getLighterRoutingIdByTokenAddress(token.tokenAddress);
       routingId && updateDynamicRoutingId(routingId);
     }
@@ -33152,7 +33427,7 @@ function SourceChange({
       onCloseConnectModal();
     }
   }, [connectionStatus]);
-  const { preferred, moreSources } = usePaymentSources(
+  const { preferred, moreSources, comingSoon } = usePaymentSources(
     paymentMethodInfo,
     targetChainId,
     checkoutItem?.initSettings.config
@@ -33181,6 +33456,20 @@ function SourceChange({
       }
     );
   }
+  function renderComingSoon(source) {
+    return /* @__PURE__ */ React190.createElement(
+      AddPaymentMethodItem,
+      {
+        key: source,
+        paymentMethod: source,
+        isActive: false,
+        isClickable: false,
+        onClick: noop9,
+        customValueIcon: /* @__PURE__ */ React190.createElement(FunBadge, { borderColor: "generalBorder" }, t("common.comingSoon"))
+      }
+    );
+  }
+  const hasMoreSources = moreSources.length > 0 || comingSoon.length > 0;
   const bottomSectionRef = useBottomSectionRef();
   return /* @__PURE__ */ React190.createElement(React190.Fragment, null, isTargetAssetSelectable && /* @__PURE__ */ React190.createElement(Box, { marginBottom: "8" }, /* @__PURE__ */ React190.createElement(
     ReceiveTokenDropdown,
@@ -33188,6 +33477,7 @@ function SourceChange({
       activeItemLabel: t("sourceChange.selectTokenLabel"),
       activeItemProps: { background: { base: "offBackground" } },
       chainId: Number(selectedTargetAsset.tokenChainId),
+      displayedChainId: isLighter ? LIGHTER_CHAIN_ID3 : void 0,
       onTokenSelected: handleTargetAssetChange,
       selectedToken: selectedTargetAsset?.tokenSymbol,
       tokens: dynamicTargetAssets
@@ -33203,7 +33493,7 @@ function SourceChange({
       }
     },
     preferred.map(renderSource),
-    preferred.length > 0 && moreSources.length > 0 && /* @__PURE__ */ React190.createElement(
+    preferred.length > 0 && hasMoreSources && /* @__PURE__ */ React190.createElement(
       FunDivider,
       {
         label: t("sourceChange.more"),
@@ -33213,6 +33503,7 @@ function SourceChange({
       }
     ),
     moreSources.map(renderSource),
+    comingSoon.map(renderComingSoon),
     /* @__PURE__ */ React190.createElement(PayPal, null)
   ), /* @__PURE__ */ React190.createElement(Box, { className: emptyStateStyles }, /* @__PURE__ */ React190.createElement(
     FunNoResults,
@@ -38026,8 +38317,7 @@ function useFunkitCheckout(props) {
     initNewCheckout,
     initNewWithdrawal,
     updateSourceAsset,
-    updateSelectedPaymentMethodInfo,
-    checkoutItem
+    updateSelectedPaymentMethodInfo
   } = useContext19(FunkitCheckoutContext);
   const { openFunCheckoutModal } = useFunCheckoutModal();
   const { openWithdrawalModal } = useWithdrawalModal();
@@ -38057,12 +38347,10 @@ function useFunkitCheckout(props) {
   );
   const [pendingCheckoutConfig, setPendingCheckoutConfig] = useState75();
   const onCheckoutConflict = ({
-    newConfig,
     resume,
     replace
   }) => {
-    const lastConfig = checkoutItem?.initSettings.config;
-    if (lastConfig?.targetAsset === newConfig.targetAsset && isLighterxyzCustomer(apiKey)) {
+    if (isLighterxyzCustomer(apiKey)) {
       resume();
       return false;
     }
@@ -38131,7 +38419,6 @@ function useFunkitCheckout(props) {
       }
       if (hasSoftHiddenCheckout && softHiddenCheckoutId) {
         const shouldContinue = onCheckoutConflict({
-          newConfig: validationResult.config,
           hiddenCheckoutId: softHiddenCheckoutId,
           resume: resumeSoftHiddenCheckout,
           replace: discardSoftHiddenCheckout
@@ -38345,11 +38632,10 @@ function getCheckoutItemDisplay({
     targetAssetTicker
   } = checkoutConfig;
   const displayAmount = overrideAmount ?? targetAssetAmount;
+  const itemName = targetAssetTicker || checkoutItemTitle;
   if (isCheckoutPostActionRequired(checkoutConfig)) {
-    const itemName2 = checkoutItemTitle;
-    return !hideAmount && displayAmount > 0 ? formatCryptoAndStringify9(round3(displayAmount, 5), itemName2) : itemName2;
+    return !hideAmount && displayAmount > 0 ? formatCryptoAndStringify9(round3(displayAmount, 5), itemName) : itemName;
   }
-  const itemName = targetAssetTicker || checkoutItemTitle;
   return hideAmount ? itemName : formatCryptoAndStringify9(displayAmount, itemName);
 }
 function getBaseQuoteTotalFeesFromAmount(baseQuote) {
@@ -38383,9 +38669,9 @@ async function getTokenDecimals(wagmiConfig, chainId, tokenAddress) {
     if (chainId === solanaChain5.id.toString()) {
       return solanaChain5.nativeCurrency.decimals;
     }
-    const decimals = await readContract(wagmiConfig, {
+    const decimals = await readContract2(wagmiConfig, {
       address: tokenAddress,
-      abi: erc20Abi3,
+      abi: erc20Abi4,
       chainId: Number.parseInt(chainId),
       functionName: "decimals"
     });
@@ -38490,12 +38776,12 @@ function computeDisplayDestinationToken(checkoutConfig, displayAssetAmount) {
 }
 
 // src/domains/feeEstimate.ts
-import { mainnet as mainnet11 } from "viem/chains";
+import { mainnet as mainnet12 } from "viem/chains";
 var L1_FEES_ESTIMATE = 1;
 var L2_FEES_ESTIMATE = 1;
 var BROKERAGE_FEES_ESTIMATE = 0;
 var getBaseFeeUsdEstimate = (targetChainId, assetChainId) => {
-  if (targetChainId !== mainnet11.id.toString() && assetChainId !== mainnet11.id.toString()) {
+  if (targetChainId !== mainnet12.id.toString() && assetChainId !== mainnet12.id.toString()) {
     return L2_FEES_ESTIMATE;
   }
   return L1_FEES_ESTIMATE;
@@ -38511,7 +38797,7 @@ var getFeesUsdEstimate = (targetChainId, assetChainId, paymentMethod) => {
 var isStablecoin = (symbol) => STABLECOIN_SYMBOLS.find((s) => symbol.toLowerCase().includes(s.toLowerCase()));
 function isPreferredChain(chainId, additionalChains = []) {
   const chains = /* @__PURE__ */ new Set([
-    mainnet12.id,
+    mainnet13.id,
     polygon6.id,
     base7.id,
     arbitrum5.id,
@@ -38823,8 +39109,8 @@ function ConnectButtonRenderer({
     connectModalOpen,
     mounted: isMounted(),
     openAccountModal: () => openAccountModal?.(null),
-    openChainModal: openChainModal ?? noop9,
-    openConnectModal: openConnectModal ?? noop9
+    openChainModal: openChainModal ?? noop10,
+    openConnectModal: openConnectModal ?? noop10
   }));
 }
 ConnectButtonRenderer.displayName = "ConnectButton.Custom";