@funkit/connect 3.4.1 → 3.4.2

package/CHANGELOG.md

@@ -1,5 +1,20 @@
 # @funkit/connect
 
+## 3.4.2
+
+### Patch Changes
+
+- b58a523: refactor: switch bitfinex to bitfinex direct
+- 590eb3a: fix: fix token transfer back to previous screen
+- b8869b2: feat: basic mesh heuristics
+- 823bb83: fix: change hardcoded time estimate to reflect latest change
+- e95c917: fix: always display scrollbar
+- 57d55e1: fix: bitfinex direct name
+- af95548: refactor: improve quote error copy
+- Updated dependencies [b6b4e79]
+  - @funkit/core@2.2.2
+  - @funkit/wagmi-tools@3.0.13
+
 ## 3.4.1
 
 ### Patch Changes

package/dist/consts/mesh.d.ts

@@ -28,7 +28,7 @@ export declare enum MeshExchanges {
     Bitfinex = "Bitfinex",
     KrakenDirect = "KrakenDirect",
     Vanguard = "Vanguard",
-    BitfinexDirect = "BitfinexDirect",
+    BitfinexDirect = "Bitfinex (beta)",
     Bybit = "Bybit"
 }
 export declare const EXCHANGE_NAME_TO_TYPE: {

package/dist/index.css

@@ -6174,7 +6174,7 @@
   }
 }
 
-/* vanilla-extract-css-ns:src/components/Dialog/DialogContent.css.ts.vanilla.css?source=#H4sIAAAAAAAAE7VUy47jIBC8z1cg7SU5EDnOU+Symm+Y+wpDJyBjsKAd2zvKv4+wPZGdhzbSaE8WTXdVdVPtxZ9l+RfX6WpJPt8IKXhDFeiTQkY26aZsDkOw1hIVI8skOdcxNpzXmyTmXN4WVxymeJj9kq1saMnbAizSUGsUCvz8jmO72zyuR5eDpei5DUfwtOQnuK/epbfVaZ+j7bfgVS/wKnh1J3jdlQzXghsx65oklKySspkfbjj3STirCcC2A3Bn8EfjatoworSUYA/jaMsIr9DFWBDeGZNxT08VInhGAvLMwPRuEFTZADilY4zWkOUa43hE3rFnXOQn7yorqXDGeUbO3M8o9Xl/DrRwkpv3a9r8GeZVwXgs236G/4GFoqqKrO/BeQmeei51FUbQMaB75PlrKhA8au7bD2hwKmH3Dwk/a/A5OlPRCS9yBBDOyof69x2E1KE0vGXkaKB7mPilUnsQqJ1lRDhTFZ0Bv20bPd3Z9ncBUvNoNABLuJVkNlqX3XZfNv2iLaZ/htuVJ+QyTkqHpEerd7t8sfTyBSBAGGV5BAAA */
+/* vanilla-extract-css-ns:src/components/Dialog/DialogContent.css.ts.vanilla.css?source=#H4sIAAAAAAAAE7VUy47jIBC8z1cg7SU5EDnOU+Symm+Y+wpDJyBjsKAd2zvKv4+wPVachzbSaE+IpruqGqpZ/FmWf3Gdrpbk842QgjdUgT4pZGSTbsrmMARrLVExskyScx1jw369SWLO5W0x4jDFw+yXbGVDS94WYJGGWqNQ4Od3HNvd5nE9uhwsRc9tOIKnJT/BffUuva1O+xxtvwWveoGj4NWd4HVXMhwLbsSsa5JQskrKZn644dwn4awmANsOwJ3BH42racOI0lKCPVxHW0Z4hS7GgvDOmIx7eqoQwTMSkGcGpmeDoMoGwCkdY7SGLNcYr0fkHXvGRX7yrrKSCmecZ+TM/YxSn/f7QAsnuXkf0+bPMEcFHa7UoTS8HXWMF7Xtb/U/8FJUVZH1XTkvwVPPpa7CFXQM6B55/poKBI+a+/YDGpxK2P1Dws8afI7OVPTGixwBhLPyof799J2OBrqHiSuV2oNA7Swjwpmq6Cz5beTo8s7IvwuQmkfrAVjCrSSzqwHabfdl04/eYvpX3H4ChFyuk9Ih6dEw3o5jLL18AemffvKLBAAA */
 [data-rk] ._1pzt4231 {
   max-height: 525px;
   max-width: 100vw;
@@ -6204,6 +6204,7 @@
   background-color: var(--rk-colors-modalBackground);
 }
 [data-rk] ._1pzt4236::-webkit-scrollbar {
+  display: unset;
   width: 6px;
   background-color: var(--rk-colors-modalBackground);
 }

