@dynamic-labs/sdk-react-core 4.4.4 → 4.5.1

package/src/lib/widgets/DynamicWidget/views/ChooseOnrampProviderView/ChooseOnrampProviderView.js

@@ -0,0 +1,107 @@
+'use client'
+import { jsx, jsxs } from 'react/jsx-runtime';
+import { useMemo } from 'react';
+import { useTranslation } from 'react-i18next';
+import { IconButton } from '../../../../components/IconButton/IconButton.js';
+import { ModalHeader } from '../../../../components/ModalHeader/ModalHeader.js';
+import { Typography } from '../../../../components/Typography/Typography.js';
+import { ReactComponent as SvgArrowLeft } from '../../../../shared/assets/arrow-left.js';
+import '@dynamic-labs/iconic';
+import '../../../../context/ViewContext/ViewContext.js';
+import { useWidgetContext } from '../../context/DynamicWidgetContext.js';
+import { useOnrampContext } from '../../../../context/OnrampContext/OnrampContext.js';
+import '@dynamic-labs/utils';
+import '../../../../components/Accordion/components/AccordionItem/AccordionItem.js';
+import '../../../../components/Alert/Alert.js';
+import '../../../../events/dynamicEvents.js';
+import '../../../../../../_virtual/_tslib.js';
+import '../../../../context/DynamicContext/DynamicContext.js';
+import '@dynamic-labs/sdk-api-core';
+import '../../../../shared/logger.js';
+import '@dynamic-labs/wallet-connector-core';
+import '@dynamic-labs/wallet-book';
+import '../../../../utils/constants/colors.js';
+import '../../../../utils/constants/values.js';
+import '../../../../shared/consts/index.js';
+import { useInternalDynamicContext } from '../../../../context/DynamicContext/useDynamicContext/useInternalDynamicContext.js';
+import '../../../../context/CaptchaContext/CaptchaContext.js';
+import '../../../../context/ErrorContext/ErrorContext.js';
+import '@dynamic-labs/multi-wallet';
+import 'react-international-phone';
+import '../../../../store/state/nonce/nonce.js';
+import '../../../../store/state/projectSettings/projectSettings.js';
+import '../../../../config/ApiEndpoint.js';
+import '../../../../store/state/user/user.js';
+import '../../../../locale/locale.js';
+import '../../../../store/state/dynamicContextProps/dynamicContextProps.js';
+import '../../../../store/state/primaryWalletId/primaryWalletId.js';
+import '../../../../context/AccessDeniedContext/AccessDeniedContext.js';
+import '../../../../context/AccountExistsContext/AccountExistsContext.js';
+import '../../../../context/UserWalletsContext/UserWalletsContext.js';
+import '../../../../context/VerificationContext/VerificationContext.js';
+import 'react-dom';
+import '../../../../utils/functions/compareChains/compareChains.js';
+import '../../../../context/ThemeContext/ThemeContext.js';
+import '../../../../utils/hooks/useUserUpdateRequest/useUpdateUser/userFieldsSchema.js';
+import 'bs58';
+import '@dynamic-labs/types';
+import '../../../../context/SocialRedirectContext/SocialRedirectContext.js';
+import '../../../../context/LoadingContext/LoadingContext.js';
+import '../../../../context/WalletContext/WalletContext.js';
+import '../../../../utils/hooks/useEmbeddedWallet/useSecureEnclaveEmbeddedWallet/constants.js';
+import 'yup';
+import '../../../../context/MockContext/MockContext.js';
+import '../../../../views/CollectUserDataView/useFields.js';
+import '../../../../context/FieldsStateContext/FieldsStateContext.js';
+import '../../../../context/UserFieldEditorContext/UserFieldEditorContext.js';
+import '@dynamic-labs/rpc-providers';
+import '../../../../store/state/loadingAndLifecycle.js';
+import '../../../../store/state/walletOptions/walletOptions.js';
+import '../../../../context/FooterAnimationContext/index.js';
+import '../../../../components/ShadowDOM/ShadowDOM.js';
+import '../../../../components/Transition/ZoomTransition/ZoomTransition.js';
+import '../../../../components/Transition/SlideInUpTransition/SlideInUpTransition.js';
+import '../../../../components/Transition/OpacityTransition/OpacityTransition.js';
+import '../../../../components/OverlayCardBase/OverlayCardTarget/OverlayCardTarget.js';
+import '../../../../context/WalletGroupContext/WalletGroupContext.js';
+import '../../components/DynamicWidgetHeader/DynamicWidgetHeader.js';
+import 'react-focus-lock';
+import { Icon } from '../../../../components/Icon/Icon.js';
+import '../../../../components/MenuList/Dropdown/Dropdown.js';
+import { TypographyButton } from '../../../../components/TypographyButton/TypographyButton.js';
+import 'formik';
+import '../../../../utils/hooks/useSubdomainCheck/useSubdomainCheck.js';
+import '../../../../store/state/sendBalances.js';
+import '../../../../components/Input/Input.js';
+import '../../../../components/OverlayCard/OverlayCard.js';
+import '../../../../views/TransactionConfirmationView/TransactionConfirmationView.js';
+import '../../../../context/PasskeyContext/PasskeyContext.js';
+import '../ManagePasskeysWidgetView/PasskeyCard/PasskeyCard.js';
+import 'qrcode';
+import '../ReceiveExternalWalletFunds/ReceiveExternalWalletFunds.js';
+import '../../../../../index.js';
+import '../../../../context/IpConfigurationContext/IpConfigurationContext.js';
+import '../../../../context/ConnectWithOtpContext/ConnectWithOtpContext.js';
+import '../../../../context/ConnectWithOtpContext/constants.js';
+import '../../../DynamicBridgeWidget/views/WalletsView/components/SecondaryWallets/SecondaryWallets.js';
+import '@hcaptcha/react-hcaptcha';
+import '../../../../components/PasskeyCreatedSuccessBanner/PasskeyCreatedSuccessBanner.js';
+import '../../../../store/state/tokenBalances.js';
+import '../../../../shared/utils/functions/getInitialUrl/getInitialUrl.js';
+import '../../../../components/InlineWidget/InlineWidget.js';
+import '../../../../components/IsBrowser/IsBrowser.js';
+import '../../../../components/Popper/Popper/Popper.js';
+import '../../../../components/Popper/PopperContext/PopperContext.js';
+
+const ChooseOnrampProviderView = () => {
+    const { t } = useTranslation();
+    const { setDynamicWidgetView } = useWidgetContext();
+    const { enabledOnrampProviders } = useOnrampContext();
+    const { primaryWallet } = useInternalDynamicContext();
+    const onrampOptions = useMemo(() => enabledOnrampProviders.filter(({ isPaymentMethod }) => !isPaymentMethod), [enabledOnrampProviders]);
+    const backButton = (jsx(IconButton, { type: 'button', id: 'back-button', "data-testid": 'back-button', onClick: () => setDynamicWidgetView('choose-wallet-funding-method'), children: jsx(SvgArrowLeft, {}) }));
+    return (jsxs("div", { className: 'deposit-view', children: [jsx(ModalHeader, { leading: backButton, description: jsx(Typography, { variant: 'body_small', color: 'secondary', className: 'choose-onramp-provider__header-description', children: t('dyn_wallet_funding.onramp_provider_selection.description') }), children: jsx(Typography, { variant: 'title', children: t('dyn_wallet_funding.onramp_provider_selection.title') }) }), jsx("div", { className: 'choose-wallet-funding-method__options', children: primaryWallet &&
+                    onrampOptions.map((option) => (jsx(TypographyButton, { onClick: () => option.onClick({ wallet: primaryWallet }), leading: jsx(Icon, { className: 'choose-onramp-provider__options__option__icon', children: jsx("img", { src: option.iconUrl, alt: option.displayName }) }), typographyProps: { variant: 'body_normal', weight: 'medium' }, buttonVariant: 'card', className: 'choose-wallet-funding-method__options__option', description: option.description, children: option.displayName }, option.id))) })] }));
+};
+
+export { ChooseOnrampProviderView };

