@funkit/connect 1.2.7 → 1.3.0

package/CHANGELOG.md

@@ -1,5 +1,22 @@
 # @funkit/connect
 
+## 1.3.0
+
+### Minor Changes
+
+- 6c315a2: feat: enable checkout transfers
+
+### Patch Changes
+
+- 5f70055: refactor: switch over to userId-based checkout apis
+- 70d3eb8: fix: quote gas estimation error fallback
+- 8e6f93f: feat: add flags select_payment_method_text, payment_method_copy_v1
+- Updated dependencies [5f70055]
+- Updated dependencies [5f70055]
+  - @funkit/api-base@0.0.5
+  - @funkit/core@1.0.18
+  - @funkit/wagmi-tools@2.0.3
+
 ## 1.2.7
 
 ### Patch Changes

package/dist/index.js

@@ -2,12 +2,12 @@
 import {
   en_US_default
 } from "./chunk-SW6GAS7K.js";
-import {
-  lightTheme
-} from "./chunk-FRT63PFR.js";
 import {
   darkTheme
 } from "./chunk-ICLRFHOV.js";
+import {
+  lightTheme
+} from "./chunk-FRT63PFR.js";
 import "./chunk-I24HX4XM.js";
 
 // src/components/ConnectButton/ConnectButton.tsx
@@ -373,6 +373,38 @@ var flagConfig = {
         value: true
       }
     ]
+  },
+  ["select_payment_method_text" /* SelectPaymentMethodText */]: {
+    type: "string",
+    default_value: "Select Payment Method",
+    overrides: [
+      {
+        if_any: [
+          {
+            key: "userId",
+            type: "pctRollout",
+            pct: 50
+          }
+        ],
+        value: "Pay With"
+      }
+    ]
+  },
+  ["payment_method_copy_v1" /* PaymentMethodCopyV1 */]: {
+    type: "boolean",
+    default_value: false,
+    overrides: [
+      {
+        if_any: [
+          {
+            key: "userId",
+            type: "pctRollout",
+            pct: 100
+          }
+        ],
+        value: true
+      }
+    ]
   }
 };
 
