@funkit/connect 1.0.16 → 1.0.18

package/CHANGELOG.md

@@ -1,5 +1,20 @@
 # @funkit/connect
 
+## 1.0.18
+
+### Patch Changes
+
+- bccf0b0: feat: mesh 2fa input length toggle
+- bccf0b0: refactor: verbose sourceOfFund
+- bccf0b0: chore: better logging
+- 268d91c: format: tx summary alignments
+
+## 1.0.17
+
+### Patch Changes
+
+- 9ce0513: format: alignment
+
 ## 1.0.16
 
 ### Patch Changes

package/dist/components/FunInput/FunTwoFaInput.d.ts

@@ -5,5 +5,6 @@ export interface FunTwoFaInputProps {
     onCompleted?: (input?: any) => void;
     hasError: boolean;
     errorMessage?: string;
+    inputLength: number;
 }
-export declare const FunTwoFaInput: ({ value, onChange, onCompleted, hasError, errorMessage, }: FunTwoFaInputProps) => React.JSX.Element;
+export declare const FunTwoFaInput: ({ value, onChange, onCompleted, hasError, errorMessage, inputLength, }: FunTwoFaInputProps) => React.JSX.Element;

package/dist/index.js

@@ -1541,7 +1541,6 @@ function GeneralWalletProvider({ children }) {
       let newFunWalletAuth;
       let newFunWallet;
       if (isWeb2Login) {
-        logger.log("setupFunWallet_isWeb2Login");
         newFunWalletAuth = await ((_a = connector == null ? void 0 : connector.getAuth) == null ? void 0 : _a.call(connector));
         newFunWallet = await ((_b = connector == null ? void 0 : connector.getFunWallet) == null ? void 0 : _b.call(connector));
       } else if (isWeb3Login) {
@@ -1549,7 +1548,6 @@ function GeneralWalletProvider({ children }) {
         const provider = await ((_c = connector == null ? void 0 : connector.getProvider) == null ? void 0 : _c.call(connector));
         if (!provider)
           return;
-        logger.log("setupFunWallet_web3Provider", { provider });
         newFunWalletAuth = new Auth({ provider });
         newFunWallet = new FunWallet({
           users: [{ userId: await newFunWalletAuth.getAddress() }],
@@ -1558,7 +1556,12 @@ function GeneralWalletProvider({ children }) {
           )
         });
       }
-      logger.log("setupFunWallet_result", { newFunWallet, newFunWalletAuth });
+      logger.log("setupFunWallet_result", {
+        newFunWallet,
+        newFunWalletAuth,
+        isWeb2Login,
+        isWeb3Login
+      });
       setFunWallet(newFunWallet);
       setFunWalletAuth(newFunWalletAuth);
     }
@@ -2204,6 +2207,24 @@ function colorToHex(color) {
   return hexColor;
 }
 
+// src/utils/payment.ts
+function generateSourceOfFundString({
+  paymentMethodInfo,
+  isWeb2Login,
+  isWeb3Login,
+  walletAddress
+}) {
+  const paymentMethod = paymentMethodInfo.paymentMethod;
+  if (paymentMethod === "balance" /* ACCOUNT_BALANCE */) {
+    return `${paymentMethod}|${isWeb2Login ? "funwallet" : isWeb3Login ? "eoa" : "unrecognized"}|${walletAddress}`;
+  } else if (paymentMethod === "brokerage" /* BROKERAGE */) {
+    return `${paymentMethod}|${paymentMethodInfo.title.toLowerCase()}`;
+  } else if (paymentMethod === "card" /* CARD */) {
+    return `${paymentMethod}|moonpay`;
+  }
+  return "";
+}
+
 // src/components/FunkitProvider/FunkitCheckoutContext.tsx
 var FunkitCheckoutContext = createContext9({
   activeCheckouts: {},
@@ -2869,7 +2890,7 @@ function FunkitCheckoutProvider({ children }) {
   );
   const _confirmCheckout = useCallback6(
     async (checkoutId, shouldbatchOpBypassInit, stepMessageSetter) => {
-      var _a, _b, _c, _d;
+      var _a, _b, _c;
       if (!(funkitConfig == null ? void 0 : funkitConfig.apiKey)) {
         throw new Error(
           `Funkit Internal Error: Unable to detect funkit api key`
@@ -2905,10 +2926,15 @@ function FunkitCheckoutProvider({ children }) {
         userOp: batchUserOp,
         quoteId: checkoutItem.latestQuote.baseQuote.quoteId,
         apiKey: funkitConfig.apiKey || "",
-        sourceOfFund: (_b = checkoutItem.selectedPaymentMethodInfo) == null ? void 0 : _b.paymentMethod,
+        sourceOfFund: generateSourceOfFundString({
+          paymentMethodInfo: checkoutItem.selectedPaymentMethodInfo,
+          isWeb2Login,
+          isWeb3Login,
+          walletAddress
+        }),
         clientMetadata: _generateClientMetadataForBackend(checkoutId)
       });
-      (_d = (_c = checkoutItem == null ? void 0 : checkoutItem.initSettings) == null ? void 0 : _c.onConfirmation) == null ? void 0 : _d.call(_c);
+      (_c = (_b = checkoutItem == null ? void 0 : checkoutItem.initSettings) == null ? void 0 : _b.onConfirmation) == null ? void 0 : _c.call(_b);
       logger.log("checkoutConfirmed", { depositAddress });
       setActiveCheckouts({
         ...activeCheckouts,
@@ -4534,7 +4560,7 @@ var useMeshActiveNetworkInfo = (exchange) => {
 };
 
 // src/components/FunMeshVerificationStep/FunMeshVerificationStep.tsx
-import React52, { useCallback as useCallback11, useEffect as useEffect11, useMemo as useMemo12, useState as useState14 } from "react";
+import React53, { useCallback as useCallback11, useEffect as useEffect11, useMemo as useMemo12, useState as useState14 } from "react";
 
 // src/components/CopyAddress/CopyAddress.tsx
 import React47, { useCallback as useCallback9, useEffect as useEffect9, useState as useState13 } from "react";
@@ -4771,8 +4797,30 @@ function FunButton({
   }, title) : null, titleSuffix && /* @__PURE__ */ React48.createElement(Box, null, titleSuffix)));
 }
 
+// src/components/FunButton/FunLinkButton.tsx
+import React49 from "react";
+function FunLinkButton({
+  onClick,
+  text,
+  textProps,
+  hasPadding = true,
+  color = "modalText"
+}) {
+  return /* @__PURE__ */ React49.createElement(Box, {
+    as: "button",
+    onClick,
+    className: funLinkButtonStyle,
+    paddingLeft: hasPadding ? "4" : "0"
+  }, /* @__PURE__ */ React49.createElement(Text, {
+    color,
+    size: "12",
+    weight: "bold",
+    ...textProps
+  }, text));
+}
+
 // src/components/FunInput/FunTwoFaInput.tsx
-import React51, {
+import React52, {
   Fragment,
   useCallback as useCallback10,
   useEffect as useEffect10,
@@ -4780,25 +4828,25 @@ import React51, {
 } from "react";
 
 // src/components/FunInput/FunInput.tsx
-import React50, { forwardRef as forwardRef2 } from "react";
+import React51, { forwardRef as forwardRef2 } from "react";
 
 // src/components/Icons/SearchIcon.tsx
-import React49 from "react";
+import React50 from "react";
 var SearchIcon = ({ selected }) => {
   const { active: active2 } = useActiveTheme();
   const colorStringSelected = active2.colors.modalText;
   const colorStringDefault = active2.colors.modalTextDim;
   const colorString = selected ? colorStringSelected : colorStringDefault;
-  return /* @__PURE__ */ React49.createElement("svg", {
+  return /* @__PURE__ */ React50.createElement("svg", {
     width: "24",
     height: "24",
     viewBox: "0 0 24 24",
     fill: "none",
     xmlns: "http://www.w3.org/2000/svg"
-  }, /* @__PURE__ */ React49.createElement("path", {
+  }, /* @__PURE__ */ React50.createElement("path", {
     d: "M10.7702 18.3002C9.28095 18.3002 7.8251 17.8586 6.5868 17.0312C5.3485 16.2038 4.38336 15.0277 3.81343 13.6518C3.2435 12.2759 3.09438 10.7618 3.38493 9.30121C3.67548 7.84054 4.39264 6.49882 5.44573 5.44573C6.49882 4.39264 7.84054 3.67548 9.30121 3.38493C10.7618 3.09438 12.2759 3.2435 13.6518 3.81343C15.0277 4.38336 16.2038 5.3485 17.0312 6.5868C17.8586 7.8251 18.3002 9.28095 18.3002 10.7702C18.3002 11.759 18.1054 12.7382 17.727 13.6518C17.3486 14.5654 16.7939 15.3955 16.0947 16.0947C15.3955 16.7939 14.5654 17.3486 13.6518 17.727C12.7382 18.1054 11.759 18.3002 10.7702 18.3002ZM10.7702 4.75024C9.58356 4.75024 8.42352 5.10214 7.43682 5.76143C6.45013 6.42071 5.68109 7.35779 5.22697 8.45414C4.77284 9.5505 4.65402 10.7568 4.88553 11.9207C5.11704 13.0846 5.68849 14.1537 6.5276 14.9928C7.36672 15.8319 8.43581 16.4034 9.5997 16.6349C10.7635 16.8664 11.9699 16.7476 13.0663 16.2935C14.1626 15.8393 15.0997 15.0703 15.759 14.0836C16.4183 13.0969 16.7702 11.9369 16.7702 10.7502C16.7702 9.15894 16.1381 7.63282 15.0128 6.5076C13.8876 5.38238 12.3615 4.75024 10.7702 4.75024Z",
     fill: colorString
-  }), /* @__PURE__ */ React49.createElement("path", {
+  }), /* @__PURE__ */ React50.createElement("path", {
     d: "M20 20.75C19.9015 20.7504 19.8038 20.7312 19.7128 20.6934C19.6218 20.6557 19.5392 20.6001 19.47 20.53L15.34 16.4C15.2075 16.2578 15.1354 16.0697 15.1388 15.8754C15.1422 15.6811 15.221 15.4958 15.3584 15.3583C15.4958 15.2209 15.6812 15.1422 15.8755 15.1388C16.0698 15.1354 16.2578 15.2075 16.4 15.34L20.53 19.47C20.6704 19.6106 20.7493 19.8012 20.7493 20C20.7493 20.1987 20.6704 20.3893 20.53 20.53C20.4608 20.6001 20.3782 20.6557 20.2872 20.6934C20.1962 20.7312 20.0985 20.7504 20 20.75Z",
     fill: colorString
   }));
@@ -4831,20 +4879,20 @@ function FunInputDefault({
   focused: _focused,
   overrideBorderWidth
 }) {
-  const [focused, setFocused] = React50.useState(false);
+  const [focused, setFocused] = React51.useState(false);
   const onFocus = () => setFocused(true);
   const onBlur = () => setFocused(false);
-  return /* @__PURE__ */ React50.createElement(Box, {
+  return /* @__PURE__ */ React51.createElement(Box, {
     color: "modalText",
     display: "flex",
     flexDirection: "column",
     gap: "8",
     width: "full"
-  }, label && /* @__PURE__ */ React50.createElement(Text, {
+  }, label && /* @__PURE__ */ React51.createElement(Text, {
     color: textColor,
     size: "14",
     weight: "medium"
-  }, label), /* @__PURE__ */ React50.createElement(Box, {
+  }, label), /* @__PURE__ */ React51.createElement(Box, {
     background: hasBackground ? "actionButtonSecondaryBackground" : void 0,
     borderRadius: "menuButton",
     fontFamily: "body",
@@ -4855,27 +4903,27 @@ function FunInputDefault({
     borderColor: error ? "error" : focused && _focused ? "accentColor" : void 0,
     borderWidth: overrideBorderWidth ? overrideBorderWidth : error && focused ? "2" : error ? "1" : focused && _focused ? "1" : "0",
     borderStyle: "solid"
-  }, prefix ? /* @__PURE__ */ React50.createElement(Box, {
+  }, prefix ? /* @__PURE__ */ React51.createElement(Box, {
     paddingLeft: "10",
     height: "max"
-  }, prefix) : null, prefixIcon && (prefixIcon === "SearchIcon" ? /* @__PURE__ */ React50.createElement(Box, {
+  }, prefix) : null, prefixIcon && (prefixIcon === "SearchIcon" ? /* @__PURE__ */ React51.createElement(Box, {
     paddingLeft: "10",
     height: "max",
     alignItems: "center"
-  }, /* @__PURE__ */ React50.createElement(SearchIcon, {
+  }, /* @__PURE__ */ React51.createElement(SearchIcon, {
     selected: focused
-  })) : prefixIcon === "$" ? /* @__PURE__ */ React50.createElement(Box, {
+  })) : prefixIcon === "$" ? /* @__PURE__ */ React51.createElement(Box, {
     display: "flex",
     alignItems: "center",
     paddingLeft: "32"
-  }, /* @__PURE__ */ React50.createElement(Text, {
+  }, /* @__PURE__ */ React51.createElement(Text, {
     color: "modalText",
     style: {
       paddingBottom: 2,
       fontSize: inputStyle.fontSize || InputTextSize,
       fontWeight: 800
     }
-  }, "$")) : void 0), /* @__PURE__ */ React50.createElement("input", {
+  }, "$")) : void 0), /* @__PURE__ */ React51.createElement("input", {
     type: (inputProps == null ? void 0 : inputProps.type) || "text",
     value,
     placeholder,
@@ -4905,7 +4953,7 @@ function FunInputDefault({
       fontWeight: value ? "590" : "500",
       ...inputStyle
     }
-  })), error && typeof error === "string" && /* @__PURE__ */ React50.createElement(Text, {
+  })), error && typeof error === "string" && /* @__PURE__ */ React51.createElement(Text, {
     color: "error",
     size: "14",
     weight: "medium"
@@ -4933,19 +4981,19 @@ var FunInputWithRef = forwardRef2(
     focused: _focused,
     overrideBorderWidth
   }, ref) {
-    const [focused, setFocused] = React50.useState(false);
+    const [focused, setFocused] = React51.useState(false);
     const onFocus = () => setFocused(true);
     const onBlur = () => setFocused(false);
-    return /* @__PURE__ */ React50.createElement(Box, {
+    return /* @__PURE__ */ React51.createElement(Box, {
       color: "modalText",
       display: "flex",
       flexDirection: "column",
       gap: "8"
-    }, label && /* @__PURE__ */ React50.createElement(Text, {
+    }, label && /* @__PURE__ */ React51.createElement(Text, {
       color: textColor,
       size: "14",
       weight: "medium"
-    }, label), /* @__PURE__ */ React50.createElement(Box, {
+    }, label), /* @__PURE__ */ React51.createElement(Box, {
       background: hasBackground ? "actionButtonSecondaryBackground" : void 0,
       borderRadius: "menuButton",
       fontFamily: "body",
@@ -4955,27 +5003,27 @@ var FunInputWithRef = forwardRef2(
       borderColor: error ? "error" : focused && _focused ? "accentColor" : void 0,
       borderWidth: overrideBorderWidth ? overrideBorderWidth : error && focused ? "2" : error ? "1" : focused && _focused ? "1" : "0",
       borderStyle: "solid"
-    }, prefix ? /* @__PURE__ */ React50.createElement(Box, {
+    }, prefix ? /* @__PURE__ */ React51.createElement(Box, {
       paddingLeft: "10",
       height: "max"
-    }, prefix) : null, prefixIcon && (prefixIcon === "SearchIcon" ? /* @__PURE__ */ React50.createElement(Box, {
+    }, prefix) : null, prefixIcon && (prefixIcon === "SearchIcon" ? /* @__PURE__ */ React51.createElement(Box, {
       paddingLeft: "10",
       height: "max",
       alignItems: "center"
-    }, /* @__PURE__ */ React50.createElement(SearchIcon, {
+    }, /* @__PURE__ */ React51.createElement(SearchIcon, {
       selected: focused
-    })) : prefixIcon === "$" ? /* @__PURE__ */ React50.createElement(Box, {
+    })) : prefixIcon === "$" ? /* @__PURE__ */ React51.createElement(Box, {
       display: "flex",
       alignItems: "center",
       paddingLeft: "32"
-    }, /* @__PURE__ */ React50.createElement(Text, {
+    }, /* @__PURE__ */ React51.createElement(Text, {
       color: "modalText",
       style: {
         paddingBottom: 2,
         fontSize: inputStyle.fontSize || InputTextSize,
         fontWeight: 800
       }
-    }, "$")) : void 0), /* @__PURE__ */ React50.createElement("input", {
+    }, "$")) : void 0), /* @__PURE__ */ React51.createElement("input", {
       ref,
       type: (inputProps == null ? void 0 : inputProps.type) || "text",
       value,
@@ -5005,7 +5053,7 @@ var FunInputWithRef = forwardRef2(
         fontWeight: value ? "590" : "510",
         ...inputStyle
       }
-    })), error && typeof error === "string" && /* @__PURE__ */ React50.createElement(Text, {
+    })), error && typeof error === "string" && /* @__PURE__ */ React51.createElement(Text, {
       color: "error",
       size: "14",
       weight: "medium"
@@ -5013,9 +5061,9 @@ var FunInputWithRef = forwardRef2(
   }
 );
 function FunInput(props) {
-  return props.ref ? /* @__PURE__ */ React50.createElement(FunInputWithRef, {
+  return props.ref ? /* @__PURE__ */ React51.createElement(FunInputWithRef, {
     ...props
-  }) : /* @__PURE__ */ React50.createElement(FunInputDefault, {
+  }) : /* @__PURE__ */ React51.createElement(FunInputDefault, {
     ...props
   });
 }
@@ -5026,12 +5074,12 @@ var FunTwoFaInput = ({
   onChange,
   onCompleted,
   hasError,
-  errorMessage
+  errorMessage,
+  inputLength = 6
 }) => {
-  const inputLength = 6;
   const inputRefs = useRef6([]);
   inputRefs.current = Array(inputLength).fill(null);
-  const [focusIndex, setFocusIndex] = React51.useState(0);
+  const [focusIndex, setFocusIndex] = React52.useState(0);
   const handleBackspace = useCallback10(
     (index) => {
       const newValue = value.slice(0, index) + value.slice(index + 1);
@@ -5069,7 +5117,7 @@ var FunTwoFaInput = ({
         onCompleted(newValue);
       }
     },
-    [hasError, onChange, onCompleted, value]
+    [hasError, inputLength, onChange, onCompleted, value]
   );
   const handleKeyDown = (e) => {
     if (e.key === "Backspace" || e.key === "Delete") {
@@ -5090,21 +5138,21 @@ var FunTwoFaInput = ({
     var _a;
     (_a = inputRefs.current[0]) == null ? void 0 : _a.focus();
   }, []);
-  return /* @__PURE__ */ React51.createElement(Fragment, null, /* @__PURE__ */ React51.createElement(Box, null, /* @__PURE__ */ React51.createElement(Box, {
+  return /* @__PURE__ */ React52.createElement(Fragment, null, /* @__PURE__ */ React52.createElement(Box, null, /* @__PURE__ */ React52.createElement(Box, {
     marginBottom: "10"
-  }, /* @__PURE__ */ React51.createElement(Text, {
+  }, /* @__PURE__ */ React52.createElement(Text, {
     size: "14",
     color: "modalText"
-  }, "Code")), /* @__PURE__ */ React51.createElement(Box, {
+  }, "Code")), /* @__PURE__ */ React52.createElement(Box, {
     display: "flex",
     wrap: "nowrap",
     width: "full",
     gap: "8"
   }, Array.from({ length: inputLength }).map((_, i) => {
-    return /* @__PURE__ */ React51.createElement(Box, {
+    return /* @__PURE__ */ React52.createElement(Box, {
       key: i,
       style: { display: "flex", flex: 1 }
-    }, /* @__PURE__ */ React51.createElement(FunInputWithRef, {
+    }, /* @__PURE__ */ React52.createElement(FunInputWithRef, {
       ref: (el) => inputRefs.current[i] = el,
       inputStyle: {
         textAlign: "center"
@@ -5128,10 +5176,10 @@ var FunTwoFaInput = ({
       error: hasError,
       focused: i === focusIndex
     }));
-  })), /* @__PURE__ */ React51.createElement(Box, {
+  })), /* @__PURE__ */ React52.createElement(Box, {
     marginTop: "6",
     height: "20"
-  }, hasError && /* @__PURE__ */ React51.createElement(Text, {
+  }, hasError && /* @__PURE__ */ React52.createElement(Text, {
     size: "14",
     color: "error",
     weight: "medium"
@@ -5148,6 +5196,7 @@ function FunMeshVerificationStep({
   accessToken
 }) {
   const [twoFactorCode, setTwoFactorCode] = useState14("");
+  const [isSixDigits, setIsSixDigits] = useState14(true);
   const funkitConfig = useFunkitConfig();
   const [screen, setScreen] = useState14(
     0 /* INITIAL */
@@ -5273,7 +5322,7 @@ function FunMeshVerificationStep({
         return "An error occurred during checkout but your brokerage funds are unaffected. To retry, please go back and re-confirm a new checkout. If the error still persists, please reach out to support for help.";
     }
   }, [exchange, executionStatus]);
-  return /* @__PURE__ */ React52.createElement(Box, null, screen === 0 /* INITIAL */ ? /* @__PURE__ */ React52.createElement(Box, {
+  return /* @__PURE__ */ React53.createElement(Box, null, screen === 0 /* INITIAL */ ? /* @__PURE__ */ React53.createElement(Box, {
     width: "full",
     height: "200",
     display: "flex",
@@ -5282,22 +5331,22 @@ function FunMeshVerificationStep({
     justifyContent: "center",
     color: "modalText",
     gap: "10"
-  }, /* @__PURE__ */ React52.createElement(Text, {
+  }, /* @__PURE__ */ React53.createElement(Text, {
     size: "14",
     color: "modalTextSecondary"
-  }, "Executing brokerage transfer"), /* @__PURE__ */ React52.createElement(SpinnerIcon, null)) : /* @__PURE__ */ React52.createElement(Box, null, /* @__PURE__ */ React52.createElement(Box, {
+  }, "Executing brokerage transfer"), /* @__PURE__ */ React53.createElement(SpinnerIcon, null)) : /* @__PURE__ */ React53.createElement(Box, null, /* @__PURE__ */ React53.createElement(Box, {
     marginBottom: "10"
-  }, /* @__PURE__ */ React52.createElement(Text, {
+  }, /* @__PURE__ */ React53.createElement(Text, {
     size: "16",
     color: "modalText",
     weight: "heavy"
-  }, verificationTitle)), /* @__PURE__ */ React52.createElement(Text, {
+  }, verificationTitle)), /* @__PURE__ */ React53.createElement(Text, {
     size: "14",
     color: "modalText",
     font: "body"
-  }, verificationDescription)), screen === 1 /* TWO_FACTOR */ ? /* @__PURE__ */ React52.createElement(Box, {
+  }, verificationDescription)), screen === 1 /* TWO_FACTOR */ ? /* @__PURE__ */ React53.createElement(Box, {
     paddingTop: "10"
-  }, /* @__PURE__ */ React52.createElement(FunTwoFaInput, {
+  }, /* @__PURE__ */ React53.createElement(FunTwoFaInput, {
     value: twoFactorCode,
     onChange: (value) => {
       setExecutionError("");
@@ -5305,28 +5354,43 @@ function FunMeshVerificationStep({
     },
     onCompleted: handleCompletion,
     hasError: !!executionError,
-    errorMessage: executionError
-  })) : screen === 2 /* CONFIRMATION */ ? /* @__PURE__ */ React52.createElement(React52.Fragment, null) : screen === 3 /* WHITELIST */ ? /* @__PURE__ */ React52.createElement(Box, {
+    errorMessage: executionError,
+    inputLength: isSixDigits ? 6 : 7
+  }), /* @__PURE__ */ React53.createElement(Box, {
+    display: "flex",
+    justifyContent: "center",
+    alignItems: "center",
+    paddingTop: "4"
+  }, /* @__PURE__ */ React53.createElement(FunLinkButton, {
+    onClick: () => {
+      setExecutionError("");
+      setTwoFactorCode("");
+      setIsSixDigits(!isSixDigits);
+    },
+    text: `Switch to ${isSixDigits ? 7 : 6} digits`,
+    color: "modalTextSecondary",
+    textProps: { weight: "semibold" }
+  }))) : screen === 2 /* CONFIRMATION */ ? /* @__PURE__ */ React53.createElement(React53.Fragment, null) : screen === 3 /* WHITELIST */ ? /* @__PURE__ */ React53.createElement(Box, {
     paddingTop: "10"
-  }, /* @__PURE__ */ React52.createElement(CopyAddress, {
+  }, /* @__PURE__ */ React53.createElement(CopyAddress, {
     type: "kv",
     address: transferToAddress,
     showAddress: true
-  })) : screen === 4 /* FAILED */ ? /* @__PURE__ */ React52.createElement(Box, {
+  })) : screen === 4 /* FAILED */ ? /* @__PURE__ */ React53.createElement(Box, {
     paddingTop: "10"
-  }, /* @__PURE__ */ React52.createElement(FunNotification, {
+  }, /* @__PURE__ */ React53.createElement(FunNotification, {
     type: "error",
     description: executionError
-  })) : null, isButtonVisible ? /* @__PURE__ */ React52.createElement(Box, {
+  })) : null, isButtonVisible ? /* @__PURE__ */ React53.createElement(Box, {
     width: "full",
     paddingTop: "24"
-  }, /* @__PURE__ */ React52.createElement(FunButton, {
+  }, /* @__PURE__ */ React53.createElement(FunButton, {
     isDisabled: isButtonDisabled,
-    titleSuffix: isExecuting ? /* @__PURE__ */ React52.createElement(Box, {
+    titleSuffix: isExecuting ? /* @__PURE__ */ React53.createElement(Box, {
       display: "flex",
       alignItems: "center",
       color: "modalText"
-    }, /* @__PURE__ */ React52.createElement(SpinnerIcon, {
+    }, /* @__PURE__ */ React53.createElement(SpinnerIcon, {
       height: 16,
       width: 16
     })) : null,
@@ -5340,30 +5404,6 @@ import React67, { useEffect as useEffect13, useMemo as useMemo15 } from "react";
 
 // src/components/FunButton/FunTermsAndConditionsTextButton.tsx
 import React54 from "react";
-
-// src/components/FunButton/FunLinkButton.tsx
-import React53 from "react";
-function FunLinkButton({
-  onClick,
-  text,
-  textProps,
-  hasPadding = true,
-  color = "modalText"
-}) {
-  return /* @__PURE__ */ React53.createElement(Box, {
-    as: "button",
-    onClick,
-    className: funLinkButtonStyle,
-    paddingLeft: hasPadding ? "4" : "0"
-  }, /* @__PURE__ */ React53.createElement(Text, {
-    color,
-    size: "12",
-    weight: "bold",
-    ...textProps
-  }, text));
-}
-
-// src/components/FunButton/FunTermsAndConditionsTextButton.tsx
 function FunTermsAndConditionsTextButton() {
   const { termsFontSize } = useFunkitConfig();
   return /* @__PURE__ */ React54.createElement(Box, {
@@ -6211,6 +6251,7 @@ function LineItem({ children, ...otherProps }) {
     width: "full",
     justifyContent: "space-between",
     paddingY: "8",
+    gap: "16",
     ...otherProps
   }, children);
 }
@@ -6347,7 +6388,8 @@ function FunTransactionSummary({
   }, hasPaymentToken ? /* @__PURE__ */ React65.createElement(Fragment2, null, /* @__PURE__ */ React65.createElement(LineItem, null, /* @__PURE__ */ React65.createElement(Text, {
     weight: "medium",
     color: "modalTextDim",
-    size: "14"
+    size: "14",
+    style: { whiteSpace: "nowrap" }
   }, "Payment token"), isLoading ? /* @__PURE__ */ React65.createElement(Box, {
     color: "modalTextSecondary"
   }, /* @__PURE__ */ React65.createElement(SpinnerIcon, {
@@ -6369,7 +6411,8 @@ function FunTransactionSummary({
   }), /* @__PURE__ */ React65.createElement(Text, {
     weight: "medium",
     color: "modalText",
-    size: "14"
+    size: "14",
+    style: { textAlign: "end" }
   }, paymentTokenString))), /* @__PURE__ */ React65.createElement(FunTxSummaryDivider, null)) : null, /* @__PURE__ */ React65.createElement(FeesLineItem, {
     feesItem: estFees,
     isLoading
@@ -9912,7 +9955,8 @@ var FunWeb2ConnectingStep = (props) => {
     onChange: props.setOtpInput,
     onCompleted: (input) => handleOtpComplete(input),
     hasError: !!loginErrorMessage,
-    errorMessage: loginErrorMessage
+    errorMessage: loginErrorMessage,
+    inputLength: 6
   }), /* @__PURE__ */ React108.createElement(Box, {
     display: "flex",
     flexDirection: "column",
@@ -12997,9 +13041,15 @@ function FunCheckoutModal({
   const { isCheckoutCrFlow } = useCheckoutType(checkoutItem);
   const redirectToCheckoutHistory = useCallback24(
     (depositAddress) => {
-      var _a2, _b2;
+      var _a2, _b2, _c2, _d2;
       if (depositAddress) {
-        (_b2 = (_a2 = checkoutItem == null ? void 0 : checkoutItem.initSettings) == null ? void 0 : _a2.onSuccess) == null ? void 0 : _b2.call(_a2, {
+        logger.log("checkoutFundingCompleted", {
+          depositAddress,
+          paymentMethod: (_a2 = checkoutItem == null ? void 0 : checkoutItem.selectedPaymentMethodInfo) == null ? void 0 : _a2.paymentMethod,
+          totalCheckoutUsd: (_b2 = checkoutItem == null ? void 0 : checkoutItem.latestQuote) == null ? void 0 : _b2.finalTotalUsd,
+          checkoutItem
+        });
+        (_d2 = (_c2 = checkoutItem == null ? void 0 : checkoutItem.initSettings) == null ? void 0 : _c2.onSuccess) == null ? void 0 : _d2.call(_c2, {
           type: "success",
           message: "Checkout funding step completed successfully.",
           metadata: {}
@@ -13010,7 +13060,7 @@ function FunCheckoutModal({
         logger.warn("No depositAddress generated");
       }
     },
-    [checkoutItem == null ? void 0 : checkoutItem.initSettings, onCloseWrapper, openFunCheckoutHistoryModal]
+    [checkoutItem, onCloseWrapper, openFunCheckoutHistoryModal]
   );
   const [isSourceAssetConfirming, setIsSourceAssetConfirming] = useState36(false);
   const onSourceAssetConfirmed = useCallback24(async () => {
@@ -13731,7 +13781,7 @@ ${descriptionInput}
     gap: "10",
     width: "full"
   }, /* @__PURE__ */ React139.createElement(FunInput, {
-    label: "Refund Address (if any)",
+    label: "Refund Address",
     inputStyle: { fontSize: 14, fontFamily: "inherit" },
     placeholder: "",
     value: refundAddressInput,
@@ -13740,7 +13790,7 @@ ${descriptionInput}
       return setRefundAddressInput((_a = e == null ? void 0 : e.target) == null ? void 0 : _a.value);
     }
   }), /* @__PURE__ */ React139.createElement(FunInput, {
-    label: "Refund Chain (if any)",
+    label: "Refund Chain",
     inputStyle: { fontSize: 14, fontFamily: "inherit" },
     placeholder: "",
     value: refundChainInput,
@@ -16042,7 +16092,7 @@ function setFunkitConnectVersion({ version }) {
   localStorage.setItem(storageKey4, version);
 }
 function getCurrentSdkVersion() {
-  return "1.0.16";
+  return "1.0.18";
 }
 function useFingerprint() {
   const fingerprint = useCallback29(() => {

package/dist/utils/payment.d.ts

@@ -0,0 +1,10 @@
+import { PaymentMethodInfo } from '../consts/payment';
+/**
+ * Generate a string for backend to indicate the source of a checkout funds
+ */
+export declare function generateSourceOfFundString({ paymentMethodInfo, isWeb2Login, isWeb3Login, walletAddress, }: {
+    paymentMethodInfo: PaymentMethodInfo;
+    isWeb2Login: boolean;
+    isWeb3Login: boolean;
+    walletAddress: string | undefined;
+}): string;

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

@@ -1,9 +1,9 @@
 "use client";
 import {
   bifrostWallet
-} from "../chunk-KGTZ6E7L.js";
-import "../chunk-ZOLACFTK.js";
+} from "../chunk-SL4VH23R.js";
 import "../chunk-QII6PY2D.js";
+import "../chunk-ZOLACFTK.js";
 import "../chunk-ZDU3JFGR.js";
 export {
   bifrostWallet

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

@@ -1,9 +1,9 @@
 "use client";
 import {
   bitgetWallet
-} from "../chunk-2B3SPBRY.js";
-import "../chunk-ZOLACFTK.js";
+} from "../chunk-75A2U7T7.js";
 import "../chunk-QII6PY2D.js";
+import "../chunk-ZOLACFTK.js";
 import "../chunk-ZDU3JFGR.js";
 export {
   bitgetWallet