package/dist/index.js

@@ -1635,7 +1635,7 @@ var MeshExchanges = /* @__PURE__ */ ((MeshExchanges4) => {
   MeshExchanges4["Bitfinex"] = "Bitfinex";
   MeshExchanges4["KrakenDirect"] = "KrakenDirect";
   MeshExchanges4["Vanguard"] = "Vanguard";
-  MeshExchanges4["BitfinexDirect"] = "BitfinexDirect";
+  MeshExchanges4["BitfinexDirect"] = "Bitfinex (beta)";
   MeshExchanges4["Bybit"] = "Bybit";
   return MeshExchanges4;
 })(MeshExchanges || {});
@@ -1670,7 +1670,7 @@ var EXCHANGE_NAME_TO_TYPE = {
   ["KrakenDirect" /* KrakenDirect */]: "krakenDirect",
   ["Vanguard" /* Vanguard */]: "vanguard",
   ["Bybit" /* Bybit */]: "bybit",
-  ["BitfinexDirect" /* BitfinexDirect */]: "bitfinexDirect"
+  ["Bitfinex (beta)" /* BitfinexDirect */]: "bitfinexDirect"
 };
 
 // src/utils/flags/config.ts
@@ -1688,7 +1688,7 @@ var flagConfig = {
     default_value: [
       "Coinbase" /* Coinbase */,
       "Binance" /* Binance */,
-      "Bitfinex" /* Bitfinex */
+      "Bitfinex (beta)" /* BitfinexDirect */
     ].join(",")
   },
   ["blocked_countries" /* BlockedCountries */]: {
@@ -3131,25 +3131,29 @@ var PENDING_QUOTE_MESSAGE_GENERATOR = {
   [2 /* ESTIMATING_GAS */]: () => "Estimating gas...",
   [3 /* FINALIZING */]: () => "Finalizing your quote..."
 };
-var DEFAULT_QUOTE_ERROR = "No route found. Please retry.";
+var DEFAULT_QUOTE_ERROR = "An error occurred during quote generation. Please retry.";
 var QUOTE_API_ERROR_STRING_INFO = {
-  [0 /* NO_ROUTE_FOUND */]: {
+  [0 /* NO_ROUTE_FOUND_1 */]: {
     check: "No available route found",
     display: DEFAULT_QUOTE_ERROR
   },
-  [1 /* INSUFFICIENT_AMOUNT_GENERAL_1 */]: {
+  [1 /* NO_ROUTE_FOUND_2 */]: {
+    check: "Error estimating checkout cost and time",
+    display: DEFAULT_QUOTE_ERROR
+  },
+  [2 /* INSUFFICIENT_AMOUNT_GENERAL_1 */]: {
     check: "try to increase the amount",
     display: "Checkout amount is too low. Please retry."
   },
-  [2 /* INSUFFICIENT_AMOUNT_GENERAL_2 */]: {
+  [3 /* INSUFFICIENT_AMOUNT_GENERAL_2 */]: {
     check: "try increase the amount",
     display: "Checkout amount is too low. Please retry."
   },
-  [3 /* INSUFFICIENT_AMOUNT_FOR_BRDIGE_1 */]: {
+  [4 /* INSUFFICIENT_AMOUNT_FOR_BRDIGE_1 */]: {
     check: "target token must be at least",
     display: "Checkout amount is too low. Please retry."
   },
-  [4 /* INSUFFICIENT_AMOUNT_FOR_BRDIGE_2 */]: {
+  [5 /* INSUFFICIENT_AMOUNT_FOR_BRDIGE_2 */]: {
     check: "Bridge min amount not met",
     display: "Checkout amount is too low. Please retry."
   }
@@ -3855,13 +3859,13 @@ function hackTimeEstimationForImportantCustomer(originalTimeEstimation, paymentM
   }
   switch (paymentMethod) {
     case "balance" /* ACCOUNT_BALANCE */:
-      return 2 * 60;
+      return 1 * 60;
     case "brokerage" /* BROKERAGE */:
       return 4 * 60;
     case "card" /* CARD */:
       return 5 * 60;
     case "token_transfer" /* TOKEN_TRANSFER */:
-      return originalTimeEstimation;
+      return 2 * 60;
     default:
       return exhaustiveCheck(paymentMethod);
   }
@@ -9221,7 +9225,7 @@ var MESH_EXCHANGE_ICON_MAP = {
   ["CexIo" /* CexIo */]: (size) => /* @__PURE__ */ React97.createElement(CexloIcon, { size }),
   ["OKX" /* Okx */]: (size) => /* @__PURE__ */ React97.createElement(OkxIcon, { size }),
   ["Bitfinex" /* Bitfinex */]: (size) => /* @__PURE__ */ React97.createElement(BitfinexIcon, { size }),
-  ["BitfinexDirect" /* BitfinexDirect */]: (size) => /* @__PURE__ */ React97.createElement(BitfinexIcon, { size }),
+  ["Bitfinex (beta)" /* BitfinexDirect */]: (size) => /* @__PURE__ */ React97.createElement(BitfinexIcon, { size }),
   ["ETrade" /* ETrade */]: (size) => /* @__PURE__ */ React97.createElement(EtradeIcon, { size }),
   ["Kraken" /* Kraken */]: (size) => /* @__PURE__ */ React97.createElement(KrakenIcon, { size }),
   ["KrakenDirect" /* KrakenDirect */]: (size) => /* @__PURE__ */ React97.createElement(KrakenIcon, { size }),
@@ -11476,13 +11480,36 @@ var getAssetSymbolWithMaxUsdValue = ({
 var L1_FEES_ESTIMATE = 20;
 var L2_FEES_ESTIMATE = 1;
 var L2_COST_MARGIN_MULTIPLIER = 1.2;
-var getFeesUsdEstimate = (checkoutItem, asset) => {
+var MESH_L1_FEES_ESTIMATE = 8;
+var MESH_L2_FEES_ESTIMATE = 2;
+var MESH_CUSTOM_CLIENT_FEE_PERCENT = 0.055;
+var getMeshFeesUsdEstimate = (asset) => {
+  let meshFeeEstimate = 0;
+  meshFeeEstimate += (asset.usdAmount || 0) * MESH_CUSTOM_CLIENT_FEE_PERCENT;
+  const sourceChainId = asset.pickedChainId;
+  if (sourceChainId === mainnet4.id.toString()) {
+    meshFeeEstimate += MESH_L1_FEES_ESTIMATE;
+  } else {
+    meshFeeEstimate += MESH_L2_FEES_ESTIMATE;
+  }
+  return meshFeeEstimate;
+};
+var getBaseFeeUsdEstimate = (checkoutItem, asset) => {
   const targetChainId = checkoutItem.initSettings.config.targetChain;
   const sourceChainId = asset.pickedChainId;
   if (targetChainId !== mainnet4.id.toString() && sourceChainId !== mainnet4.id.toString()) {
     return L2_FEES_ESTIMATE;
+  } else {
+    return L1_FEES_ESTIMATE;
   }
-  return L1_FEES_ESTIMATE;
+};
+var getFeesUsdEstimate = (checkoutItem, asset) => {
+  let feeEstimate = 0;
+  feeEstimate += getBaseFeeUsdEstimate(checkoutItem, asset);
+  if (checkoutItem.selectedPaymentMethodInfo?.paymentMethod === "brokerage" /* BROKERAGE */) {
+    feeEstimate += getMeshFeesUsdEstimate(asset);
+  }
+  return feeEstimate;
 };
 var isAssetUsdAmountSufficient = (checkoutItem, asset) => {
   if (!isNotNullish(asset?.usdAmount)) {
@@ -17641,7 +17668,8 @@ var sourceChangeNext = (state, payload) => {
   if (payload.paymentMethod === "token_transfer" /* TOKEN_TRANSFER */) {
     return {
       ...common,
-      step: "transfer_token" /* TRANSFER_TOKEN */
+      step: "transfer_token" /* TRANSFER_TOKEN */,
+      prevPaymentMethodInfo: state.paymentMethodInfo
     };
   }
   throw new Error("Invalid payment method");
@@ -18205,13 +18233,13 @@ var useCheckoutTransferDepositAddress = (checkoutItem, userId, recipientAddr) =>
 };
 
 // src/modals/CheckoutModal/TransferToken.tsx
-function transferTokenNext(state, payload) {
+function transferTokenNext(state, _) {
   const common = extractCommonState(state);
-  if (payload.isLoggedIn && payload.paymentMethodInfo) {
+  if (state.prevPaymentMethodInfo) {
     return {
       ...common,
       step: "source_change" /* SOURCE_CHANGE */,
-      paymentMethodInfo: payload.paymentMethodInfo
+      paymentMethodInfo: state.prevPaymentMethodInfo
     };
   }
   return {
@@ -18275,12 +18303,7 @@ function TransferToken({ onNext }) {
   const [selectedToken, setSelectedToken] = useState47(
     filteredAssets?.[selectedChainId]?.[0] || ""
   );
-  const {
-    depositAddress,
-    minTransferUsd,
-    showOriginalRecipient,
-    recipientAddr
-  } = useTokenTransfer(selectedChainId, selectedToken);
+  const { depositAddress, minTransferUsd, showOriginalRecipient } = useTokenTransfer(selectedChainId, selectedToken);
   const isLoadingDepositAddress = depositAddress === void 0;
   return /* @__PURE__ */ React181.createElement(Box, { id: "token-transfer-page" }, /* @__PURE__ */ React181.createElement(
     Box,

package/dist/modals/CheckoutModal/TransferToken.d.ts

@@ -1,18 +1,17 @@
 import React from 'react';
-import { PaymentMethodAccountInfo } from '../../domains/paymentMethods';
+import { PaymentMethodAccountInfo, PaymentMethodBrokerageInfo } from '../../domains/paymentMethods';
 import { CheckoutModalCommonState, FunCheckoutStep, StateTransitionProps, StepTransition } from './stepTransition';
 export interface TransferTokenState extends CheckoutModalCommonState {
     step: FunCheckoutStep.TRANSFER_TOKEN;
+    prevPaymentMethodInfo?: PaymentMethodAccountInfo | PaymentMethodBrokerageInfo;
 }
 export type TransferTokenNext = {
     step: FunCheckoutStep.TRANSFER_TOKEN;
-    paymentMethodInfo?: PaymentMethodAccountInfo;
-    isLoggedIn?: boolean;
 };
 export interface TokenTransferSourceChainsAndAssets {
     [chainId: number]: string[];
 }
-export declare function transferTokenNext(state: TransferTokenState, payload: TransferTokenNext): StepTransition[FunCheckoutStep.TRANSFER_TOKEN];
+export declare function transferTokenNext(state: TransferTokenState, _: TransferTokenNext): StepTransition[FunCheckoutStep.TRANSFER_TOKEN];
 type Props = StateTransitionProps<TransferTokenState, TransferTokenNext>;
 export declare function TransferToken({ onNext }: Props): React.JSX.Element;
 export {};

package/dist/utils/assets.d.ts

@@ -13,6 +13,9 @@ export declare const getAssetSymbolWithMaxUsdValue: ({ accountHoldingsMap, filte
 export declare const L1_FEES_ESTIMATE = 20;
 export declare const L2_FEES_ESTIMATE = 1;
 export declare const L2_COST_MARGIN_MULTIPLIER = 1.2;
+export declare const MESH_L1_FEES_ESTIMATE = 8;
+export declare const MESH_L2_FEES_ESTIMATE = 2;
+export declare const MESH_CUSTOM_CLIENT_FEE_PERCENT = 0.055;
 export interface AssetHoldingsItem {
     iconSrc: string | undefined;
     symbol: string;
@@ -24,7 +27,18 @@ export interface AssetHoldingsItem {
 export interface AssetHoldingsMap {
     [symbol: string]: AssetHoldingsItem;
 }
-export declare const getFeesUsdEstimate: (checkoutItem: FunkitActiveCheckoutItem, asset: AssetHoldingsItem) => 1 | 20;
+/**
+ * Estimating mesh fees
+ */
+export declare const getMeshFeesUsdEstimate: (asset: AssetHoldingsItem) => number;
+/**
+ * Estimating fun base quote fees (market maker gas fees in particular)
+ */
+export declare const getBaseFeeUsdEstimate: (checkoutItem: FunkitActiveCheckoutItem, asset: AssetHoldingsItem) => 1 | 20;
+/**
+ * Estimating overall fees
+ */
+export declare const getFeesUsdEstimate: (checkoutItem: FunkitActiveCheckoutItem, asset: AssetHoldingsItem) => number;
 export declare const isAssetUsdAmountSufficient: (checkoutItem: FunkitActiveCheckoutItem, asset: AssetHoldingsItem | null) => boolean;
 type RecommendedAsset = {
     symbol: string;

package/dist/wallets/walletConnectors/index.js

@@ -1,7 +1,4 @@
 "use client";
-import {
-  xdefiWallet
-} from "./chunk-RVIZMVFR.js";
 import {
   zealWallet
 } from "./chunk-BUUV6BS4.js";
@@ -9,17 +6,20 @@ import {
   zerionWallet
 } from "./chunk-DBP432DI.js";
 import {
-  subWallet
-} from "./chunk-N3ELQYCY.js";
+  oneInchWallet
+} from "./chunk-I7MKK24W.js";
 import {
   talismanWallet
 } from "./chunk-OTXHQMSG.js";
 import {
-  tokenPocketWallet
-} from "./chunk-ISJYPD3T.js";
+  tahoWallet
+} from "./chunk-6AYBA6IH.js";
 import {
   tokenaryWallet
 } from "./chunk-FAYEL4JP.js";
+import {
+  tokenPocketWallet
+} from "./chunk-ISJYPD3T.js";
 import {
   trustWallet
 } from "./chunk-X45WXZDO.js";
@@ -27,8 +27,8 @@ import {
   uniswapWallet
 } from "./chunk-QFRZGNNV.js";
 import {
-  tahoWallet
-} from "./chunk-6AYBA6IH.js";
+  xdefiWallet
+} from "./chunk-RVIZMVFR.js";
 import {
   walletConnectWallet
 } from "./chunk-OFU3PEVT.js";
@@ -38,18 +38,15 @@ import {
 import {
   rainbowWallet
 } from "./chunk-OHJBALD3.js";
-import {
-  roninWallet
-} from "./chunk-63YLN6R5.js";
 import {
   ramperWallet
 } from "./chunk-TKXQYHWJ.js";
+import {
+  roninWallet
+} from "./chunk-63YLN6R5.js";
 import {
   safeWallet
 } from "./chunk-Z2QCE6O6.js";
-import {
-  oneInchWallet
-} from "./chunk-I7MKK24W.js";
 import {
   safeheronWallet
 } from "./chunk-FCIRHRFH.js";
@@ -57,41 +54,44 @@ import {
   safepalWallet
 } from "./chunk-AKAT37SI.js";
 import {
-  metaMaskWallet
-} from "./chunk-ODRDT73B.js";
+  subWallet
+} from "./chunk-N3ELQYCY.js";
+import {
+  ledgerWallet
+} from "./chunk-ZMHCZCGS.js";
 import {
   mewWallet
 } from "./chunk-CVYXTHZ6.js";
 import {
-  coreWallet
-} from "./chunk-MOOW2AOC.js";
-import {
-  oktoWallet
-} from "./chunk-MBQTOALG.js";
+  frontierWallet
+} from "./chunk-LCOUKF2U.js";
 import {
   okxWallet
 } from "./chunk-5HXH52SO.js";
 import {
   omniWallet
 } from "./chunk-II6YBG2B.js";
+import {
+  oktoWallet
+} from "./chunk-MBQTOALG.js";
 import {
   oneKeyWallet
 } from "./chunk-ZP2SV6KN.js";
 import {
   phantomWallet
 } from "./chunk-KEVUI6AA.js";
+import {
+  foxWallet
+} from "./chunk-WAOREEBE.js";
 import {
   frameWallet
 } from "./chunk-KPVNJO3R.js";
 import {
-  frontierWallet
-} from "./chunk-LCOUKF2U.js";
+  gateWallet
+} from "./chunk-YIJ5ULO3.js";
 import {
   imTokenWallet
 } from "./chunk-BMJOLT2N.js";
-import {
-  gateWallet
-} from "./chunk-YIJ5ULO3.js";
 import {
   kresusWallet
 } from "./chunk-QQJKQCII.js";
@@ -99,14 +99,11 @@ import {
   injectedWallet
 } from "./chunk-E5NYR4SS.js";
 import {
-  ledgerWallet
-} from "./chunk-ZMHCZCGS.js";
+  metaMaskWallet
+} from "./chunk-ODRDT73B.js";
 import {
   bybitWallet
 } from "./chunk-3AZNOY75.js";
-import {
-  clvWallet
-} from "./chunk-UHHA5V52.js";
 import {
   coin98Wallet
 } from "./chunk-ZXGMW3OS.js";
@@ -114,40 +111,43 @@ import {
   coinbaseWallet
 } from "./chunk-PNEDRY6O.js";
 import {
-  dawnWallet
-} from "./chunk-KCTWDMQP.js";
+  bitskiWallet
+} from "./chunk-OCCT5PIN.js";
+import {
+  coreWallet
+} from "./chunk-MOOW2AOC.js";
 import {
   desigWallet
 } from "./chunk-44CHUPEQ.js";
+import {
+  dawnWallet
+} from "./chunk-KCTWDMQP.js";
 import {
   enkryptWallet
 } from "./chunk-JJ4DXD7R.js";
-import {
-  foxWallet
-} from "./chunk-WAOREEBE.js";
 import {
   argentWallet
 } from "./chunk-ZHFISYEQ.js";
-import {
-  bifrostWallet
-} from "./chunk-KL5Z3XHJ.js";
-import {
-  bitskiWallet
-} from "./chunk-OCCT5PIN.js";
 import {
   bitgetWallet
 } from "./chunk-IEVZW3XR.js";
 import {
-  bitverseWallet
-} from "./chunk-BQEOIDHP.js";
+  bifrostWallet
+} from "./chunk-KL5Z3XHJ.js";
 import {
   bloomWallet
 } from "./chunk-J64P6XK3.js";
 import "./chunk-RETKWSKD.js";
-import "./chunk-23WIEY36.js";
+import {
+  bitverseWallet
+} from "./chunk-BQEOIDHP.js";
 import {
   braveWallet
 } from "./chunk-NUEOWEZS.js";
+import {
+  clvWallet
+} from "./chunk-UHHA5V52.js";
+import "./chunk-23WIEY36.js";
 import "./chunk-WRA2DVJ7.js";
 export {
   argentWallet,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@funkit/connect",
-  "version": "3.4.1",
+  "version": "3.4.2",
   "description": "Funkit Connect SDK elevates DeFi apps via web2 sign-ins and one-click checkouts.",
   "files": [
     "dist",
@@ -92,8 +92,8 @@
     "ua-parser-js": "^1.0.37",
     "uuid": "^9.0.1",
     "@funkit/api-base": "1.3.0",
-    "@funkit/wagmi-tools": "3.0.12",
-    "@funkit/core": "2.2.1"
+    "@funkit/core": "2.2.2",
+    "@funkit/wagmi-tools": "3.0.13"
   },
   "repository": {
     "type": "git",