@@ -1070,7 +1102,7 @@ function FunkitConnectChainProvider({
         apiKey
       }).then(() => {
         logger.log("Core configured");
-        flags.init({
+        void flags.init({
           apiKey
         });
       });
@@ -2154,7 +2186,7 @@ import {
   getAssetPriceInfo as getAssetPriceInfo2,
   getCheckoutByDepositAddress,
   getCheckoutQuote as getApiCheckoutQuote,
-  getCheckoutsByRecipientAddress,
+  getCheckoutsByUserId,
   getMoonpayBuyQuoteForCreditCard,
   initializeCheckout as postApiInitializeCheckout,
   meshPreviewTransfer
@@ -2586,12 +2618,6 @@ function validateCheckoutConfig(config, isUserLoggedIn) {
       message: `Invalid customRecipient configuration: Has to be a valid address.`
     };
   }
-  if (config.customRecipient && isAddress(config.customRecipient) && isUserLoggedIn) {
-    return {
-      isValid: false,
-      message: `Invalid customRecipient configuration: Unsupported when a user is logged in.`
-    };
-  }
   if (config.customRecipient && !!config.actionsParams.length) {
     return {
       isValid: false,
@@ -2843,7 +2869,8 @@ function FunkitCheckoutProvider({ children }) {
     logoutSymbol,
     isWeb2Login,
     isWeb3Login,
-    isUserLoggedIn
+    isUserLoggedIn,
+    userInfo
   } = useGeneralWallet();
   const { switchChainAsync } = useFunkitSwitchChains({});
   const [activeCheckouts, setActiveCheckouts] = useState8({});
@@ -2870,9 +2897,9 @@ function FunkitCheckoutProvider({ children }) {
       let newCheckoutHistoryList = [];
       setIsRefreshingCheckoutHistory(true);
       if (isUserLoggedIn) {
-        logger.log("getCheckoutsByRecipientAddress");
-        newCheckoutHistoryList = await getCheckoutsByRecipientAddress({
-          recipientAddress: walletAddress,
+        logger.log("getCheckoutsByUserId");
+        newCheckoutHistoryList = await getCheckoutsByUserId({
+          userId: userInfo.id,
           apiKey: funkitConfig.apiKey
         });
       } else if (isGuestUserOnCheckoutHistory) {
@@ -2897,7 +2924,8 @@ function FunkitCheckoutProvider({ children }) {
     historyDepositAddress,
     isGuestUserOnCheckoutHistory,
     isUserLoggedIn,
-    walletAddress
+    walletAddress,
+    userInfo
   ]);
   useEffect7(() => {
     if (isUserLoggedIn || isGuestUserOnCheckoutHistory) {
@@ -3156,6 +3184,7 @@ function FunkitCheckoutProvider({ children }) {
         ]);
         const inputCustomRecipient = checkoutItem.initSettings.config.customRecipient;
         const baseQuote = await getApiCheckoutQuote({
+          userId: userInfo.id,
           fromChainId,
           fromTokenAddress,
           fromTokenDecimals,
@@ -3177,10 +3206,12 @@ function FunkitCheckoutProvider({ children }) {
             ...checkoutItem,
             quoteStepMessage: newPaymentMethodInfo.paymentMethod === "balance" /* ACCOUNT_BALANCE */ && isWeb2Login ? PENDING_QUOTE_MESSAGE_GENERATOR[3 /* FINALIZING */]() : newPaymentMethodInfo.paymentMethod === "balance" /* ACCOUNT_BALANCE */ && isWeb3Login ? PENDING_QUOTE_MESSAGE_GENERATOR[2 /* ESTIMATING_GAS */]() : PENDING_QUOTE_MESSAGE_GENERATOR[1 /* VERIFYING_PROVIDER */](newPaymentMethodInfo.title)
           };
-          setActiveCheckouts((prev) => ({
-            ...prev,
-            [checkoutId]: checkoutItem
-          }));
+          setActiveCheckouts(
+            (prev) => ({
+              ...prev,
+              [checkoutId]: checkoutItem
+            })
+          );
         }
         const newFinalDollarValue = baseQuote.estSubtotalUsd;
         const networkFeesUsdBreakdown = {
@@ -3199,26 +3230,32 @@ function FunkitCheckoutProvider({ children }) {
         if (newPaymentMethodInfo.paymentMethod === "balance" /* ACCOUNT_BALANCE */ && isWeb3Login && checkoutItem.selectedSourceAssetInfo.chainId !== zkSync.id.toString()) {
           let gasEstimateResult = BigInt(0);
           const isNativeTokenTransfer = checkoutItem.selectedSourceAssetInfo.address === NATIVE_TOKEN;
-          if (isNativeTokenTransfer) {
-            gasEstimateResult = await estimateGas(wagmiConfig, {
-              to: DUMMY_TRANSFER_PARAMS.toAddress,
-              chainId: parseInt(checkoutItem.selectedSourceAssetInfo.chainId),
-              value: BigInt(baseQuote.estTotalFromAmountBaseUnit)
-            });
-          } else {
-            gasEstimateResult = await estimateGas(wagmiConfig, {
-              to: checkoutItem.selectedSourceAssetInfo.address,
-              chainId: parseInt(checkoutItem.selectedSourceAssetInfo.chainId),
-              data: encodeFunctionData({
-                abi: erc20Abi,
-                functionName: "transfer",
-                args: [
-                  DUMMY_TRANSFER_PARAMS.toAddress,
-                  BigInt(baseQuote.estTotalFromAmountBaseUnit)
-                ]
-              })
-            });
+          logger.log("gasEstimateResult:before", { gasEstimateResult });
+          try {
+            if (isNativeTokenTransfer) {
+              gasEstimateResult = await estimateGas(wagmiConfig, {
+                to: DUMMY_TRANSFER_PARAMS.toAddress,
+                chainId: parseInt(checkoutItem.selectedSourceAssetInfo.chainId),
+                value: BigInt(baseQuote.estTotalFromAmountBaseUnit)
+              });
+            } else {
+              gasEstimateResult = await estimateGas(wagmiConfig, {
+                to: checkoutItem.selectedSourceAssetInfo.address,
+                chainId: parseInt(checkoutItem.selectedSourceAssetInfo.chainId),
+                data: encodeFunctionData({
+                  abi: erc20Abi,
+                  functionName: "transfer",
+                  args: [
+                    DUMMY_TRANSFER_PARAMS.toAddress,
+                    BigInt(baseQuote.estTotalFromAmountBaseUnit)
+                  ]
+                })
+              });
+            }
+          } catch (err) {
+            logger.error("_getCheckoutQuote:estimateGas:error", err);
           }
+          logger.log("gasEstimateResult:after", { gasEstimateResult });
           const gasInEthAmount = GAS_ESTIMATE_MULTIPLER * parseFloat(formatEther(gasEstimateResult));
           networkFeesUsdBreakdown.networkFeesUsdFromEoaGas = await _calculateAssetUsdValue(
             checkoutItem.selectedSourceAssetInfo.chainId,
@@ -3346,10 +3383,12 @@ function FunkitCheckoutProvider({ children }) {
           quoteStepMessage: "",
           quoteErrorMessage: ""
         };
-        setActiveCheckouts((prev) => ({
-          ...prev,
-          [checkoutId]: checkoutItem
-        }));
+        setActiveCheckouts(
+          (prev) => ({
+            ...prev,
+            [checkoutId]: checkoutItem
+          })
+        );
         return true;
       } catch (err) {
         const generatedErrorIfAny = generateQuoteApiErrorForDisplay(err.message);
@@ -3357,16 +3396,18 @@ function FunkitCheckoutProvider({ children }) {
           generatedErrorIfAny,
           checkoutItem
         });
-        setActiveCheckouts((prev) => ({
-          ...prev,
-          [checkoutId]: {
-            ...checkoutItem,
-            isQuoting: false,
-            latestQuote: null,
-            quoteStepMessage: "",
-            quoteErrorMessage: generatedErrorIfAny ? generatedErrorIfAny : "An error occured while generating the quote. Please try again with a different payment method or payment asset."
-          }
-        }));
+        setActiveCheckouts(
+          (prev) => ({
+            ...prev,
+            [checkoutId]: {
+              ...checkoutItem,
+              isQuoting: false,
+              latestQuote: null,
+              quoteStepMessage: "",
+              quoteErrorMessage: generatedErrorIfAny ? generatedErrorIfAny : "An error occured while generating the quote. Please try again with a different payment method or payment asset."
+            }
+          })
+        );
         return false;
       }
     },
@@ -3377,7 +3418,8 @@ function FunkitCheckoutProvider({ children }) {
       isWeb2Login,
       isWeb3Login,
       wagmiConfig,
-      walletAddress
+      walletAddress,
+      userInfo
     ]
   );
   const _generateSignedBatchOperation = useCallback7(
@@ -7205,7 +7247,13 @@ var LightningIcon = ({ color }) => {
 var PAYMENT_METHOD_CONFIG = {
   ["balance" /* ACCOUNT_BALANCE */]: {
     label: DEFAULT_TEXT_CUSTOMIZATIONS.accountBalance,
-    labelDynamic: (textCustomizations, walletAddress) => `${textCustomizations.accountBalance}${walletAddress ? ` (${walletAddress})` : ""}`,
+    labelDynamic: (textCustomizations, walletAddress) => {
+      const walletSuffix = walletAddress ? ` (${walletAddress})` : "";
+      if (textCustomizations.accountBalance !== DEFAULT_TEXT_CUSTOMIZATIONS.accountBalance) {
+        return `${textCustomizations.accountBalance}${walletSuffix}`;
+      }
+      return flags.getBool("payment_method_copy_v1" /* PaymentMethodCopyV1 */, false) ? `Wallet${walletSuffix}` : `${textCustomizations.accountBalance}${walletSuffix}`;
+    },
     timeIconDynamic: (color) => /* @__PURE__ */ React70.createElement(LightningIcon, {
       color
     }),
@@ -7216,7 +7264,12 @@ var PAYMENT_METHOD_CONFIG = {
   },
   ["card" /* CARD */]: {
     label: DEFAULT_TEXT_CUSTOMIZATIONS.debitOrCredit,
-    labelDynamic: (textCustomizations) => textCustomizations.debitOrCredit,
+    labelDynamic: (textCustomizations) => {
+      if (textCustomizations.debitOrCredit !== DEFAULT_TEXT_CUSTOMIZATIONS.debitOrCredit) {
+        return textCustomizations.debitOrCredit;
+      }
+      return flags.getBool("payment_method_copy_v1" /* PaymentMethodCopyV1 */, false) ? "Card" : textCustomizations.debitOrCredit;
+    },
     timeIconDynamic: (color) => /* @__PURE__ */ React70.createElement(ClockIcon, {
       color
     }),
@@ -7227,7 +7280,12 @@ var PAYMENT_METHOD_CONFIG = {
   },
   ["brokerage" /* BROKERAGE */]: {
     label: DEFAULT_TEXT_CUSTOMIZATIONS.brokerageOrExchange,
-    labelDynamic: (textCustomizations) => textCustomizations.brokerageOrExchange,
+    labelDynamic: (textCustomizations) => {
+      if (textCustomizations.brokerageOrExchange !== DEFAULT_TEXT_CUSTOMIZATIONS.brokerageOrExchange) {
+        return textCustomizations.brokerageOrExchange;
+      }
+      return flags.getBool("payment_method_copy_v1" /* PaymentMethodCopyV1 */, false) ? "Exchange" : textCustomizations.brokerageOrExchange;
+    },
     timeIconDynamic: (color) => /* @__PURE__ */ React70.createElement(ClockIcon, {
       color
     }),
@@ -7375,7 +7433,7 @@ function FunPaymentMethods({
   );
   const [isContinuing, setIsContinuing] = useState17(false);
   useWalletAssetsListener();
-  const { walletAssets, isWeb3Login, isWeb2Login } = useGeneralWallet();
+  const { walletAssets, isWeb3Login, isWeb2Login, isUserLoggedIn } = useGeneralWallet();
   const {
     checkoutItem,
     reDraftSymbol,
@@ -7474,8 +7532,8 @@ function FunPaymentMethods({
   ]);
   const PaymentMethodListWithStatus = useMemo16(() => {
     return Object.keys(PAYMENT_METHOD_CONFIG).map((paymentMethod) => {
-      var _a2, _b2, _c2;
-      if (paymentFlow === 0 /* DEPOSIT */ && paymentMethod === "balance" /* ACCOUNT_BALANCE */ || paymentFlow === 1 /* CHECKOUT */ && paymentMethod === "transfer" /* TRANSFER */ || paymentFlow === 1 /* CHECKOUT */ && paymentMethod === "balance" /* ACCOUNT_BALANCE */ && !!((_b2 = (_a2 = checkoutItem == null ? void 0 : checkoutItem.initSettings) == null ? void 0 : _a2.config) == null ? void 0 : _b2.customRecipient) || paymentMethod === "otc" /* OTC */ && !((_c2 = paymentsConfig.otcConfig) == null ? void 0 : _c2.isEnabled)) {
+      var _a2;
+      if (paymentFlow === 0 /* DEPOSIT */ && paymentMethod === "balance" /* ACCOUNT_BALANCE */ || paymentFlow === 1 /* CHECKOUT */ && paymentMethod === "transfer" /* TRANSFER */ || paymentFlow === 1 /* CHECKOUT */ && paymentMethod === "balance" /* ACCOUNT_BALANCE */ && !isUserLoggedIn || paymentMethod === "otc" /* OTC */ && !((_a2 = paymentsConfig.otcConfig) == null ? void 0 : _a2.isEnabled)) {
         return {
           paymentMethod,
           status: false,
@@ -7531,6 +7589,15 @@ function FunPaymentMethods({
       });
     }
   }, [canContinue, onSelect, selectedOption]);
+  const selectPaymentMethod = useMemo16(() => {
+    if (textCustomizations.selectPaymentMethod !== DEFAULT_TEXT_CUSTOMIZATIONS.selectPaymentMethod) {
+      return textCustomizations.selectPaymentMethod;
+    }
+    return flags.getString(
+      "select_payment_method_text" /* SelectPaymentMethodText */,
+      textCustomizations.selectPaymentMethod
+    );
+  }, [textCustomizations]);
   return /* @__PURE__ */ React70.createElement(Box, {
     display: "flex",
     flexDirection: "column",
@@ -7549,7 +7616,7 @@ function FunPaymentMethods({
     size: "18",
     weight: "semibold",
     color: "modalTextSecondary"
-  }, textCustomizations.selectPaymentMethod), /* @__PURE__ */ React70.createElement(Box, {
+  }, selectPaymentMethod), /* @__PURE__ */ React70.createElement(Box, {
     id: "method-list",
     display: "flex",
     flexDirection: "column",
@@ -17284,7 +17351,7 @@ function setFunkitConnectVersion({ version }) {
   localStorage.setItem(storageKey6, version);
 }
 function getCurrentSdkVersion() {
-  return "1.2.7";
+  return "1.3.0";
 }
 function useFingerprint() {
   const fingerprint = useCallback33(() => {

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

@@ -1,4 +1,4 @@
-import type { BooleanFlagConfig } from './types';
+import type { BooleanFlagConfig, StringFlagConfig } from './types';
 /**
  * Remember that these values show up in our logs
  * Make sure the enum values are unique
@@ -6,9 +6,19 @@ import type { BooleanFlagConfig } from './types';
  */
 export declare enum FlagKey {
     /** Shows "or continue with" label on FunSignInStep */
-    ConnectSignInShowSocialLabel = "connect_sign_in_show_social_label"
+    ConnectSignInShowSocialLabel = "connect_sign_in_show_social_label",
+    /** Custom text for the select payment method button */
+    SelectPaymentMethodText = "select_payment_method_text",
+    /**
+     * Changing the copy for each of three payment methods:
+     * - “Cross-Chain Swap” → Wallet
+     * - “Debit or Credit” → Card
+     * - “Brokerage or Exchange” → Exchange
+     */
+    PaymentMethodCopyV1 = "payment_method_copy_v1"
 }
-/** @satisfies Record<FlagKey, FlagConfig> */
 export declare const flagConfig: {
     [FlagKey.ConnectSignInShowSocialLabel]: BooleanFlagConfig;
+    [FlagKey.SelectPaymentMethodText]: StringFlagConfig;
+    [FlagKey.PaymentMethodCopyV1]: BooleanFlagConfig;
 };

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

@@ -3,5 +3,7 @@ import { FeatureFlag } from './impl';
 export { FlagKey };
 declare const singleton: FeatureFlag<{
     connect_sign_in_show_social_label: import("./types").BooleanFlagConfig;
+    select_payment_method_text: import("./types").StringFlagConfig;
+    payment_method_copy_v1: import("./types").BooleanFlagConfig;
 }>;
 export declare const flags: Pick<typeof singleton, "init" | "getBool" | "getNumber" | "getString">;

package/dist/wallets/walletConnectors/bifrostWallet/bifrostWallet.js

@@ -1,10 +1,10 @@
 "use client";
 import {
   bifrostWallet
-} from "../chunk-AFONKDII.js";
+} from "../chunk-FL2VIO76.js";
+import "../chunk-F3VCNZXS.js";
 import "../chunk-ZOLACFTK.js";
 import "../chunk-ZDU3JFGR.js";
-import "../chunk-F3VCNZXS.js";
 export {
   bifrostWallet
 };

package/dist/wallets/walletConnectors/bitgetWallet/bitgetWallet.js

@@ -1,10 +1,10 @@
 "use client";
 import {
   bitgetWallet
-} from "../chunk-OUQ3ZF2W.js";
+} from "../chunk-7YDZTPO4.js";
+import "../chunk-F3VCNZXS.js";
 import "../chunk-ZOLACFTK.js";
 import "../chunk-ZDU3JFGR.js";
-import "../chunk-F3VCNZXS.js";
 export {
   bitgetWallet
 };

package/dist/wallets/walletConnectors/bybitWallet/bybitWallet.js

@@ -1,9 +1,9 @@
 "use client";
 import {
   bybitWallet
-} from "../chunk-ZBQT5PV6.js";
-import "../chunk-ZDU3JFGR.js";
+} from "../chunk-BCXBFAL4.js";
 import "../chunk-F3VCNZXS.js";
+import "../chunk-ZDU3JFGR.js";
 export {
   bybitWallet
 };

package/dist/wallets/walletConnectors/chunk-2DWBVWFI.js

@@ -0,0 +1,87 @@
+"use client";
+import {
+  getInjectedConnector,
+  hasInjectedProvider
+} from "./chunk-F3VCNZXS.js";
+import {
+  getWalletConnectConnector
+} from "./chunk-ZDU3JFGR.js";
+
+// src/wallets/walletConnectors/clvWallet/clvWallet.ts
+var clvWallet = ({
+  projectId,
+  walletConnectParameters
+}) => {
+  const isCLVInjected = hasInjectedProvider({ namespace: "clover" });
+  const shouldUseWalletConnect = !isCLVInjected;
+  return {
+    id: "clv",
+    name: "CLV",
+    iconUrl: async () => (await import("./clvWallet-RM4V57ZB.js")).default,
+    iconBackground: "#fff",
+    iconAccent: "#BDFDE2",
+    installed: isCLVInjected,
+    downloadUrls: {
+      chrome: "https://chrome.google.com/webstore/detail/clv-wallet/nhnkbkgjikgcigadomkphalanndcapjk",
+      ios: "https://apps.apple.com/app/clover-wallet/id1570072858",
+      mobile: "https://apps.apple.com/app/clover-wallet/id1570072858",
+      qrCode: "https://clv.org/"
+    },
+    extension: {
+      instructions: {
+        learnMoreUrl: "https://clv.org/",
+        steps: [
+          {
+            description: "wallet_connectors.clv.extension.step1.description",
+            step: "install",
+            title: "wallet_connectors.clv.extension.step1.title"
+          },
+          {
+            description: "wallet_connectors.clv.extension.step2.description",
+            step: "create",
+            title: "wallet_connectors.clv.extension.step2.title"
+          },
+          {
+            description: "wallet_connectors.clv.extension.step3.description",
+            step: "refresh",
+            title: "wallet_connectors.clv.extension.step3.title"
+          }
+        ]
+      }
+    },
+    mobile: {
+      getUri: shouldUseWalletConnect ? (uri) => uri : void 0
+    },
+    qrCode: shouldUseWalletConnect ? {
+      getUri: (uri) => uri,
+      instructions: {
+        learnMoreUrl: "https://clv.org/",
+        steps: [
+          {
+            description: "wallet_connectors.clv.qr_code.step1.description",
+            step: "install",
+            title: "wallet_connectors.clv.qr_code.step1.title"
+          },
+          {
+            description: "wallet_connectors.clv.qr_code.step2.description",
+            step: "create",
+            title: "wallet_connectors.clv.qr_code.step2.title"
+          },
+          {
+            description: "wallet_connectors.clv.qr_code.step3.description",
+            step: "scan",
+            title: "wallet_connectors.clv.qr_code.step3.title"
+          }
+        ]
+      }
+    } : void 0,
+    createConnector: shouldUseWalletConnect ? getWalletConnectConnector({
+      projectId,
+      walletConnectParameters
+    }) : getInjectedConnector({ namespace: "clover" })
+  };
+};
+
+export {
+  clvWallet
+};