@funkit/connect 5.5.1 → 5.5.2

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # @funkit/connect
 
+## 5.5.2
+
+### Patch Changes
+
+- af756c7: fix: same asset badge heurisics
+- Updated dependencies [9cc9c7f]
+  - @funkit/fun-relay@0.1.7
+
 ## 5.5.1
 
 ### Patch Changes

package/dist/domains/asset.d.ts

@@ -12,13 +12,15 @@ interface AssetUsableToPayParms {
     config: FunkitCheckoutConfig;
     payerAddress: string;
     paymentMethod: PaymentMethod;
+    targetChainId: string;
+    targetTokenAddress: string;
     assetChainId: string;
     assetTokenAddress: string;
     assetUsdAmount: number | null;
     loginType: LoginType;
     isAllowedForCheckout: boolean;
 }
-export declare const isAssetUsableToPayForCheckout: ({ apiKey, config, payerAddress, paymentMethod, assetChainId, assetTokenAddress, assetUsdAmount, loginType, isAllowedForCheckout, }: AssetUsableToPayParms) => {
+export declare const isAssetUsableToPayForCheckout: ({ apiKey, config, payerAddress, paymentMethod, targetChainId, targetTokenAddress, assetChainId, assetTokenAddress, assetUsdAmount, loginType, isAllowedForCheckout, }: AssetUsableToPayParms) => {
     isUsable: boolean;
     reason: string;
 };

package/dist/index.js

@@ -1,10 +1,10 @@
 "use client";
-import {
-  lightTheme
-} from "./chunk-RN4I4Y57.js";
 import {
   darkTheme
 } from "./chunk-ICCAQZHZ.js";
+import {
+  lightTheme
+} from "./chunk-RN4I4Y57.js";
 import {
   systemFontStack
 } from "./chunk-R2UFCJL7.js";
@@ -3403,7 +3403,22 @@ var flagConfig = {
     default_value: JSON.stringify({
       listRefresh: 30 * 1e3,
       itemRefresh: 5 * 1e3
-    })
+    }),
+    overrides: [
+      {
+        if_any: [
+          {
+            key: "apiKey",
+            type: "isAnyOf",
+            values: [KATANA_API_KEY2]
+          }
+        ],
+        value: JSON.stringify({
+          listRefresh: 5 * 1e3,
+          itemRefresh: 2 * 1e3
+        })
+      }
+    ]
   },
   [FlagKey.TokenTransferNewTokens]: {
     type: "string",
@@ -4301,13 +4316,14 @@ var isAssetUsableToPayForCheckout = ({
   config,
   payerAddress,
   paymentMethod,
+  targetChainId,
+  targetTokenAddress,
   assetChainId,
   assetTokenAddress,
   assetUsdAmount,
   loginType,
   isAllowedForCheckout
 }) => {
-  const targetChainId = config.targetChain;
   const finalCheckoutRecipient = getCheckoutRecipient({
     config,
     walletAddress: payerAddress
@@ -4315,7 +4331,7 @@ var isAssetUsableToPayForCheckout = ({
   const isSameAsPurchasingToken = !isCheckoutPostActionRequired(config) && // however, if the recipient address is different from the payer address (via account balance payment), it is possible to transfer money
   paymentMethod === "balance" /* ACCOUNT_BALANCE */ && finalCheckoutRecipient.toLowerCase() === payerAddress.toLowerCase() && isTokenEquivalent2({
     firstTokenChainId: targetChainId,
-    firstTokenAddress: config.targetAsset,
+    firstTokenAddress: targetTokenAddress,
     secondTokenChainId: assetChainId,
     secondTokenAddress: assetTokenAddress
   });
@@ -9802,6 +9818,8 @@ function useUsableWalletAssetsForCheckout() {
         config: checkoutItem.initSettings.config,
         payerAddress: walletAddress,
         paymentMethod: "balance" /* ACCOUNT_BALANCE */,
+        targetChainId: checkoutItem.initSettings.config.targetChain,
+        targetTokenAddress: checkoutItem.initSettings.config.targetAsset,
         assetChainId: asset.chainId,
         assetTokenAddress: asset.contractAddress,
         assetUsdAmount: asset.totalUsdValue,
@@ -20662,7 +20680,8 @@ var isKnownAsset2 = (asset) => asset.usdAmount !== null;
 function useEnrichedAccountHoldings({
   paymentMethodInfo,
   checkoutConfig,
-  accountHoldings
+  accountHoldings,
+  targetAssetInfo
 }) {
   const { apiKey } = useFunkitConfig();
   const { isAllowed, isLoading } = useAllowedAssets();
@@ -20673,6 +20692,8 @@ function useEnrichedAccountHoldings({
       const usableForCheckout = isAssetUsableToPayForCheckout({
         apiKey,
         config: checkoutConfig,
+        targetTokenAddress: targetAssetInfo.tokenAddress,
+        targetChainId: targetAssetInfo.tokenChainId,
         paymentMethod: paymentMethodInfo.paymentMethod,
         payerAddress: walletAddress,
         assetChainId: asset.pickedChainId,
@@ -20696,7 +20717,8 @@ function useEnrichedAccountHoldings({
     isAllowed,
     loginType,
     paymentMethodInfo.paymentMethod,
-    walletAddress
+    walletAddress,
+    targetAssetInfo
   ]);
   return { enrichedAccountHoldings, isLoading };
 }
@@ -20768,7 +20790,13 @@ function MeshOrAccountSelectAsset({
   const isTargetAssetSelectable = withTargetAssetSection && candidates;
   const defaultTargetAsset = isTargetAssetSelectable ? candidates.find(
     (token) => token.tokenSymbol === checkoutConfig?.targetAssetTicker
-  ) ?? candidates.find((token) => token.isDefault) ?? candidates[0] : void 0;
+  ) ?? candidates.find((token) => token.isDefault) ?? candidates[0] : {
+    tokenAddress: checkoutItem?.initSettings.config.targetAsset || "0x",
+    tokenChainId: checkoutItem?.initSettings.config.targetChain || "",
+    tokenSymbol: checkoutItem?.initSettings.config.targetAssetTicker || "",
+    iconSrc: checkoutItem?.initSettings.config.iconSrc || "",
+    targetAssetMinAmount: 0
+  };
   const [selectedTargetAsset, setSelectedTargetAsset] = useState42(defaultTargetAsset);
   const defaultTokenSymbols = useMemo33(() => {
     if (!checkoutConfig) {
@@ -20785,7 +20813,8 @@ function MeshOrAccountSelectAsset({
   const { enrichedAccountHoldings, isLoading: isLoadingEnrichedHoldings } = useEnrichedAccountHoldings({
     accountHoldings,
     paymentMethodInfo,
-    checkoutConfig
+    checkoutConfig,
+    targetAssetInfo: selectedTargetAsset
   });
   const assetOptions = useAssetOptions({
     enrichedAccountHoldings,
@@ -29981,7 +30010,7 @@ function setFunkitConnectVersion({ version }) {
   localStorage.setItem(storageKey5, version);
 }
 function getCurrentSdkVersion() {
-  return "5.5.1";
+  return "5.5.2";
 }
 function useFingerprint() {
   const fingerprint = useCallback49(() => {

package/dist/utils/flags/config.d.ts

@@ -156,6 +156,14 @@ export declare const flagConfig: {
     checkout_notifications_refresh_interval: {
         type: "string";
         default_value: string;
+        overrides: {
+            if_any: {
+                key: "apiKey";
+                type: "isAnyOf";
+                values: string[];
+            }[];
+            value: string;
+        }[];
     };
     token_transfer_new_tokens: {
         type: "string";

package/dist/wallets/walletConnectors/index.js

@@ -1,13 +1,13 @@
 "use client";
 import {
-  zerionWallet
-} from "./chunk-AXWP3GD4.js";
+  walletConnectWallet
+} from "./chunk-NP5QGWNL.js";
 import {
-  tahoWallet
-} from "./chunk-6P2EMPZI.js";
+  zealWallet
+} from "./chunk-JROWU5BP.js";
 import {
-  xdefiWallet
-} from "./chunk-NO7XMBB5.js";
+  zerionWallet
+} from "./chunk-AXWP3GD4.js";
 import {
   subWallet
 } from "./chunk-AD2KIJB6.js";
@@ -15,59 +15,59 @@ import {
   talismanWallet
 } from "./chunk-ABFSXBE6.js";
 import {
-  tokenaryWallet
-} from "./chunk-SLOIIJGP.js";
+  tahoWallet
+} from "./chunk-6P2EMPZI.js";
 import {
   tokenPocketWallet
 } from "./chunk-IDKVN5CF.js";
+import {
+  tokenaryWallet
+} from "./chunk-SLOIIJGP.js";
 import {
   trustWallet
 } from "./chunk-ISIBREBO.js";
+import {
+  xdefiWallet
+} from "./chunk-NO7XMBB5.js";
 import {
   uniswapWallet
 } from "./chunk-LH7BMNFZ.js";
 import {
-  walletConnectWallet
-} from "./chunk-NP5QGWNL.js";
+  phantomWallet
+} from "./chunk-ZSVTX6EK.js";
 import {
-  zealWallet
-} from "./chunk-JROWU5BP.js";
+  rabbyWallet
+} from "./chunk-BVX4XGNP.js";
 import {
   rainbowWallet
 } from "./chunk-2UCNRD7H.js";
-import {
-  rabbyWallet
-} from "./chunk-BVX4XGNP.js";
 import {
   ramperWallet
 } from "./chunk-PIUNLQJG.js";
-import {
-  roninWallet
-} from "./chunk-63YLN6R5.js";
 import {
   safeWallet
 } from "./chunk-BQQQL6UD.js";
 import {
-  omniWallet
-} from "./chunk-7CUY5G6R.js";
-import {
-  safeheronWallet
-} from "./chunk-R6RWZRFF.js";
+  roninWallet
+} from "./chunk-63YLN6R5.js";
 import {
   safepalWallet
 } from "./chunk-MSFKSQBY.js";
+import {
+  safeheronWallet
+} from "./chunk-R6RWZRFF.js";
 import {
   ledgerWallet
 } from "./chunk-BRBKM4PW.js";
 import {
   mewWallet
 } from "./chunk-V57WLZEE.js";
-import {
-  oktoWallet
-} from "./chunk-ADIXAKUL.js";
 import {
   metaMaskWallet
 } from "./chunk-G73C6P5P.js";
+import {
+  oktoWallet
+} from "./chunk-ADIXAKUL.js";
 import {
   okxWallet
 } from "./chunk-4WEHDI4Y.js";
@@ -78,11 +78,14 @@ import {
   oneKeyWallet
 } from "./chunk-4AD7VI2P.js";
 import {
-  phantomWallet
-} from "./chunk-ZSVTX6EK.js";
+  omniWallet
+} from "./chunk-7CUY5G6R.js";
 import {
-  bitgetWallet
-} from "./chunk-A5APNTGL.js";
+  foxWallet
+} from "./chunk-LMZMXEXL.js";
+import {
+  frameWallet
+} from "./chunk-ZMYVTWDF.js";
 import {
   frontierWallet
 } from "./chunk-3S2U24BJ.js";
@@ -93,38 +96,35 @@ import {
   gateWallet
 } from "./chunk-GSOYKKIS.js";
 import {
-  desigWallet
-} from "./chunk-CTU6JCOK.js";
+  kresusWallet
+} from "./chunk-MJXPRJZT.js";
 import {
   injectedWallet
 } from "./chunk-VCVVV2K7.js";
 import {
-  enkryptWallet
-} from "./chunk-SJTXS4ZW.js";
-import {
-  kresusWallet
-} from "./chunk-MJXPRJZT.js";
+  bloomWallet
+} from "./chunk-S27IADFU.js";
 import {
   coin98Wallet
 } from "./chunk-DTRYS3MO.js";
+import {
+  clvWallet
+} from "./chunk-KR6JBW5E.js";
 import {
   coinbaseWallet
 } from "./chunk-H4IRCEZN.js";
 import {
-  bloomWallet
-} from "./chunk-S27IADFU.js";
+  dawnWallet
+} from "./chunk-LN7OD5EC.js";
+import {
+  desigWallet
+} from "./chunk-CTU6JCOK.js";
 import {
   coreWallet
 } from "./chunk-HBA36GW3.js";
 import {
-  foxWallet
-} from "./chunk-LMZMXEXL.js";
-import {
-  frameWallet
-} from "./chunk-ZMYVTWDF.js";
-import {
-  dawnWallet
-} from "./chunk-LN7OD5EC.js";
+  enkryptWallet
+} from "./chunk-SJTXS4ZW.js";
 import {
   argentWallet
 } from "./chunk-WSQ2YJO2.js";
@@ -132,21 +132,21 @@ import {
   bifrostWallet
 } from "./chunk-W6N74MS3.js";
 import {
-  bitverseWallet
-} from "./chunk-3HZRRP4Y.js";
+  bitgetWallet
+} from "./chunk-A5APNTGL.js";
 import {
   bitskiWallet
 } from "./chunk-P74YPRF6.js";
 import {
-  braveWallet
-} from "./chunk-PB254NQ4.js";
+  bitverseWallet
+} from "./chunk-3HZRRP4Y.js";
 import {
   bybitWallet
 } from "./chunk-6ONTSPEY.js";
-import {
-  clvWallet
-} from "./chunk-KR6JBW5E.js";
 import "./chunk-23WIEY36.js";
+import {
+  braveWallet
+} from "./chunk-PB254NQ4.js";
 import "./chunk-WRA2DVJ7.js";
 export {
   argentWallet,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@funkit/connect",
-  "version": "5.5.1",
+  "version": "5.5.2",
   "description": "Funkit Connect SDK elevates DeFi apps via web2 sign-ins and one-click checkouts.",
   "files": [
     "dist",
@@ -93,10 +93,10 @@
     "use-debounce": "^10.0.5",
     "uuid": "^9.0.1",
     "@funkit/api-base": "1.9.1",
+    "@funkit/chains": "0.3.1",
     "@funkit/core": "2.3.23",
-    "@funkit/fun-relay": "0.1.6",
+    "@funkit/fun-relay": "0.1.7",
     "@funkit/utils": "1.1.1",
-    "@funkit/chains": "0.3.1",
     "@funkit/wagmi-tools": "3.0.45"
   },
   "repository": {

package/dist/wallets/walletConnectors/chunk-25VW5TZP.js

@@ -1,92 +0,0 @@
-"use client";
-import {
-  getInjectedConnector,
-  hasInjectedProvider
-} from "./chunk-WRA2DVJ7.js";
-import {
-  getWalletConnectConnector
-} from "./chunk-23WIEY36.js";
-
-// src/wallets/walletConnectors/roninWallet/roninWallet.ts
-var roninWallet = ({
-  projectId,
-  walletConnectParameters
-}) => {
-  const isRoninInjected = hasInjectedProvider({
-    namespace: "ronin.provider"
-  });
-  return {
-    id: "ronin",
-    name: "Ronin Wallet",
-    iconUrl: async () => (await import("./roninWallet-SAB5ESVK.js")).default,
-    iconBackground: "#ffffff",
-    rdns: "com.roninchain.wallet",
-    installed: isRoninInjected || void 0,
-    downloadUrls: {
-      android: "https://play.google.com/store/apps/details?id=com.skymavis.genesis",
-      ios: "https://apps.apple.com/us/app/ronin-wallet/id1592675001",
-      mobile: "https://wallet.roninchain.com",
-      chrome: "https://chrome.google.com/webstore/detail/ronin-wallet/fnjhmkhhmkbjkkabndcnnogagogbneec",
-      edge: "https://microsoftedge.microsoft.com/addons/detail/ronin-wallet/kjmoohlgokccodicjjfebfomlbljgfhk",
-      firefox: "https://addons.mozilla.org/firefox/addon/ronin-wallet",
-      browserExtension: "https://wallet.roninchain.com/",
-      qrCode: "https://wallet.roninchain.com/"
-    },
-    mobile: {
-      getUri: (uri) => `roninwallet://wc?uri=${encodeURIComponent(uri)}`
-    },
-    qrCode: {
-      getUri: (uri) => uri,
-      instructions: {
-        learnMoreUrl: "https://wallet.roninchain.com/",
-        steps: [
-          {
-            description: "wallet_connectors.ronin.qr_code.step1.description",
-            step: "install",
-            title: "wallet_connectors.ronin.qr_code.step1.title"
-          },
-          {
-            description: "wallet_connectors.ronin.qr_code.step2.description",
-            step: "create",
-            title: "wallet_connectors.ronin.qr_code.step2.title"
-          },
-          {
-            description: "wallet_connectors.ronin.qr_code.step3.description",
-            step: "scan",
-            title: "wallet_connectors.ronin.qr_code.step3.title"
-          }
-        ]
-      }
-    },
-    extension: {
-      instructions: {
-        learnMoreUrl: "https://wallet.roninchain.com/",
-        steps: [
-          {
-            description: "wallet_connectors.ronin.extension.step1.description",
-            step: "install",
-            title: "wallet_connectors.ronin.extension.step1.title"
-          },
-          {
-            description: "wallet_connectors.ronin.extension.step2.description",
-            step: "create",
-            title: "wallet_connectors.ronin.extension.step2.title"
-          },
-          {
-            description: "wallet_connectors.ronin.extension.step3.description",
-            step: "refresh",
-            title: "wallet_connectors.ronin.extension.step3.title"
-          }
-        ]
-      }
-    },
-    createConnector: isRoninInjected ? getInjectedConnector({ namespace: "ronin.provider" }) : getWalletConnectConnector({
-      projectId,
-      walletConnectParameters
-    })
-  };
-};
-
-export {
-  roninWallet
-};

package/dist/wallets/walletConnectors/chunk-3NC26XLM.js

@@ -1,92 +0,0 @@
-"use client";
-import {
-  getInjectedConnector,
-  hasInjectedProvider
-} from "./chunk-WRA2DVJ7.js";
-import {
-  getWalletConnectConnector
-} from "./chunk-23WIEY36.js";
-
-// src/wallets/walletConnectors/gateWallet/gateWallet.ts
-import { isAndroid } from "@funkit/utils";
-var gateWallet = ({
-  projectId,
-  walletConnectParameters
-}) => {
-  const isGateInjected = hasInjectedProvider({ namespace: "gatewallet" });
-  const shouldUseWalletConnect = !isGateInjected;
-  return {
-    id: "gate",
-    name: "Gate Wallet",
-    rdns: "io.gate.wallet",
-    iconUrl: async () => (await import("./gateWallet-CJNGQQCV.js")).default,
-    iconAccent: "#fff",
-    iconBackground: "#fff",
-    downloadUrls: {
-      android: "https://play.google.com/store/apps/details?id=com.gateio.gateio",
-      ios: "https://apps.apple.com/us/app/gate-io-buy-bitcoin-crypto/id1294998195",
-      mobile: "https://www.gate.io/mobileapp",
-      qrCode: "https://www.gate.io/web3",
-      chrome: "https://chromewebstore.google.com/detail/gate-wallet/cpmkedoipcpimgecpmgpldfpohjplkpp",
-      browserExtension: "https://www.gate.io/web3"
-    },
-    mobile: {
-      getUri: shouldUseWalletConnect ? (uri) => {
-        return isAndroid() ? uri : `gtweb3wallet://wc?uri=${encodeURIComponent(uri)}`;
-      } : void 0
-    },
-    qrCode: shouldUseWalletConnect ? {
-      getUri: (uri) => uri,
-      instructions: {
-        learnMoreUrl: "https://www.gate.io/learn",
-        steps: [
-          {
-            description: "wallet_connectors.gate.qr_code.step1.description",
-            step: "install",
-            title: "wallet_connectors.gate.qr_code.step1.title"
-          },
-          {
-            description: "wallet_connectors.gate.qr_code.step2.description",
-            step: "create",
-            title: "wallet_connectors.gate.qr_code.step2.title"
-          },
-          {
-            description: "wallet_connectors.gate.qr_code.step3.description",
-            step: "scan",
-            title: "wallet_connectors.gate.qr_code.step3.title"
-          }
-        ]
-      }
-    } : void 0,
-    extension: {
-      instructions: {
-        learnMoreUrl: "https://www.gate.io/learn",
-        steps: [
-          {
-            description: "wallet_connectors.gate.extension.step1.description",
-            step: "install",
-            title: "wallet_connectors.gate.extension.step1.title"
-          },
-          {
-            description: "wallet_connectors.gate.extension.step2.description",
-            step: "create",
-            title: "wallet_connectors.gate.extension.step2.title"
-          },
-          {
-            description: "wallet_connectors.gate.extension.step3.description",
-            step: "refresh",
-            title: "wallet_connectors.gate.extension.step3.title"
-          }
-        ]
-      }
-    },
-    createConnector: shouldUseWalletConnect ? getWalletConnectConnector({
-      projectId,
-      walletConnectParameters
-    }) : getInjectedConnector({ namespace: "gatewallet" })
-  };
-};
-
-export {
-  gateWallet
-};

package/dist/wallets/walletConnectors/chunk-3U3BMEH5.js

@@ -1,94 +0,0 @@
-"use client";
-import {
-  getInjectedConnector,
-  hasInjectedProvider
-} from "./chunk-WRA2DVJ7.js";
-import {
-  getWalletConnectConnector
-} from "./chunk-23WIEY36.js";
-
-// src/wallets/walletConnectors/okxWallet/okxWallet.ts
-import { isAndroid } from "@funkit/utils";
-var okxWallet = ({
-  projectId,
-  walletConnectParameters
-}) => {
-  const isOKXInjected = hasInjectedProvider({ namespace: "okxwallet" });
-  const shouldUseWalletConnect = !isOKXInjected;
-  return {
-    id: "okx",
-    name: "OKX Wallet",
-    rdns: "com.okex.wallet",
-    iconUrl: async () => (await import("./okxWallet-GJMKZIND.js")).default,
-    iconAccent: "#000",
-    iconBackground: "#000",
-    downloadUrls: {
-      android: "https://play.google.com/store/apps/details?id=com.okinc.okex.gp",
-      ios: "https://itunes.apple.com/app/id1327268470?mt=8",
-      mobile: "https://okx.com/download",
-      qrCode: "https://okx.com/download",
-      chrome: "https://chrome.google.com/webstore/detail/okx-wallet/mcohilncbfahbmgdjkbpemcciiolgcge",
-      edge: "https://microsoftedge.microsoft.com/addons/detail/okx-wallet/pbpjkcldjiffchgbbndmhojiacbgflha",
-      firefox: "https://addons.mozilla.org/firefox/addon/okexwallet/",
-      browserExtension: "https://okx.com/download"
-    },
-    mobile: {
-      getUri: shouldUseWalletConnect ? (uri) => {
-        return isAndroid() ? uri : `okex://main/wc?uri=${encodeURIComponent(uri)}`;
-      } : void 0
-    },
-    qrCode: shouldUseWalletConnect ? {
-      getUri: (uri) => uri,
-      instructions: {
-        learnMoreUrl: "https://okx.com/web3/",
-        steps: [
-          {
-            description: "wallet_connectors.okx.qr_code.step1.description",
-            step: "install",
-            title: "wallet_connectors.okx.qr_code.step1.title"
-          },
-          {
-            description: "wallet_connectors.okx.qr_code.step2.description",
-            step: "create",
-            title: "wallet_connectors.okx.qr_code.step2.title"
-          },
-          {
-            description: "wallet_connectors.okx.qr_code.step3.description",
-            step: "scan",
-            title: "wallet_connectors.okx.qr_code.step3.title"
-          }
-        ]
-      }
-    } : void 0,
-    extension: {
-      instructions: {
-        learnMoreUrl: "https://okx.com/web3/",
-        steps: [
-          {
-            description: "wallet_connectors.okx.extension.step1.description",
-            step: "install",
-            title: "wallet_connectors.okx.extension.step1.title"
-          },
-          {
-            description: "wallet_connectors.okx.extension.step2.description",
-            step: "create",
-            title: "wallet_connectors.okx.extension.step2.title"
-          },
-          {
-            description: "wallet_connectors.okx.extension.step3.description",
-            step: "refresh",
-            title: "wallet_connectors.okx.extension.step3.title"
-          }
-        ]
-      }
-    },
-    createConnector: shouldUseWalletConnect ? getWalletConnectConnector({
-      projectId,
-      walletConnectParameters
-    }) : getInjectedConnector({ namespace: "okxwallet" })
-  };
-};
-
-export {
-  okxWallet
-};