@funkit/connect 1.0.2 → 1.0.4

package/CHANGELOG.md

@@ -1,5 +1,21 @@
 # @funkit/connect
 
+## 1.0.4
+
+### Patch Changes
+
+- c1a7e76: fix: brokerage additional verifications
+
+## 1.0.3
+
+### Patch Changes
+
+- fc3ab0d: feat: allow customization of all theme colors
+- 48caeec: refactor: optional checkout config
+- Updated dependencies [6c91a63]
+  - @funkit/core@1.0.1
+  - @funkit/wagmi-tools@1.0.2
+
 ## 1.0.2
 
 ### Patch Changes

package/dist/{chunk-C2QHNJBG.js → chunk-MQTK22MG.js}

@@ -17,6 +17,7 @@ var defaultAccentColor = accentColors.white;
 var lightTheme = ({
   accentColor = defaultAccentColor.accentColor,
   accentColorForeground = defaultAccentColor.accentColorForeground,
+  customColors,
   ...baseThemeOptions
 } = {}) => ({
   ...baseTheme(baseThemeOptions),
@@ -76,7 +77,8 @@ var lightTheme = ({
     buttonTextPrimary: "#FFFFFF",
     buttonTextSecondary: "#000000",
     buttonTextDisabled: "#FFF",
-    transparent: "transparent"
+    transparent: "transparent",
+    ...customColors || {}
   },
   shadows: {
     connectButton: "0px 4px 12px rgba(0, 0, 0, 0.1)",

package/dist/{chunk-U4FFX2HZ.js → chunk-SWTU7PBZ.js}

@@ -17,6 +17,7 @@ var defaultAccentColor = accentColors.white;
 var darkTheme = ({
   accentColor = defaultAccentColor.accentColor,
   accentColorForeground = defaultAccentColor.accentColorForeground,
+  customColors,
   ...baseThemeOptions
 } = {}) => ({
   ...baseTheme(baseThemeOptions),
@@ -76,7 +77,8 @@ var darkTheme = ({
     buttonTextDisabled: "#000000",
     buttonWarning: "#C60000",
     buttonTextWarning: "#FFF",
-    transparent: "transparent"
+    transparent: "transparent",
+    ...customColors || {}
   },
   shadows: {
     connectButton: "0px 4px 12px rgba(0, 0, 0, 0.1)",

package/dist/components/FunkitProvider/FunkitCheckoutContext.d.ts

@@ -66,8 +66,8 @@ export type FunkitCheckoutResult = {
     metadata: object | Error;
 };
 interface useFunkitCheckoutProps {
-    /** @required the checkout config object **/
-    config: FunkitCheckoutConfig;
+    /** @optional the checkout config object **/
+    config?: FunkitCheckoutConfig;
     /** @optional fires when the checkout modal is opened **/
     onOpen?: () => void;
     /** @optional fires when the checkout modal is closed **/
@@ -83,6 +83,9 @@ interface useFunkitCheckoutProps {
     /** @optional fires if the checkout fails at any point **/
     onSuccess?: (result: FunkitCheckoutResult) => void;
 }
+type useFunkitCheckoutPropsFinal = Omit<useFunkitCheckoutProps, 'config'> & {
+    config: FunkitCheckoutConfig;
+};
 /**
  * Checkout Item for frontend use
  */
@@ -103,8 +106,8 @@ export interface FunkitActiveCheckoutItem {
     quoteErrorMessage: string;
     /** The deposit address provided by server after the checkout is confirmed. If `null`, it is not confirmed yet. **/
     depositAddress: null | Address;
-    /** Settings the checkout was init-ed with **/
-    initSettings: useFunkitCheckoutProps;
+    /** Final settings the checkout was init-ed with **/
+    initSettings: useFunkitCheckoutPropsFinal;
     /** User's selected payment method information */
     selectedPaymentMethodInfo: PaymentMethodInfo | null;
     /** User's choice of source asset to fund the checkout operation **/
@@ -155,6 +158,6 @@ export declare const useFunkitAllPostCheckoutsInternal: () => {
  * External hook for user to kickstart a checkout in their app
  */
 export declare const useFunkitCheckout: (props: useFunkitCheckoutProps) => {
-    beginCheckout: (inputConfig?: useFunkitCheckoutProps['config']) => Promise<void>;
+    beginCheckout: (inputConfig?: FunkitCheckoutConfig) => Promise<void>;
 };
 export {};

package/dist/components/FunkitProvider/FunkitThemeProvider.d.ts

@@ -29,10 +29,10 @@ export declare const defaultTheme: {
         profileActionHover: string;
         profileForeground: string;
         selectedOptionBorder: string;
+        standby: string;
         solidLine: string;
-        rightTranslucentLine: string;
         leftTranslucentLine: string;
-        standby: string;
+        rightTranslucentLine: string;
         loadingBase: string;
         loadingAccent: string;
         modalBackdrop: string;
@@ -52,11 +52,11 @@ export declare const defaultTheme: {
         buttonPrimary: string;
         buttonProcessing: string;
         buttonDisabled: string;
+        buttonWarning: string;
+        buttonTextWarning: string;
         buttonTextPrimary: string;
         buttonTextSecondary: string;
         buttonTextDisabled: string;
-        buttonWarning: string;
-        buttonTextWarning: string;
         transparent: string;
     };
     shadows: {

package/dist/index.js

@@ -4,10 +4,10 @@ import {
 } from "./chunk-SW6GAS7K.js";
 import {
   lightTheme
-} from "./chunk-C2QHNJBG.js";
+} from "./chunk-MQTK22MG.js";
 import {
   darkTheme
-} from "./chunk-U4FFX2HZ.js";
+} from "./chunk-SWTU7PBZ.js";
 import "./chunk-VP4CAK4A.js";
 
 // src/components/ConnectButton/ConnectButton.tsx
@@ -1791,6 +1791,12 @@ function validateCheckoutConfig(config) {
       message: "Invalid targetAssetAmount configuration: Has to be a number greater than 0"
     };
   }
+  if (!config.actionsParams) {
+    return {
+      isValid: false,
+      message: "Invalid actionsParams configuration: Has to be an array. If no actions are required, please specify an empty array ([]) instead."
+    };
+  }
   if (!FUNKIT_CONNECT_SUPPORTED_CHAINS_INFO[config.targetChain]) {
     return {
       isValid: false,
@@ -2658,7 +2664,8 @@ var useFunkitAllPostCheckoutsInternal = () => {
   };
 };
 var useFunkitCheckout = (props) => {
-  const { config, onValidation, onError } = props;
+  const { onValidation, onError } = props;
+  const propsConfig = useMemo6(() => (props == null ? void 0 : props.config) || {}, [props == null ? void 0 : props.config]);
   const actualWagmiConfig = useConfig2();
   const { _initNewCheckout } = useContext9(FunkitCheckoutContext);
   const { openFunCheckoutModal } = useFunCheckoutModal();
@@ -2681,25 +2688,30 @@ var useFunkitCheckout = (props) => {
     [openFunCheckoutModal, props]
   );
   const beginCheckout = useCallback5(
-    async (inputConfig = config) => {
-      const validationResult = validateCheckoutConfig(inputConfig);
+    async (inputConfig) => {
+      const combinedConfig = {
+        ...propsConfig || {},
+        ...inputConfig || {}
+      };
+      const validationResult = validateCheckoutConfig(combinedConfig);
       onValidation == null ? void 0 : onValidation(validationResult);
       if (validationResult.isValid) {
-        let newId = _initNewCheckout == null ? void 0 : _initNewCheckout({ ...props, config: inputConfig }, false);
-        if (isUserLoggedIn || !!inputConfig.customRecipient) {
+        const finalConfig = combinedConfig;
+        let newId = _initNewCheckout == null ? void 0 : _initNewCheckout({ ...props, config: finalConfig }, false);
+        if (isUserLoggedIn || !!finalConfig.customRecipient) {
           if (isUserLoggedIn) {
             const { result, tokenTicker } = await testAutoExecutionDuringCheckout(
-              inputConfig,
+              finalConfig,
               walletAddress,
               actualWagmiConfig
             );
             if (result) {
               newId = _initNewCheckout == null ? void 0 : _initNewCheckout(
-                { ...props, config: inputConfig },
+                { ...props, config: finalConfig },
                 true,
                 tokenTicker
               );
-            } else if (!FUNKIT_CONNECT_SUPPORTED_CHAINS_INFO3[inputConfig.targetChain].isFiatCheckoutSupported) {
+            } else if (!FUNKIT_CONNECT_SUPPORTED_CHAINS_INFO3[finalConfig.targetChain].isFiatCheckoutSupported) {
               onErrorWrapper == null ? void 0 : onErrorWrapper({
                 type: "error",
                 message: "Unable to begin a new checkout: Insufficient funds on testnet account",
@@ -2711,7 +2723,7 @@ var useFunkitCheckout = (props) => {
           onOpenWrapper == null ? void 0 : onOpenWrapper(newId);
         } else {
           openConnectModal == null ? void 0 : openConnectModal();
-          setWaitingLogin(inputConfig);
+          setWaitingLogin(finalConfig);
         }
       } else {
         onErrorWrapper == null ? void 0 : onErrorWrapper({
@@ -2722,7 +2734,7 @@ var useFunkitCheckout = (props) => {
       }
     },
     [
-      config,
+      propsConfig,
       onValidation,
       _initNewCheckout,
       props,
@@ -5646,6 +5658,7 @@ function FunMeshVerificationStep({
           setExecutionError("Invalid payment method configuration.");
           return;
         }
+        logger.log("inputs", { finalOtpInput });
         const res = await executeBrokerageDeposit(
           accessToken,
           exchange,
@@ -5782,7 +5795,7 @@ function FunMeshVerificationStep({
       height: 16,
       width: 16
     })) : null,
-    onClick: handleCompletion,
+    onClick: async () => await handleCompletion(),
     title: "Continue"
   })) : null);
 }
@@ -12438,7 +12451,7 @@ function FunCheckoutHistoryDetail({
     step: isCheckoutSpecialCrFlow ? 2 : isTerminal ? 3 : 2,
     totalSteps: timelineLabels.length,
     labels: timelineLabels
-  }), isCheckoutSpecialCrFlow || isTerminal ? null : /* @__PURE__ */ React132.createElement(Box, {
+  }), isTerminal ? null : /* @__PURE__ */ React132.createElement(Box, {
     display: "flex",
     flexDirection: "column",
     alignItems: "center",
@@ -12446,7 +12459,7 @@ function FunCheckoutHistoryDetail({
   }, /* @__PURE__ */ React132.createElement(Text, {
     size: "12",
     color: "modalTextDim"
-  }, "You will receive a notification when your order has finished."))), isFailedFinal ? /* @__PURE__ */ React132.createElement(FunToast, {
+  }, isCheckoutSpecialCrFlow ? "Funds may take up to 10 minutes to arrive." : "You will receive a notification when your order has finished."))), isFailedFinal ? /* @__PURE__ */ React132.createElement(FunToast, {
     type: 1 /* ERROR */,
     title: "Order Failed",
     isDescriptionText: false,
@@ -14731,7 +14744,7 @@ function setFunkitConnectVersion({ version }) {
   localStorage.setItem(storageKey4, version);
 }
 function getCurrentSdkVersion() {
-  return "1.0.2";
+  return "1.0.4";
 }
 function useFingerprint() {
   const fingerprint = useCallback26(() => {

package/dist/themes/baseTheme.d.ts

@@ -21,5 +21,6 @@ export type AccentColorPreset = 'blue' | 'green' | 'red' | 'purple' | 'pink' | '
 export interface ThemeOptions extends BaseThemeOptions {
     accentColor?: string;
     accentColorForeground?: string;
+    customColors?: Partial<ThemeVars['colors']>;
 }
 export {};

package/dist/themes/darkTheme.d.ts

@@ -1,6 +1,6 @@
 import { AccentColor, AccentColorPreset, ThemeOptions } from './baseTheme';
 export declare const darkTheme: {
-    ({ accentColor, accentColorForeground, ...baseThemeOptions }?: ThemeOptions): {
+    ({ accentColor, accentColorForeground, customColors, ...baseThemeOptions }?: ThemeOptions): {
         colors: {
             accentColor: string;
             accentColorForeground: string;
@@ -29,10 +29,10 @@ export declare const darkTheme: {
             profileActionHover: string;
             profileForeground: string;
             selectedOptionBorder: string;
+            standby: string;
             solidLine: string;
-            rightTranslucentLine: string;
             leftTranslucentLine: string;
-            standby: string;
+            rightTranslucentLine: string;
             loadingBase: string;
             loadingAccent: string;
             modalBackdrop: string;
@@ -52,11 +52,11 @@ export declare const darkTheme: {
             buttonPrimary: string;
             buttonProcessing: string;
             buttonDisabled: string;
+            buttonWarning: string;
+            buttonTextWarning: string;
             buttonTextPrimary: string;
             buttonTextSecondary: string;
             buttonTextDisabled: string;
-            buttonWarning: string;
-            buttonTextWarning: string;
             transparent: string;
         };
         shadows: {

package/dist/themes/darkTheme.js

@@ -1,7 +1,7 @@
 "use client";
 import {
   darkTheme
-} from "../chunk-U4FFX2HZ.js";
+} from "../chunk-SWTU7PBZ.js";
 import "../chunk-VP4CAK4A.js";
 export {
   darkTheme

package/dist/themes/lightTheme.d.ts

@@ -1,6 +1,6 @@
 import { AccentColor, AccentColorPreset, ThemeOptions } from './baseTheme';
 export declare const lightTheme: {
-    ({ accentColor, accentColorForeground, ...baseThemeOptions }?: ThemeOptions): {
+    ({ accentColor, accentColorForeground, customColors, ...baseThemeOptions }?: ThemeOptions): {
         colors: {
             accentColor: string;
             accentColorForeground: string;
@@ -29,10 +29,10 @@ export declare const lightTheme: {
             profileActionHover: string;
             profileForeground: string;
             selectedOptionBorder: string;
+            standby: string;
             solidLine: string;
-            rightTranslucentLine: string;
             leftTranslucentLine: string;
-            standby: string;
+            rightTranslucentLine: string;
             loadingBase: string;
             loadingAccent: string;
             modalBackdrop: string;

package/dist/themes/lightTheme.js

@@ -1,7 +1,7 @@
 "use client";
 import {
   lightTheme
-} from "../chunk-C2QHNJBG.js";
+} from "../chunk-MQTK22MG.js";
 import "../chunk-VP4CAK4A.js";
 export {
   lightTheme

package/dist/utils/checkout.d.ts

@@ -13,7 +13,7 @@ export declare const DUMMY_TRANSFER_PARAMS: {
  * @param config - The checkout configuration to validate.
  * @returns An object indicating whether the configuration is valid and a message if it is not.
  */
-export declare function validateCheckoutConfig(config: FunkitCheckoutConfig): {
+export declare function validateCheckoutConfig(config: Partial<FunkitCheckoutConfig>): {
     isValid: boolean;
     message: string;
 };

package/dist/wallets/walletConnectors/argentWallet/argentWallet.js

@@ -1,9 +1,9 @@
 "use client";
 import {
   argentWallet
-} from "../chunk-NZ5G23JP.js";
-import "../chunk-ZOLACFTK.js";
+} from "../chunk-CVGDYGHA.js";
 import "../chunk-ZDU3JFGR.js";
+import "../chunk-ZOLACFTK.js";
 export {
   argentWallet
 };

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

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

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

@@ -1,9 +1,9 @@
 "use client";
 import {
   bitgetWallet
-} from "../chunk-ZNXQ4V6G.js";
-import "../chunk-ZOLACFTK.js";
+} from "../chunk-RYO26XSK.js";
 import "../chunk-ZDU3JFGR.js";
+import "../chunk-ZOLACFTK.js";
 import "../chunk-QII6PY2D.js";
 export {
   bitgetWallet

package/dist/wallets/walletConnectors/bloomWallet/bloomWallet.js

@@ -1,9 +1,9 @@
 "use client";
 import {
   bloomWallet
-} from "../chunk-NTGZF5BY.js";
-import "../chunk-ZOLACFTK.js";
+} from "../chunk-OYW4TIA3.js";
 import "../chunk-ZDU3JFGR.js";
+import "../chunk-ZOLACFTK.js";
 export {
   bloomWallet
 };

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

@@ -0,0 +1,102 @@
+"use client";
+import {
+  getInjectedConnector,
+  hasInjectedProvider
+} from "./chunk-QII6PY2D.js";
+import {
+  getWalletConnectConnector
+} from "./chunk-ZDU3JFGR.js";
+
+// src/wallets/walletConnectors/subWallet/subWallet.ts
+var subWallet = ({
+  projectId,
+  walletConnectParameters
+}) => {
+  const isSubWalletInjected = hasInjectedProvider({ namespace: "SubWallet" });
+  const shouldUseWalletConnect = !isSubWalletInjected;
+  const getUriMobile = (uri) => {
+    return `subwallet://wc?uri=${encodeURIComponent(uri)}`;
+  };
+  const getUriQR = (uri) => {
+    return uri;
+  };
+  const mobileConnector = {
+    getUri: shouldUseWalletConnect ? getUriMobile : void 0
+  };
+  let qrConnector = void 0;
+  if (shouldUseWalletConnect) {
+    qrConnector = {
+      getUri: getUriQR,
+      instructions: {
+        learnMoreUrl: "https://www.subwallet.app/",
+        steps: [
+          {
+            description: "wallet_connectors.subwallet.qr_code.step1.description",
+            step: "install",
+            title: "wallet_connectors.subwallet.qr_code.step1.title"
+          },
+          {
+            description: "wallet_connectors.subwallet.qr_code.step2.description",
+            step: "create",
+            title: "wallet_connectors.subwallet.qr_code.step2.title"
+          },
+          {
+            description: "wallet_connectors.subwallet.qr_code.step3.description",
+            step: "scan",
+            title: "wallet_connectors.subwallet.qr_code.step3.title"
+          }
+        ]
+      }
+    };
+  }
+  const extensionConnector = {
+    instructions: {
+      learnMoreUrl: "https://www.subwallet.app/",
+      steps: [
+        {
+          description: "wallet_connectors.subwallet.extension.step1.description",
+          step: "install",
+          title: "wallet_connectors.subwallet.extension.step1.title"
+        },
+        {
+          description: "wallet_connectors.subwallet.extension.step2.description",
+          step: "create",
+          title: "wallet_connectors.subwallet.extension.step2.title"
+        },
+        {
+          description: "wallet_connectors.subwallet.extension.step3.description",
+          step: "refresh",
+          title: "wallet_connectors.subwallet.extension.step3.title"
+        }
+      ]
+    }
+  };
+  return {
+    id: "subwallet",
+    name: "SubWallet",
+    iconUrl: async () => (await import("./subWallet-ELA2UJOS.js")).default,
+    iconBackground: "#fff",
+    installed: isSubWalletInjected || void 0,
+    downloadUrls: {
+      browserExtension: "https://www.subwallet.app/download",
+      chrome: "https://chrome.google.com/webstore/detail/subwallet-polkadot-wallet/onhogfjeacnfoofkfgppdlbmlmnplgbn",
+      firefox: "https://addons.mozilla.org/en-US/firefox/addon/subwallet/",
+      edge: "https://chrome.google.com/webstore/detail/subwallet-polkadot-wallet/onhogfjeacnfoofkfgppdlbmlmnplgbn",
+      mobile: "https://www.subwallet.app/download",
+      android: "https://play.google.com/store/apps/details?id=app.subwallet.mobile",
+      ios: "https://apps.apple.com/us/app/subwallet-polkadot-wallet/id1633050285",
+      qrCode: "https://www.subwallet.app/download"
+    },
+    mobile: mobileConnector,
+    qrCode: qrConnector,
+    extension: extensionConnector,
+    createConnector: shouldUseWalletConnect ? getWalletConnectConnector({
+      projectId,
+      walletConnectParameters
+    }) : getInjectedConnector({ namespace: "SubWallet" })
+  };
+};
+
+export {
+  subWallet
+};

package/dist/wallets/walletConnectors/chunk-AJKRYTH2.js

@@ -0,0 +1,92 @@
+"use client";
+import {
+  getWalletConnectConnector
+} from "./chunk-ZDU3JFGR.js";
+import {
+  isAndroid
+} from "./chunk-ZOLACFTK.js";
+
+// src/wallets/walletConnectors/ledgerWallet/ledgerWallet.ts
+var ledgerWallet = ({
+  projectId,
+  walletConnectParameters
+}) => ({
+  id: "ledger",
+  iconBackground: "#000",
+  iconAccent: "#000",
+  name: "Ledger",
+  iconUrl: async () => (await import("./ledgerWallet-DIS4VM6H.js")).default,
+  downloadUrls: {
+    android: "https://play.google.com/store/apps/details?id=com.ledger.live",
+    ios: "https://apps.apple.com/us/app/ledger-live-web3-wallet/id1361671700",
+    mobile: "https://www.ledger.com/ledger-live",
+    qrCode: "https://r354.adj.st/?adj_t=t2esmlk",
+    windows: "https://www.ledger.com/ledger-live/download",
+    macos: "https://www.ledger.com/ledger-live/download",
+    linux: "https://www.ledger.com/ledger-live/download",
+    desktop: "https://www.ledger.com/ledger-live"
+  },
+  mobile: {
+    getUri: (uri) => {
+      return isAndroid() ? uri : `ledgerlive://wc?uri=${encodeURIComponent(uri)}`;
+    }
+  },
+  desktop: {
+    getUri: (uri) => {
+      return `ledgerlive://wc?uri=${encodeURIComponent(uri)}`;
+    },
+    instructions: {
+      learnMoreUrl: "https://support.ledger.com/hc/en-us/articles/4404389503889-Getting-started-with-Ledger-Live",
+      steps: [
+        {
+          description: "wallet_connectors.ledger.desktop.step1.description",
+          step: "install",
+          title: "wallet_connectors.ledger.desktop.step1.title"
+        },
+        {
+          description: "wallet_connectors.ledger.desktop.step2.description",
+          step: "create",
+          title: "wallet_connectors.ledger.desktop.step2.title"
+        },
+        {
+          description: "wallet_connectors.ledger.desktop.step3.description",
+          step: "connect",
+          title: "wallet_connectors.ledger.desktop.step3.title"
+        }
+      ]
+    }
+  },
+  qrCode: {
+    getUri: (uri) => {
+      return `ledgerlive://wc?uri=${encodeURIComponent(uri)}`;
+    },
+    instructions: {
+      learnMoreUrl: "https://support.ledger.com/hc/en-us/articles/4404389503889-Getting-started-with-Ledger-Live",
+      steps: [
+        {
+          description: "wallet_connectors.ledger.qr_code.step1.description",
+          step: "install",
+          title: "wallet_connectors.ledger.qr_code.step1.title"
+        },
+        {
+          description: "wallet_connectors.ledger.qr_code.step2.description",
+          step: "create",
+          title: "wallet_connectors.ledger.qr_code.step2.title"
+        },
+        {
+          description: "wallet_connectors.ledger.qr_code.step3.description",
+          step: "scan",
+          title: "wallet_connectors.ledger.qr_code.step3.title"
+        }
+      ]
+    }
+  },
+  createConnector: getWalletConnectConnector({
+    projectId,
+    walletConnectParameters
+  })
+});
+
+export {
+  ledgerWallet
+};