package/src/lib/widgets/DynamicWidget/views/ChooseOnrampProviderView/index.d.ts

@@ -0,0 +1 @@
+export { ChooseOnrampProviderView } from './ChooseOnrampProviderView';

package/src/lib/widgets/DynamicWidget/views/ChooseWalletFundingMethod/ChooseWalletFundingMethod.cjs

@@ -23,9 +23,9 @@ const ChooseWalletFundingMethod = () => {
     const { t } = reactI18next.useTranslation();
     const backButton = (jsxRuntime.jsx(IconButton.IconButton, { type: 'button', id: 'back-button', "data-testid": 'back-button', onClick: goToInitialDynamicWidgetView, children: jsxRuntime.jsx(arrowLeft.ReactComponent, {}) }));
     const methods = useFundingMethods.useFundingMethods();
-    return (jsxRuntime.jsxs("div", { className: 'choose-wallet-funding-method', children: [jsxRuntime.jsx(ModalHeader.ModalHeader, { leading: backButton, description: jsxRuntime.jsx(Typography.Typography, { variant: 'body_small', color: 'secondary', className: 'choose-wallet-funding-method__header-description', children: t('dyn_wallet_funding.funding_method_selection.description') }), children: jsxRuntime.jsx(Typography.Typography, { variant: 'title', children: t('dyn_wallet_funding.funding_method_selection.title') }) }), jsxRuntime.jsx("div", { className: 'choose-wallet-funding-method__options', children: methods.map((method) => {
+    return (jsxRuntime.jsxs("div", { className: 'choose-wallet-funding-method', children: [jsxRuntime.jsx(ModalHeader.ModalHeader, { leading: backButton, children: jsxRuntime.jsx(Typography.Typography, { variant: 'title', children: t('dyn_wallet_funding.funding_method_selection.title') }) }), jsxRuntime.jsx("div", { className: 'choose-wallet-funding-method__options', children: methods.map((method) => {
                     var _a;
-                    return (jsxRuntime.jsx(TypographyButton.TypographyButton, { onClick: method.onClick, leading: jsxRuntime.jsx(Icon.Icon, { color: 'text-tertiary', children: method.icon }), trailing: jsxRuntime.jsx(MakeTrailing.MakeTrailing, { previewIcons: (_a = method.previewIcons) !== null && _a !== void 0 ? _a : [], showChevron: Boolean(method.showChevron) }), typographyProps: { variant: 'body_normal', weight: 'medium' }, buttonVariant: 'card', className: 'choose-wallet-funding-method__options__option', children: method.label }, method.key));
+                    return (jsxRuntime.jsx(TypographyButton.TypographyButton, { onClick: method.onClick, description: method.description, leading: jsxRuntime.jsx(Icon.Icon, { color: 'text-tertiary', className: 'choose-wallet-funding-method__options__option__icon', children: method.icon }), trailing: jsxRuntime.jsx(MakeTrailing.MakeTrailing, { previewIcons: (_a = method.previewIcons) !== null && _a !== void 0 ? _a : [], showChevron: Boolean(method.showChevron) }), typographyProps: { variant: 'body_normal', weight: 'medium' }, buttonVariant: 'card', className: 'choose-wallet-funding-method__options__option', children: method.label }, method.key));
                 }) })] }));
 };
 

package/src/lib/widgets/DynamicWidget/views/ChooseWalletFundingMethod/ChooseWalletFundingMethod.js

@@ -19,9 +19,9 @@ const ChooseWalletFundingMethod = () => {
     const { t } = useTranslation();
     const backButton = (jsx(IconButton, { type: 'button', id: 'back-button', "data-testid": 'back-button', onClick: goToInitialDynamicWidgetView, children: jsx(SvgArrowLeft, {}) }));
     const methods = useFundingMethods();
-    return (jsxs("div", { className: 'choose-wallet-funding-method', children: [jsx(ModalHeader, { leading: backButton, description: jsx(Typography, { variant: 'body_small', color: 'secondary', className: 'choose-wallet-funding-method__header-description', children: t('dyn_wallet_funding.funding_method_selection.description') }), children: jsx(Typography, { variant: 'title', children: t('dyn_wallet_funding.funding_method_selection.title') }) }), jsx("div", { className: 'choose-wallet-funding-method__options', children: methods.map((method) => {
+    return (jsxs("div", { className: 'choose-wallet-funding-method', children: [jsx(ModalHeader, { leading: backButton, children: jsx(Typography, { variant: 'title', children: t('dyn_wallet_funding.funding_method_selection.title') }) }), jsx("div", { className: 'choose-wallet-funding-method__options', children: methods.map((method) => {
                     var _a;
-                    return (jsx(TypographyButton, { onClick: method.onClick, leading: jsx(Icon, { color: 'text-tertiary', children: method.icon }), trailing: jsx(MakeTrailing, { previewIcons: (_a = method.previewIcons) !== null && _a !== void 0 ? _a : [], showChevron: Boolean(method.showChevron) }), typographyProps: { variant: 'body_normal', weight: 'medium' }, buttonVariant: 'card', className: 'choose-wallet-funding-method__options__option', children: method.label }, method.key));
+                    return (jsx(TypographyButton, { onClick: method.onClick, description: method.description, leading: jsx(Icon, { color: 'text-tertiary', className: 'choose-wallet-funding-method__options__option__icon', children: method.icon }), trailing: jsx(MakeTrailing, { previewIcons: (_a = method.previewIcons) !== null && _a !== void 0 ? _a : [], showChevron: Boolean(method.showChevron) }), typographyProps: { variant: 'body_normal', weight: 'medium' }, buttonVariant: 'card', className: 'choose-wallet-funding-method__options__option', children: method.label }, method.key));
                 }) })] }));
 };
 

package/src/lib/widgets/DynamicWidget/views/ChooseWalletFundingMethod/useFundingMethods/useFundingMethods.cjs

@@ -4,16 +4,16 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 var jsxRuntime = require('react/jsx-runtime');
+var React = require('react');
 var reactI18next = require('react-i18next');
-var sdkApiCore = require('@dynamic-labs/sdk-api-core');
 var walletBook = require('@dynamic-labs/wallet-book');
 require('@dynamic-labs/utils');
 require('../../../../../components/Accordion/components/AccordionItem/AccordionItem.cjs');
 require('../../../../../components/Alert/Alert.cjs');
-require('react');
 require('../../../../../events/dynamicEvents.cjs');
 require('../../../../../../../_virtual/_tslib.cjs');
 require('../../../../../context/DynamicContext/DynamicContext.cjs');
+require('@dynamic-labs/sdk-api-core');
 require('../../../../../shared/logger.cjs');
 require('@dynamic-labs/iconic');
 require('@dynamic-labs/wallet-connector-core');
@@ -45,6 +45,7 @@ require('react-dom');
 require('../../../../../utils/functions/compareChains/compareChains.cjs');
 require('../../../../../context/ThemeContext/ThemeContext.cjs');
 require('../../../../../utils/hooks/useUserUpdateRequest/useUpdateUser/userFieldsSchema.cjs');
+require('bs58');
 require('@dynamic-labs/types');
 require('../../../../../context/SocialRedirectContext/SocialRedirectContext.cjs');
 require('../../../../../context/LoadingContext/LoadingContext.cjs');
@@ -81,7 +82,7 @@ require('../../../../../context/PasskeyContext/PasskeyContext.cjs');
 require('../../ManagePasskeysWidgetView/PasskeyCard/PasskeyCard.cjs');
 var OnrampContext = require('../../../../../context/OnrampContext/OnrampContext.cjs');
 var index = require('../../../../../utils/functions/walletFilters/index.cjs');
-var useFunding = require('../../../../../utils/hooks/useFunding/useFunding.cjs');
+var useFundWithWallet = require('../../../../../utils/hooks/useFundWithWallet/useFundWithWallet.cjs');
 var useWalletList = require('../../../../../utils/hooks/useWalletList/useWalletList.cjs');
 var useStartExternalWalletFunding = require('./useStartExternalWalletFunding/useStartExternalWalletFunding.cjs');
 require('qrcode');
@@ -109,51 +110,95 @@ const MAX_PREVIEW_ICONS = 3;
 const useFundingMethods = () => {
     const { t } = reactI18next.useTranslation();
     const { setDynamicWidgetView } = DynamicWidgetContext.useWidgetContext();
-    const { externalWalletFundingEnabled, openOnramp } = useFunding.useFunding();
-    const { enabledOnrampProviders, onrampEnabled } = OnrampContext.useOnrampContext();
+    const { externalWalletFundingEnabled } = useFundWithWallet.useFundWithWallet();
+    const { enabledOnrampProviders } = OnrampContext.useOnrampContext();
     const { primaryWallet } = useInternalDynamicContext.useInternalDynamicContext();
+    const viewWalletsFilter = React.useMemo(() => (primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.chain)
+        ? index.FilterChain(primaryWallet.chain)
+        : undefined, [primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.chain]);
     const { walletsList } = useWalletList.useWalletList({
-        viewWalletsFilter: (primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.chain)
-            ? index.FilterChain(primaryWallet.chain)
-            : undefined,
+        viewWalletsFilter,
     });
     const walletGroups = walletOptions.useWalletGroups();
     const startExternalWalletFunding = useStartExternalWalletFunding.useStartExternalWalletFunding();
-    const methods = [
-        {
-            icon: jsxRuntime.jsx(qrCode.ReactComponent, {}),
-            key: 'qr',
-            label: t('dyn_wallet_funding.funding_method_selection.qr_option'),
-            onClick: () => setDynamicWidgetView('deposit-view'),
-            showChevron: true,
-        },
-    ];
-    if (onrampEnabled) {
-        const previewIcons = slicePreviewIcons(enabledOnrampProviders.map(({ iconUrl, name }) => (jsxRuntime.jsx("div", { className: 'choose-wallet-funding-method__options__option__trailing__preview-icons__onramp-icon', children: jsxRuntime.jsx("img", { src: iconUrl, alt: `${name}-icon` }) }, name))));
-        methods.push({
-            icon: jsxRuntime.jsx(globe.ReactComponent, {}),
-            key: 'buy',
-            label: t('dyn_wallet_funding.funding_method_selection.buy_option'),
-            onClick: () => openOnramp({ onrampProvider: sdkApiCore.OnrampProviders.Banxa }),
-            previewIcons,
-            showChevron: false,
-        });
-    }
-    if (externalWalletFundingEnabled) {
-        const previewIcons = slicePreviewIcons(walletsList.map(({ key, walletConnector }, index) => {
+    const onrampOptions = React.useMemo(() => enabledOnrampProviders.filter(({ isPaymentMethod }) => !isPaymentMethod), [enabledOnrampProviders]);
+    const paymentMethods = React.useMemo(() => enabledOnrampProviders.filter(({ isPaymentMethod }) => isPaymentMethod), [enabledOnrampProviders]);
+    const handleQrClick = React.useCallback(() => setDynamicWidgetView('deposit-view'), [setDynamicWidgetView]);
+    const handleBuyCryptoClick = React.useCallback(() => {
+        if (!primaryWallet) {
+            return;
+        }
+        onrampOptions.length > 1
+            ? setDynamicWidgetView('choose-onramp-provider')
+            : onrampOptions[0].onClick({ wallet: primaryWallet });
+    }, [onrampOptions, setDynamicWidgetView, primaryWallet]);
+    const previewWalletIcons = React.useMemo(() => {
+        if (!externalWalletFundingEnabled)
+            return [];
+        return slicePreviewIcons(walletsList.map(({ key, walletConnector }, index) => {
             var _a, _b, _c;
             return (jsxRuntime.jsx("div", { className: 'choose-wallet-funding-method__options__option__trailing__preview-icons__wallet-icon', style: { '--z-index': MAX_PREVIEW_ICONS - index }, children: jsxRuntime.jsx(walletBook.WalletIcon, { icon: (_a = walletConnector === null || walletConnector === void 0 ? void 0 : walletConnector.metadata.icon) !== null && _a !== void 0 ? _a : (_c = (_b = walletGroups[key]) === null || _b === void 0 ? void 0 : _b.brand) === null || _c === void 0 ? void 0 : _c.icon, walletKey: key, isGroup: false }) }, key));
         }));
-        methods.push({
-            icon: jsxRuntime.jsx(walletOutlineV2.ReactComponent, {}),
-            key: 'external-wallet',
-            label: t('dyn_wallet_funding.funding_method_selection.external_wallet_option'),
-            onClick: startExternalWalletFunding,
-            previewIcons,
-            showChevron: true,
-        });
-    }
-    return methods;
+    }, [externalWalletFundingEnabled, walletsList, walletGroups]);
+    const previewOnrampIcons = React.useMemo(() => {
+        if (!onrampOptions.length)
+            return [];
+        return slicePreviewIcons(onrampOptions.map(({ iconUrl, id }) => (jsxRuntime.jsx("div", { className: 'choose-wallet-funding-method__options__option__trailing__preview-icons__onramp-icon', children: jsxRuntime.jsx("img", { src: iconUrl, alt: `${id}-icon` }) }, id))));
+    }, [onrampOptions]);
+    return React.useMemo(() => {
+        const methods = [
+            {
+                icon: jsxRuntime.jsx(qrCode.ReactComponent, {}),
+                key: 'qr',
+                label: t('dyn_wallet_funding.funding_method_selection.qr_option'),
+                onClick: handleQrClick,
+                showChevron: true,
+            },
+        ];
+        if (primaryWallet) {
+            paymentMethods.forEach(({ id, iconUrl, displayName, onClick }) => {
+                methods.push({
+                    icon: jsxRuntime.jsx("img", { src: iconUrl, alt: displayName }),
+                    key: id,
+                    label: displayName,
+                    onClick: () => onClick({ wallet: primaryWallet }),
+                    showChevron: false,
+                });
+            });
+        }
+        if (onrampOptions.length) {
+            methods.push({
+                icon: jsxRuntime.jsx(globe.ReactComponent, {}),
+                key: 'buy',
+                label: t('dyn_wallet_funding.funding_method_selection.buy_option'),
+                onClick: handleBuyCryptoClick,
+                previewIcons: previewOnrampIcons,
+                showChevron: onrampOptions.length > 1,
+            });
+        }
+        if (externalWalletFundingEnabled) {
+            methods.push({
+                icon: jsxRuntime.jsx(walletOutlineV2.ReactComponent, {}),
+                key: 'external-wallet',
+                label: t('dyn_wallet_funding.funding_method_selection.external_wallet_option'),
+                onClick: startExternalWalletFunding,
+                previewIcons: previewWalletIcons,
+                showChevron: true,
+            });
+        }
+        return methods;
+    }, [
+        t,
+        handleQrClick,
+        paymentMethods,
+        onrampOptions.length,
+        handleBuyCryptoClick,
+        previewOnrampIcons,
+        externalWalletFundingEnabled,
+        startExternalWalletFunding,
+        previewWalletIcons,
+        primaryWallet,
+    ]);
 };
 
 exports.useFundingMethods = useFundingMethods;

package/src/lib/widgets/DynamicWidget/views/ChooseWalletFundingMethod/useFundingMethods/useFundingMethods.d.ts

@@ -6,5 +6,6 @@ export type FundingMethod = {
     showChevron?: boolean;
     onClick: () => void;
     previewIcons?: JSX.Element[];
+    description?: string;
 };
 export declare const useFundingMethods: () => FundingMethod[];

package/src/lib/widgets/DynamicWidget/views/ChooseWalletFundingMethod/useFundingMethods/useFundingMethods.js

@@ -1,15 +1,15 @@
 'use client'
 import { jsx } from 'react/jsx-runtime';
+import { useMemo, useCallback } from 'react';
 import { useTranslation } from 'react-i18next';
-import { OnrampProviders } from '@dynamic-labs/sdk-api-core';
 import { WalletIcon } from '@dynamic-labs/wallet-book';
 import '@dynamic-labs/utils';
 import '../../../../../components/Accordion/components/AccordionItem/AccordionItem.js';
 import '../../../../../components/Alert/Alert.js';
-import 'react';
 import '../../../../../events/dynamicEvents.js';
 import '../../../../../../../_virtual/_tslib.js';
 import '../../../../../context/DynamicContext/DynamicContext.js';
+import '@dynamic-labs/sdk-api-core';
 import '../../../../../shared/logger.js';
 import '@dynamic-labs/iconic';
 import '@dynamic-labs/wallet-connector-core';
@@ -41,6 +41,7 @@ import 'react-dom';
 import '../../../../../utils/functions/compareChains/compareChains.js';
 import '../../../../../context/ThemeContext/ThemeContext.js';
 import '../../../../../utils/hooks/useUserUpdateRequest/useUpdateUser/userFieldsSchema.js';
+import 'bs58';
 import '@dynamic-labs/types';
 import '../../../../../context/SocialRedirectContext/SocialRedirectContext.js';
 import '../../../../../context/LoadingContext/LoadingContext.js';
@@ -77,7 +78,7 @@ import '../../../../../context/PasskeyContext/PasskeyContext.js';
 import '../../ManagePasskeysWidgetView/PasskeyCard/PasskeyCard.js';
 import { useOnrampContext } from '../../../../../context/OnrampContext/OnrampContext.js';
 import { FilterChain } from '../../../../../utils/functions/walletFilters/index.js';
-import { useFunding } from '../../../../../utils/hooks/useFunding/useFunding.js';
+import { useFundWithWallet } from '../../../../../utils/hooks/useFundWithWallet/useFundWithWallet.js';
 import { useWalletList } from '../../../../../utils/hooks/useWalletList/useWalletList.js';
 import { useStartExternalWalletFunding } from './useStartExternalWalletFunding/useStartExternalWalletFunding.js';
 import 'qrcode';
@@ -105,51 +106,95 @@ const MAX_PREVIEW_ICONS = 3;
 const useFundingMethods = () => {
     const { t } = useTranslation();
     const { setDynamicWidgetView } = useWidgetContext();
-    const { externalWalletFundingEnabled, openOnramp } = useFunding();
-    const { enabledOnrampProviders, onrampEnabled } = useOnrampContext();
+    const { externalWalletFundingEnabled } = useFundWithWallet();
+    const { enabledOnrampProviders } = useOnrampContext();
     const { primaryWallet } = useInternalDynamicContext();
+    const viewWalletsFilter = useMemo(() => (primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.chain)
+        ? FilterChain(primaryWallet.chain)
+        : undefined, [primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.chain]);
     const { walletsList } = useWalletList({
-        viewWalletsFilter: (primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.chain)
-            ? FilterChain(primaryWallet.chain)
-            : undefined,
+        viewWalletsFilter,
     });
     const walletGroups = useWalletGroups();
     const startExternalWalletFunding = useStartExternalWalletFunding();
-    const methods = [
-        {
-            icon: jsx(SvgQrCode, {}),
-            key: 'qr',
-            label: t('dyn_wallet_funding.funding_method_selection.qr_option'),
-            onClick: () => setDynamicWidgetView('deposit-view'),
-            showChevron: true,
-        },
-    ];
-    if (onrampEnabled) {
-        const previewIcons = slicePreviewIcons(enabledOnrampProviders.map(({ iconUrl, name }) => (jsx("div", { className: 'choose-wallet-funding-method__options__option__trailing__preview-icons__onramp-icon', children: jsx("img", { src: iconUrl, alt: `${name}-icon` }) }, name))));
-        methods.push({
-            icon: jsx(SvgGlobe, {}),
-            key: 'buy',
-            label: t('dyn_wallet_funding.funding_method_selection.buy_option'),
-            onClick: () => openOnramp({ onrampProvider: OnrampProviders.Banxa }),
-            previewIcons,
-            showChevron: false,
-        });
-    }
-    if (externalWalletFundingEnabled) {
-        const previewIcons = slicePreviewIcons(walletsList.map(({ key, walletConnector }, index) => {
+    const onrampOptions = useMemo(() => enabledOnrampProviders.filter(({ isPaymentMethod }) => !isPaymentMethod), [enabledOnrampProviders]);
+    const paymentMethods = useMemo(() => enabledOnrampProviders.filter(({ isPaymentMethod }) => isPaymentMethod), [enabledOnrampProviders]);
+    const handleQrClick = useCallback(() => setDynamicWidgetView('deposit-view'), [setDynamicWidgetView]);
+    const handleBuyCryptoClick = useCallback(() => {
+        if (!primaryWallet) {
+            return;
+        }
+        onrampOptions.length > 1
+            ? setDynamicWidgetView('choose-onramp-provider')
+            : onrampOptions[0].onClick({ wallet: primaryWallet });
+    }, [onrampOptions, setDynamicWidgetView, primaryWallet]);
+    const previewWalletIcons = useMemo(() => {
+        if (!externalWalletFundingEnabled)
+            return [];
+        return slicePreviewIcons(walletsList.map(({ key, walletConnector }, index) => {
             var _a, _b, _c;
             return (jsx("div", { className: 'choose-wallet-funding-method__options__option__trailing__preview-icons__wallet-icon', style: { '--z-index': MAX_PREVIEW_ICONS - index }, children: jsx(WalletIcon, { icon: (_a = walletConnector === null || walletConnector === void 0 ? void 0 : walletConnector.metadata.icon) !== null && _a !== void 0 ? _a : (_c = (_b = walletGroups[key]) === null || _b === void 0 ? void 0 : _b.brand) === null || _c === void 0 ? void 0 : _c.icon, walletKey: key, isGroup: false }) }, key));
         }));
-        methods.push({
-            icon: jsx(SvgWalletOutlineV2, {}),
-            key: 'external-wallet',
-            label: t('dyn_wallet_funding.funding_method_selection.external_wallet_option'),
-            onClick: startExternalWalletFunding,
-            previewIcons,
-            showChevron: true,
-        });
-    }
-    return methods;
+    }, [externalWalletFundingEnabled, walletsList, walletGroups]);
+    const previewOnrampIcons = useMemo(() => {
+        if (!onrampOptions.length)
+            return [];
+        return slicePreviewIcons(onrampOptions.map(({ iconUrl, id }) => (jsx("div", { className: 'choose-wallet-funding-method__options__option__trailing__preview-icons__onramp-icon', children: jsx("img", { src: iconUrl, alt: `${id}-icon` }) }, id))));
+    }, [onrampOptions]);
+    return useMemo(() => {
+        const methods = [
+            {
+                icon: jsx(SvgQrCode, {}),
+                key: 'qr',
+                label: t('dyn_wallet_funding.funding_method_selection.qr_option'),
+                onClick: handleQrClick,
+                showChevron: true,
+            },
+        ];
+        if (primaryWallet) {
+            paymentMethods.forEach(({ id, iconUrl, displayName, onClick }) => {
+                methods.push({
+                    icon: jsx("img", { src: iconUrl, alt: displayName }),
+                    key: id,
+                    label: displayName,
+                    onClick: () => onClick({ wallet: primaryWallet }),
+                    showChevron: false,
+                });
+            });
+        }
+        if (onrampOptions.length) {
+            methods.push({
+                icon: jsx(SvgGlobe, {}),
+                key: 'buy',
+                label: t('dyn_wallet_funding.funding_method_selection.buy_option'),
+                onClick: handleBuyCryptoClick,
+                previewIcons: previewOnrampIcons,
+                showChevron: onrampOptions.length > 1,
+            });
+        }
+        if (externalWalletFundingEnabled) {
+            methods.push({
+                icon: jsx(SvgWalletOutlineV2, {}),
+                key: 'external-wallet',
+                label: t('dyn_wallet_funding.funding_method_selection.external_wallet_option'),
+                onClick: startExternalWalletFunding,
+                previewIcons: previewWalletIcons,
+                showChevron: true,
+            });
+        }
+        return methods;
+    }, [
+        t,
+        handleQrClick,
+        paymentMethods,
+        onrampOptions.length,
+        handleBuyCryptoClick,
+        previewOnrampIcons,
+        externalWalletFundingEnabled,
+        startExternalWalletFunding,
+        previewWalletIcons,
+        primaryWallet,
+    ]);
 };
 
 export { useFundingMethods };

package/src/lib/widgets/DynamicWidget/views/ChooseWalletFundingMethod/useFundingMethods/useStartExternalWalletFunding/useStartExternalWalletFunding.cjs

@@ -5,42 +5,38 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var _tslib = require('../../../../../../../../_virtual/_tslib.cjs');
 var React = require('react');
+var utils = require('@dynamic-labs/utils');
 var projectSettings = require('../../../../../../store/state/projectSettings/projectSettings.cjs');
-var useFunding = require('../../../../../../utils/hooks/useFunding/useFunding.cjs');
-var DynamicWidgetContext = require('../../../../context/DynamicWidgetContext.cjs');
+var useFundWithWallet = require('../../../../../../utils/hooks/useFundWithWallet/useFundWithWallet.cjs');
 
 const useStartExternalWalletFunding = () => {
-    var _a, _b;
+    var _a, _b, _c;
+    const { connectWalletForFunding, promptAmountAndFund } = useFundWithWallet.useFundWithWallet();
     const settings = projectSettings.useProjectSettings();
-    const { connectWalletForFunding } = useFunding.useFunding();
-    const { setDynamicWidgetView } = DynamicWidgetContext.useWidgetContext();
     return React.useCallback(() => _tslib.__awaiter(void 0, void 0, void 0, function* () {
-        var _c, _d;
+        var _d, _e, _f, _g, _h, _j;
         try {
             const externalWallet = yield connectWalletForFunding();
-            const minAmount = (_d = (_c = settings === null || settings === void 0 ? void 0 : settings.sdk.funding) === null || _c === void 0 ? void 0 : _c.externalWallets) === null || _d === void 0 ? void 0 : _d.minAmount;
-            const recommendedToken = minAmount === null || minAmount === void 0 ? void 0 : minAmount.currency;
-            const minValue = (minAmount === null || minAmount === void 0 ? void 0 : minAmount.amount)
-                ? parseFloat(minAmount.amount)
-                : undefined;
-            setDynamicWidgetView('receive-external-wallet-funds', {
-                amount: minValue ? { rule: 'minimum', value: minValue } : undefined,
+            const walletChain = externalWallet.connector.connectedChain;
+            const chainSettings = (_g = (_f = (_e = (_d = settings === null || settings === void 0 ? void 0 : settings.sdk.funding) === null || _d === void 0 ? void 0 : _d.externalWallets) === null || _e === void 0 ? void 0 : _e.defaultSettings) === null || _f === void 0 ? void 0 : _f.chainSettings) === null || _g === void 0 ? void 0 : _g.find(({ chain }) => chain === walletChain);
+            // This is always supposed to be present, otherwise there's some backend error
+            if (!((_h = chainSettings === null || chainSettings === void 0 ? void 0 : chainSettings.token) === null || _h === void 0 ? void 0 : _h.value) || !((_j = chainSettings === null || chainSettings === void 0 ? void 0 : chainSettings.token) === null || _j === void 0 ? void 0 : _j.rule))
+                throw new utils.DynamicError(`No external wallet funding chain settings found for chain ${walletChain}`);
+            promptAmountAndFund({
                 externalWallet,
-                token: recommendedToken
-                    ? {
-                        rule: 'recommended',
-                        value: recommendedToken,
-                    }
-                    : undefined,
+                token: {
+                    rule: chainSettings.token.rule,
+                    value: chainSettings.token.value,
+                },
             });
         }
-        catch (_e) {
+        catch (_k) {
             /* empty */
         }
     }), [
         connectWalletForFunding,
-        setDynamicWidgetView,
-        (_b = (_a = settings === null || settings === void 0 ? void 0 : settings.sdk.funding) === null || _a === void 0 ? void 0 : _a.externalWallets) === null || _b === void 0 ? void 0 : _b.minAmount,
+        promptAmountAndFund,
+        (_c = (_b = (_a = settings === null || settings === void 0 ? void 0 : settings.sdk.funding) === null || _a === void 0 ? void 0 : _a.externalWallets) === null || _b === void 0 ? void 0 : _b.defaultSettings) === null || _c === void 0 ? void 0 : _c.chainSettings,
     ]);
 };
 

package/src/lib/widgets/DynamicWidget/views/ChooseWalletFundingMethod/useFundingMethods/useStartExternalWalletFunding/useStartExternalWalletFunding.js

@@ -1,42 +1,38 @@
 'use client'
 import { __awaiter } from '../../../../../../../../_virtual/_tslib.js';
 import { useCallback } from 'react';
+import { DynamicError } from '@dynamic-labs/utils';
 import { useProjectSettings } from '../../../../../../store/state/projectSettings/projectSettings.js';
-import { useFunding } from '../../../../../../utils/hooks/useFunding/useFunding.js';
-import { useWidgetContext } from '../../../../context/DynamicWidgetContext.js';
+import { useFundWithWallet } from '../../../../../../utils/hooks/useFundWithWallet/useFundWithWallet.js';
 
 const useStartExternalWalletFunding = () => {
-    var _a, _b;
+    var _a, _b, _c;
+    const { connectWalletForFunding, promptAmountAndFund } = useFundWithWallet();
     const settings = useProjectSettings();
-    const { connectWalletForFunding } = useFunding();
-    const { setDynamicWidgetView } = useWidgetContext();
     return useCallback(() => __awaiter(void 0, void 0, void 0, function* () {
-        var _c, _d;
+        var _d, _e, _f, _g, _h, _j;
         try {
             const externalWallet = yield connectWalletForFunding();
-            const minAmount = (_d = (_c = settings === null || settings === void 0 ? void 0 : settings.sdk.funding) === null || _c === void 0 ? void 0 : _c.externalWallets) === null || _d === void 0 ? void 0 : _d.minAmount;
-            const recommendedToken = minAmount === null || minAmount === void 0 ? void 0 : minAmount.currency;
-            const minValue = (minAmount === null || minAmount === void 0 ? void 0 : minAmount.amount)
-                ? parseFloat(minAmount.amount)
-                : undefined;
-            setDynamicWidgetView('receive-external-wallet-funds', {
-                amount: minValue ? { rule: 'minimum', value: minValue } : undefined,
+            const walletChain = externalWallet.connector.connectedChain;
+            const chainSettings = (_g = (_f = (_e = (_d = settings === null || settings === void 0 ? void 0 : settings.sdk.funding) === null || _d === void 0 ? void 0 : _d.externalWallets) === null || _e === void 0 ? void 0 : _e.defaultSettings) === null || _f === void 0 ? void 0 : _f.chainSettings) === null || _g === void 0 ? void 0 : _g.find(({ chain }) => chain === walletChain);
+            // This is always supposed to be present, otherwise there's some backend error
+            if (!((_h = chainSettings === null || chainSettings === void 0 ? void 0 : chainSettings.token) === null || _h === void 0 ? void 0 : _h.value) || !((_j = chainSettings === null || chainSettings === void 0 ? void 0 : chainSettings.token) === null || _j === void 0 ? void 0 : _j.rule))
+                throw new DynamicError(`No external wallet funding chain settings found for chain ${walletChain}`);
+            promptAmountAndFund({
                 externalWallet,
-                token: recommendedToken
-                    ? {
-                        rule: 'recommended',
-                        value: recommendedToken,
-                    }
-                    : undefined,
+                token: {
+                    rule: chainSettings.token.rule,
+                    value: chainSettings.token.value,
+                },
             });
         }
-        catch (_e) {
+        catch (_k) {
             /* empty */
         }
     }), [
         connectWalletForFunding,
-        setDynamicWidgetView,
-        (_b = (_a = settings === null || settings === void 0 ? void 0 : settings.sdk.funding) === null || _a === void 0 ? void 0 : _a.externalWallets) === null || _b === void 0 ? void 0 : _b.minAmount,
+        promptAmountAndFund,
+        (_c = (_b = (_a = settings === null || settings === void 0 ? void 0 : settings.sdk.funding) === null || _a === void 0 ? void 0 : _a.externalWallets) === null || _b === void 0 ? void 0 : _b.defaultSettings) === null || _c === void 0 ? void 0 : _c.chainSettings,
     ]);
 };