@dynamic-labs/sdk-react-core 4.6.1 → 4.6.2

package/src/lib/widgets/DynamicWidget/views/{ReceiveExternalWalletFunds/ReceiveExternalWalletFunds.cjs → ReceiveWalletFunds/ReceiveWalletFunds.cjs}

@@ -113,7 +113,7 @@ var isFiatToken = require('./utils/isFiatToken/isFiatToken.cjs');
 var isNonZero = require('./utils/isNonZero/isNonZero.cjs');
 var respectsMinimum = require('./utils/respectsMinimum/respectsMinimum.cjs');
 var useExchangeRatesForFunding = require('./utils/useExchangeRatesForFunding/useExchangeRatesForFunding.cjs');
-var useSubmitExternalWalletFunding = require('./utils/useSubmitExternalWalletFunding/useSubmitExternalWalletFunding.cjs');
+var useSubmitWalletFunding = require('./utils/useSubmitWalletFunding/useSubmitWalletFunding.cjs');
 var useTokensForFunding = require('./utils/useTokensForFunding/useTokensForFunding.cjs');
 var calculateFiatBalance = require('./utils/calculateFiatBalance/calculateFiatBalance.cjs');
 
@@ -124,7 +124,7 @@ const defaultQuickSuggestions = {
 const rulesThatHideQuickSuggestions = ['exact', 'minimum'];
 const rulesThatDisableTokenSelect = ['exact', 'exact-with-amount'];
 const inputEmitter = formattedInputEmitter.createFormattedInputEmitter();
-const ReceiveExternalWalletFunds = ({ amount: initialAmount, token: initialTokenRaw, externalWallet, quickSuggestions = defaultQuickSuggestions, }) => {
+const ReceiveWalletFunds = ({ amount: initialAmount, token: initialTokenRaw, wallet, quickSuggestions = defaultQuickSuggestions, }) => {
     var _a, _b, _c, _d, _e, _f, _g, _h, _j;
     // For now we hardcode the default value, soon we will fetch this from project settings
     const initialToken = initialTokenRaw !== null && initialTokenRaw !== void 0 ? initialTokenRaw : {
@@ -146,7 +146,7 @@ const ReceiveExternalWalletFunds = ({ amount: initialAmount, token: initialToken
     const [conversionErrorIconRef, setConversionErrorIconRef] = React.useState(null);
     const { setDynamicWidgetView } = DynamicWidgetContext.useWidgetContext();
     const { isLoading: tokenBalancesLoading, tokens: tokenBalances } = useTokensForFunding.useTokensForFunding({
-        wallet: externalWallet,
+        wallet: wallet,
     });
     const exchangeRates = useExchangeRatesForFunding.useExchangeRatesForFunding({
         // Initialize amounts after exchange rates are fetched
@@ -258,10 +258,10 @@ const ReceiveExternalWalletFunds = ({ amount: initialAmount, token: initialToken
                 value: (_e = currentToken === null || currentToken === void 0 ? void 0 : currentToken.balance) !== null && _e !== void 0 ? _e : 0,
             },
         ];
-    const showNotEnoughBalance = Boolean(!currentToken ||
-        (isNonZero.isNonZero(tokenAmount) &&
-            tokenAmount !== undefined &&
-            currentToken.balance < parseFloat(tokenAmount)));
+    const showNotEnoughBalance = Boolean(!tokenBalancesLoading &&
+        isNonZero.isNonZero(tokenAmount) &&
+        tokenAmount !== undefined &&
+        (!currentToken || currentToken.balance < parseFloat(tokenAmount)));
     const showMinimumRequired = Boolean(!isMinimumRespected && !showNotEnoughBalance);
     const showQuickSuggestions = quickSuggestionsParsed.length > 0 &&
         !hasUserInteracted &&
@@ -286,7 +286,7 @@ const ReceiveExternalWalletFunds = ({ amount: initialAmount, token: initialToken
         setAmountsByFiatValue,
         setAmountsByTokenValue,
     ]);
-    const handleSubmit = useSubmitExternalWalletFunding.useSubmitExternalWalletFunding();
+    const handleSubmit = useSubmitWalletFunding.useSubmitWalletFunding();
     const disableSubmit = !isMinimumRespected || showNotEnoughBalance || !isNonZero.isNonZero(tokenAmount);
     const closeTokenSelect = React.useCallback(() => {
         setShowTokenSelect(false);
@@ -301,9 +301,9 @@ const ReceiveExternalWalletFunds = ({ amount: initialAmount, token: initialToken
     const backButton = (jsxRuntime.jsx(IconButton.IconButton, { type: 'button', id: 'back-button', "data-testid": 'back-button', onClick: () => setDynamicWidgetView('choose-wallet-funding-method'), children: jsxRuntime.jsx(arrowLeft.ReactComponent, {}) }));
     return (jsxRuntime.jsxs("div", { className: 'fund-from-wallet', children: [!disableTokenSelect && (jsxRuntime.jsx(TokenSelectScreen.TokenSelectScreen, { onClose: closeTokenSelect, onSelectToken: handleSelectToken, tokens: tokenBalances !== null && tokenBalances !== void 0 ? tokenBalances : [], currentToken: tokenSymbol, className: classNames.classNames('fund-from-wallet__token-select', {
                     'fund-from-wallet__token-select--open': showTokenSelect,
-                }), showTokenAsPrimary: showTokenAsPrimary, exchangeRates: exchangeRates })), jsxRuntime.jsx(ModalHeader.ModalHeader, { leading: backButton, children: jsxRuntime.jsx(Typography.Typography, { variant: 'title', children: t('dyn_wallet_funding.from_external_wallet.funding_view.title') }) }), jsxRuntime.jsxs("div", { className: 'fund-from-wallet__content', children: [jsxRuntime.jsxs("div", { className: 'fund-from-wallet__content__amount-container', children: [minimum && (jsxRuntime.jsx(Typography.Typography, { color: 'error-1', className: classNames.classNames('fund-from-wallet__content__amount-container__minimum-error', {
+                }), showTokenAsPrimary: showTokenAsPrimary, exchangeRates: exchangeRates })), jsxRuntime.jsx(ModalHeader.ModalHeader, { leading: backButton, children: jsxRuntime.jsx(Typography.Typography, { variant: 'title', children: t('dyn_wallet_funding.from_wallet.amount_input.title') }) }), jsxRuntime.jsxs("div", { className: 'fund-from-wallet__content', children: [jsxRuntime.jsxs("div", { className: 'fund-from-wallet__content__amount-container', children: [minimum && (jsxRuntime.jsx(Typography.Typography, { color: 'error-1', className: classNames.classNames('fund-from-wallet__content__amount-container__minimum-error', {
                                     'fund-from-wallet__content__amount-container__minimum-error--visible': showMinimumRequired,
-                                }), variant: 'body_normal', weight: 'medium', children: t('dyn_wallet_funding.from_external_wallet.funding_view.minimum_error', {
+                                }), variant: 'body_normal', weight: 'medium', children: t('dyn_wallet_funding.from_wallet.amount_input.minimum_error', {
                                     minimum: formatValue.formatValue({
                                         symbol: minimum.token,
                                         value: minimum.value,
@@ -324,9 +324,9 @@ const ReceiveExternalWalletFunds = ({ amount: initialAmount, token: initialToken
                                         }), children: secondaryDisplay }), jsxRuntime.jsx(Icon.Icon, { size: 'small', color: 'text-secondary', className: 'fund-from-wallet__content__amount-container__secondary-amount-container__switch', children: jsxRuntime.jsx(switchToggle.ReactComponent, { "data-testid": 'switch-primary-and-secondary', onClick: switchPrimaryAndSecondary }) })] })), !showQuickSuggestions && !secondaryDisplay && (jsxRuntime.jsxs("div", { className: 'fund-from-wallet__content__amount-container__secondary-missing', children: [jsxRuntime.jsx(Typography.Typography, { weight: 'medium', children: formatValue.formatValue({
                                             symbol: secondaryData.symbol,
                                             value: consts.UNAVAILABLE_VALUE,
-                                        }) }), jsxRuntime.jsx("div", { ref: setConversionErrorIconRef, children: jsxRuntime.jsx(Icon.Icon, { size: 'medium', color: 'text-tertiary', children: jsxRuntime.jsx(footerInfoIcon.ReactComponent, {}) }) }), jsxRuntime.jsx(Tooltip.Tooltip, { content: t('dyn_wallet_funding.from_external_wallet.funding_view.pricing_unavailable'), targetRef: conversionErrorIconRef, className: 'fund-from-wallet__content__amount-container__secondary-missing__tooltip' })] })), jsxRuntime.jsx(Typography.Typography, { color: 'error-1', className: classNames.classNames('fund-from-wallet__content__amount-container__balance-error', {
+                                        }) }), jsxRuntime.jsx("div", { ref: setConversionErrorIconRef, children: jsxRuntime.jsx(Icon.Icon, { size: 'medium', color: 'text-tertiary', children: jsxRuntime.jsx(footerInfoIcon.ReactComponent, {}) }) }), jsxRuntime.jsx(Tooltip.Tooltip, { content: t('dyn_wallet_funding.from_wallet.amount_input.pricing_unavailable'), targetRef: conversionErrorIconRef, className: 'fund-from-wallet__content__amount-container__secondary-missing__tooltip' })] })), jsxRuntime.jsx(Typography.Typography, { color: 'error-1', className: classNames.classNames('fund-from-wallet__content__amount-container__balance-error', {
                                     'fund-from-wallet__content__amount-container__balance-error--visible': showNotEnoughBalance,
-                                }), variant: 'body_normal', weight: 'medium', children: t('dyn_wallet_funding.from_external_wallet.funding_view.balance_error') })] }), jsxRuntime.jsxs("div", { className: 'fund-from-wallet__content__wallet-card', children: [jsxRuntime.jsxs("div", { className: 'fund-from-wallet__content__wallet-card__wallet-details', children: [jsxRuntime.jsx(walletBook.WalletIcon, { icon: externalWallet.connector.metadata.icon, walletKey: externalWallet.connector.key, className: 'fund-from-wallet__content__wallet-card__wallet-details__icon' }), jsxRuntime.jsxs("div", { className: 'fund-from-wallet__content__wallet-card__wallet-details__rows', children: [jsxRuntime.jsx(Typography.Typography, { variant: 'body_small', weight: 'medium', children: t('dyn_wallet_funding.from_external_wallet.funding_view.wallet_detail_from') }), jsxRuntime.jsx(Typography.Typography, { variant: 'body_small', color: 'secondary', weight: 'medium', children: shortenWalletAddress.shortenWalletAddress(externalWallet.address) })] })] }), tokenBalancesLoading && (jsxRuntime.jsx(Skeleton.Skeleton, { dataTestId: 'balance-skeleton', container: {
+                                }), variant: 'body_normal', weight: 'medium', children: t('dyn_wallet_funding.from_wallet.amount_input.balance_error') })] }), jsxRuntime.jsxs("div", { className: 'fund-from-wallet__content__wallet-card', children: [jsxRuntime.jsxs("div", { className: 'fund-from-wallet__content__wallet-card__wallet-details', children: [jsxRuntime.jsx(walletBook.WalletIcon, { icon: wallet.connector.metadata.icon, walletKey: wallet.connector.key, className: 'fund-from-wallet__content__wallet-card__wallet-details__icon' }), jsxRuntime.jsxs("div", { className: 'fund-from-wallet__content__wallet-card__wallet-details__rows', children: [jsxRuntime.jsx(Typography.Typography, { variant: 'body_small', weight: 'medium', children: t('dyn_wallet_funding.from_wallet.amount_input.wallet_detail_from') }), jsxRuntime.jsx(Typography.Typography, { variant: 'body_small', color: 'secondary', weight: 'medium', children: shortenWalletAddress.shortenWalletAddress(wallet.address) })] })] }), tokenBalancesLoading && (jsxRuntime.jsx(Skeleton.Skeleton, { dataTestId: 'balance-skeleton', container: {
                                     className: 'fund-from-wallet__content__wallet-card__balance-skeleton',
                                 } })), !tokenBalancesLoading && (jsxRuntime.jsxs("div", { className: classNames.classNames('fund-from-wallet__content__wallet-card__balance', {
                                     'fund-from-wallet__content__wallet-card__balance--disable-select': disableTokenSelect,
@@ -345,11 +345,11 @@ const ReceiveExternalWalletFunds = ({ amount: initialAmount, token: initialToken
                                                     value: (_j = secondaryBalance.value) !== null && _j !== void 0 ? _j : consts.UNAVAILABLE_VALUE,
                                                     withFixedZeros: isFiatToken.isFiatOrStablecoin(secondaryBalance.symbol),
                                                 }) })] }), !disableTokenSelect && (jsxRuntime.jsx(Icon.Icon, { color: 'text-tertiary', size: 'small', className: 'fund-from-wallet__content__wallet-card__balance__icon', children: jsxRuntime.jsx(chevronDown.ReactComponent, { "data-testid": 'token-select-dropdown' }) }))] }))] })] }), jsxRuntime.jsx(TypographyButton.TypographyButton, { dataTestId: 'confirm-button', buttonVariant: 'brand-primary', buttonPadding: 'large', typographyProps: { color: 'white' }, className: 'fund-from-wallet__confirm-button', disabled: disableSubmit, onClick: () => handleSubmit({
-                    externalWallet,
                     tokenAmount,
                     tokenBalances,
                     tokenSymbol,
-                }), children: t('dyn_wallet_funding.from_external_wallet.funding_view.confirm_button') })] }));
+                    wallet,
+                }), children: t('dyn_wallet_funding.from_wallet.amount_input.confirm_button') })] }));
 };
 
-exports.ReceiveExternalWalletFunds = ReceiveExternalWalletFunds;
+exports.ReceiveWalletFunds = ReceiveWalletFunds;

package/src/lib/widgets/DynamicWidget/views/ReceiveWalletFunds/ReceiveWalletFunds.d.ts

@@ -0,0 +1,3 @@
+import { FC } from 'react';
+import { ReceiveWalletFundsProps } from './types';
+export declare const ReceiveWalletFunds: FC<ReceiveWalletFundsProps>;

package/src/lib/widgets/DynamicWidget/views/{ReceiveExternalWalletFunds/ReceiveExternalWalletFunds.js → ReceiveWalletFunds/ReceiveWalletFunds.js}

@@ -109,7 +109,7 @@ import { isFiatOrStablecoin, isFiatToken } from './utils/isFiatToken/isFiatToken
 import { isNonZero } from './utils/isNonZero/isNonZero.js';
 import { respectsMinimum } from './utils/respectsMinimum/respectsMinimum.js';
 import { useExchangeRatesForFunding } from './utils/useExchangeRatesForFunding/useExchangeRatesForFunding.js';
-import { useSubmitExternalWalletFunding } from './utils/useSubmitExternalWalletFunding/useSubmitExternalWalletFunding.js';
+import { useSubmitWalletFunding } from './utils/useSubmitWalletFunding/useSubmitWalletFunding.js';
 import { useTokensForFunding } from './utils/useTokensForFunding/useTokensForFunding.js';
 import { calculateFiatBalance } from './utils/calculateFiatBalance/calculateFiatBalance.js';
 
@@ -120,7 +120,7 @@ const defaultQuickSuggestions = {
 const rulesThatHideQuickSuggestions = ['exact', 'minimum'];
 const rulesThatDisableTokenSelect = ['exact', 'exact-with-amount'];
 const inputEmitter = createFormattedInputEmitter();
-const ReceiveExternalWalletFunds = ({ amount: initialAmount, token: initialTokenRaw, externalWallet, quickSuggestions = defaultQuickSuggestions, }) => {
+const ReceiveWalletFunds = ({ amount: initialAmount, token: initialTokenRaw, wallet, quickSuggestions = defaultQuickSuggestions, }) => {
     var _a, _b, _c, _d, _e, _f, _g, _h, _j;
     // For now we hardcode the default value, soon we will fetch this from project settings
     const initialToken = initialTokenRaw !== null && initialTokenRaw !== void 0 ? initialTokenRaw : {
@@ -142,7 +142,7 @@ const ReceiveExternalWalletFunds = ({ amount: initialAmount, token: initialToken
     const [conversionErrorIconRef, setConversionErrorIconRef] = useState(null);
     const { setDynamicWidgetView } = useWidgetContext();
     const { isLoading: tokenBalancesLoading, tokens: tokenBalances } = useTokensForFunding({
-        wallet: externalWallet,
+        wallet: wallet,
     });
     const exchangeRates = useExchangeRatesForFunding({
         // Initialize amounts after exchange rates are fetched
@@ -254,10 +254,10 @@ const ReceiveExternalWalletFunds = ({ amount: initialAmount, token: initialToken
                 value: (_e = currentToken === null || currentToken === void 0 ? void 0 : currentToken.balance) !== null && _e !== void 0 ? _e : 0,
             },
         ];
-    const showNotEnoughBalance = Boolean(!currentToken ||
-        (isNonZero(tokenAmount) &&
-            tokenAmount !== undefined &&
-            currentToken.balance < parseFloat(tokenAmount)));
+    const showNotEnoughBalance = Boolean(!tokenBalancesLoading &&
+        isNonZero(tokenAmount) &&
+        tokenAmount !== undefined &&
+        (!currentToken || currentToken.balance < parseFloat(tokenAmount)));
     const showMinimumRequired = Boolean(!isMinimumRespected && !showNotEnoughBalance);
     const showQuickSuggestions = quickSuggestionsParsed.length > 0 &&
         !hasUserInteracted &&
@@ -282,7 +282,7 @@ const ReceiveExternalWalletFunds = ({ amount: initialAmount, token: initialToken
         setAmountsByFiatValue,
         setAmountsByTokenValue,
     ]);
-    const handleSubmit = useSubmitExternalWalletFunding();
+    const handleSubmit = useSubmitWalletFunding();
     const disableSubmit = !isMinimumRespected || showNotEnoughBalance || !isNonZero(tokenAmount);
     const closeTokenSelect = useCallback(() => {
         setShowTokenSelect(false);
@@ -297,9 +297,9 @@ const ReceiveExternalWalletFunds = ({ amount: initialAmount, token: initialToken
     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: 'fund-from-wallet', children: [!disableTokenSelect && (jsx(TokenSelectScreen, { onClose: closeTokenSelect, onSelectToken: handleSelectToken, tokens: tokenBalances !== null && tokenBalances !== void 0 ? tokenBalances : [], currentToken: tokenSymbol, className: classNames('fund-from-wallet__token-select', {
                     'fund-from-wallet__token-select--open': showTokenSelect,
-                }), showTokenAsPrimary: showTokenAsPrimary, exchangeRates: exchangeRates })), jsx(ModalHeader, { leading: backButton, children: jsx(Typography, { variant: 'title', children: t('dyn_wallet_funding.from_external_wallet.funding_view.title') }) }), jsxs("div", { className: 'fund-from-wallet__content', children: [jsxs("div", { className: 'fund-from-wallet__content__amount-container', children: [minimum && (jsx(Typography, { color: 'error-1', className: classNames('fund-from-wallet__content__amount-container__minimum-error', {
+                }), showTokenAsPrimary: showTokenAsPrimary, exchangeRates: exchangeRates })), jsx(ModalHeader, { leading: backButton, children: jsx(Typography, { variant: 'title', children: t('dyn_wallet_funding.from_wallet.amount_input.title') }) }), jsxs("div", { className: 'fund-from-wallet__content', children: [jsxs("div", { className: 'fund-from-wallet__content__amount-container', children: [minimum && (jsx(Typography, { color: 'error-1', className: classNames('fund-from-wallet__content__amount-container__minimum-error', {
                                     'fund-from-wallet__content__amount-container__minimum-error--visible': showMinimumRequired,
-                                }), variant: 'body_normal', weight: 'medium', children: t('dyn_wallet_funding.from_external_wallet.funding_view.minimum_error', {
+                                }), variant: 'body_normal', weight: 'medium', children: t('dyn_wallet_funding.from_wallet.amount_input.minimum_error', {
                                     minimum: formatValue({
                                         symbol: minimum.token,
                                         value: minimum.value,
@@ -320,9 +320,9 @@ const ReceiveExternalWalletFunds = ({ amount: initialAmount, token: initialToken
                                         }), children: secondaryDisplay }), jsx(Icon, { size: 'small', color: 'text-secondary', className: 'fund-from-wallet__content__amount-container__secondary-amount-container__switch', children: jsx(SvgSwitchToggle, { "data-testid": 'switch-primary-and-secondary', onClick: switchPrimaryAndSecondary }) })] })), !showQuickSuggestions && !secondaryDisplay && (jsxs("div", { className: 'fund-from-wallet__content__amount-container__secondary-missing', children: [jsx(Typography, { weight: 'medium', children: formatValue({
                                             symbol: secondaryData.symbol,
                                             value: UNAVAILABLE_VALUE,
-                                        }) }), jsx("div", { ref: setConversionErrorIconRef, children: jsx(Icon, { size: 'medium', color: 'text-tertiary', children: jsx(SvgFooterInfoIcon, {}) }) }), jsx(Tooltip, { content: t('dyn_wallet_funding.from_external_wallet.funding_view.pricing_unavailable'), targetRef: conversionErrorIconRef, className: 'fund-from-wallet__content__amount-container__secondary-missing__tooltip' })] })), jsx(Typography, { color: 'error-1', className: classNames('fund-from-wallet__content__amount-container__balance-error', {
+                                        }) }), jsx("div", { ref: setConversionErrorIconRef, children: jsx(Icon, { size: 'medium', color: 'text-tertiary', children: jsx(SvgFooterInfoIcon, {}) }) }), jsx(Tooltip, { content: t('dyn_wallet_funding.from_wallet.amount_input.pricing_unavailable'), targetRef: conversionErrorIconRef, className: 'fund-from-wallet__content__amount-container__secondary-missing__tooltip' })] })), jsx(Typography, { color: 'error-1', className: classNames('fund-from-wallet__content__amount-container__balance-error', {
                                     'fund-from-wallet__content__amount-container__balance-error--visible': showNotEnoughBalance,
-                                }), variant: 'body_normal', weight: 'medium', children: t('dyn_wallet_funding.from_external_wallet.funding_view.balance_error') })] }), jsxs("div", { className: 'fund-from-wallet__content__wallet-card', children: [jsxs("div", { className: 'fund-from-wallet__content__wallet-card__wallet-details', children: [jsx(WalletIcon, { icon: externalWallet.connector.metadata.icon, walletKey: externalWallet.connector.key, className: 'fund-from-wallet__content__wallet-card__wallet-details__icon' }), jsxs("div", { className: 'fund-from-wallet__content__wallet-card__wallet-details__rows', children: [jsx(Typography, { variant: 'body_small', weight: 'medium', children: t('dyn_wallet_funding.from_external_wallet.funding_view.wallet_detail_from') }), jsx(Typography, { variant: 'body_small', color: 'secondary', weight: 'medium', children: shortenWalletAddress(externalWallet.address) })] })] }), tokenBalancesLoading && (jsx(Skeleton, { dataTestId: 'balance-skeleton', container: {
+                                }), variant: 'body_normal', weight: 'medium', children: t('dyn_wallet_funding.from_wallet.amount_input.balance_error') })] }), jsxs("div", { className: 'fund-from-wallet__content__wallet-card', children: [jsxs("div", { className: 'fund-from-wallet__content__wallet-card__wallet-details', children: [jsx(WalletIcon, { icon: wallet.connector.metadata.icon, walletKey: wallet.connector.key, className: 'fund-from-wallet__content__wallet-card__wallet-details__icon' }), jsxs("div", { className: 'fund-from-wallet__content__wallet-card__wallet-details__rows', children: [jsx(Typography, { variant: 'body_small', weight: 'medium', children: t('dyn_wallet_funding.from_wallet.amount_input.wallet_detail_from') }), jsx(Typography, { variant: 'body_small', color: 'secondary', weight: 'medium', children: shortenWalletAddress(wallet.address) })] })] }), tokenBalancesLoading && (jsx(Skeleton, { dataTestId: 'balance-skeleton', container: {
                                     className: 'fund-from-wallet__content__wallet-card__balance-skeleton',
                                 } })), !tokenBalancesLoading && (jsxs("div", { className: classNames('fund-from-wallet__content__wallet-card__balance', {
                                     'fund-from-wallet__content__wallet-card__balance--disable-select': disableTokenSelect,
@@ -341,11 +341,11 @@ const ReceiveExternalWalletFunds = ({ amount: initialAmount, token: initialToken
                                                     value: (_j = secondaryBalance.value) !== null && _j !== void 0 ? _j : UNAVAILABLE_VALUE,
                                                     withFixedZeros: isFiatOrStablecoin(secondaryBalance.symbol),
                                                 }) })] }), !disableTokenSelect && (jsx(Icon, { color: 'text-tertiary', size: 'small', className: 'fund-from-wallet__content__wallet-card__balance__icon', children: jsx(SvgChevronDown, { "data-testid": 'token-select-dropdown' }) }))] }))] })] }), jsx(TypographyButton, { dataTestId: 'confirm-button', buttonVariant: 'brand-primary', buttonPadding: 'large', typographyProps: { color: 'white' }, className: 'fund-from-wallet__confirm-button', disabled: disableSubmit, onClick: () => handleSubmit({
-                    externalWallet,
                     tokenAmount,
                     tokenBalances,
                     tokenSymbol,
-                }), children: t('dyn_wallet_funding.from_external_wallet.funding_view.confirm_button') })] }));
+                    wallet,
+                }), children: t('dyn_wallet_funding.from_wallet.amount_input.confirm_button') })] }));
 };
 
-export { ReceiveExternalWalletFunds };
+export { ReceiveWalletFunds };

package/src/lib/widgets/DynamicWidget/views/{ReceiveExternalWalletFunds → ReceiveWalletFunds}/TokenSelectScreen/TokenOption/TokenOption.cjs

@@ -80,7 +80,7 @@ require('../../../../../../context/PasskeyContext/PasskeyContext.cjs');
 require('../../../ManagePasskeysWidgetView/PasskeyCard/PasskeyCard.cjs');
 require('../../../../../../context/OnrampContext/OnrampContext.cjs');
 require('qrcode');
-require('../../ReceiveExternalWalletFunds.cjs');
+require('../../ReceiveWalletFunds.cjs');
 require('../../../../../../../index.cjs');
 require('../../../../../../context/IpConfigurationContext/IpConfigurationContext.cjs');
 require('../../../../../../context/ConnectWithOtpContext/ConnectWithOtpContext.cjs');

package/src/lib/widgets/DynamicWidget/views/{ReceiveExternalWalletFunds → ReceiveWalletFunds}/TokenSelectScreen/TokenOption/TokenOption.js

@@ -76,7 +76,7 @@ import '../../../../../../context/PasskeyContext/PasskeyContext.js';
 import '../../../ManagePasskeysWidgetView/PasskeyCard/PasskeyCard.js';
 import '../../../../../../context/OnrampContext/OnrampContext.js';
 import 'qrcode';
-import '../../ReceiveExternalWalletFunds.js';
+import '../../ReceiveWalletFunds.js';
 import '../../../../../../../index.js';
 import '../../../../../../context/IpConfigurationContext/IpConfigurationContext.js';
 import '../../../../../../context/ConnectWithOtpContext/ConnectWithOtpContext.js';

package/src/lib/widgets/DynamicWidget/views/{ReceiveExternalWalletFunds → ReceiveWalletFunds}/TokenSelectScreen/TokenSelectScreen.cjs

@@ -85,7 +85,7 @@ require('../../ManagePasskeysWidgetView/PasskeyCard/PasskeyCard.cjs');
 var LinearGradientFrame = require('../../../../../components/LinearGradientFrame/LinearGradientFrame.cjs');
 require('../../../../../context/OnrampContext/OnrampContext.cjs');
 require('qrcode');
-require('../ReceiveExternalWalletFunds.cjs');
+require('../ReceiveWalletFunds.cjs');
 require('../../../../../../index.cjs');
 require('../../../../../context/IpConfigurationContext/IpConfigurationContext.cjs');
 require('../../../../../context/ConnectWithOtpContext/ConnectWithOtpContext.cjs');
@@ -114,8 +114,8 @@ const TokenSelectScreen = ({ onClose, onSelectToken, currentToken, tokens, class
     const noAssets = tokens.length === 0;
     const closeButton = (jsxRuntime.jsx(IconButton.IconButton, { type: 'button', id: 'close-button', "data-testid": 'close-button', onClick: onClose, children: jsxRuntime.jsx(close.ReactComponent, {}) }));
     return (jsxRuntime.jsxs("div", { className: classNames.classNames('token-select', className), style: style, "data-testid": 'token-select', children: [jsxRuntime.jsx(ModalHeader.ModalHeader, { trailing: closeButton, children: jsxRuntime.jsx(Typography.Typography, { variant: 'title', children: t(noAssets
-                        ? 'dyn_wallet_funding.from_external_wallet.token_select.no_assets_title'
-                        : 'dyn_wallet_funding.from_external_wallet.token_select.title') }) }), noAssets && (jsxRuntime.jsxs("div", { className: 'token-select__no-assets', children: [jsxRuntime.jsx(LinearGradientFrame.LinearGradientFrame, { Icon: jsxRuntime.jsx(walletIllustration.ReactComponent, {}) }), jsxRuntime.jsx(Typography.Typography, { variant: 'title', color: 'secondary', weight: 'medium', children: t('dyn_wallet_funding.from_external_wallet.token_select.no_assets_description') })] })), !noAssets && (jsxRuntime.jsxs(jsxRuntime.Fragment, { children: [jsxRuntime.jsxs("label", { htmlFor: 'token-select-search', className: 'token-select__search', children: [jsxRuntime.jsx(Icon.Icon, { color: 'text-tertiary', size: 'small', children: jsxRuntime.jsx(search.ReactComponent, {}) }), jsxRuntime.jsx("input", { id: 'token-select-search', placeholder: t('dyn_wallet_funding.from_external_wallet.token_select.search_placeholder'), className: 'token-select__search__input', value: search$1, onChange: (e) => setSearch(e.target.value) })] }), jsxRuntime.jsx("div", { className: 'token-select__tokens', children: filteredTokens.map((token) => (jsxRuntime.jsx(TokenOption.TokenOption, { token: token, isSelected: token.symbol === currentToken, onSelect: () => onSelectToken(token.symbol), showTokenAsPrimary: showTokenAsPrimary, exchangeRates: exchangeRates }, token.symbol))) })] }))] }));
+                        ? 'dyn_wallet_funding.from_wallet.token_select.no_assets_title'
+                        : 'dyn_wallet_funding.from_wallet.token_select.title') }) }), noAssets && (jsxRuntime.jsxs("div", { className: 'token-select__no-assets', children: [jsxRuntime.jsx(LinearGradientFrame.LinearGradientFrame, { Icon: jsxRuntime.jsx(walletIllustration.ReactComponent, {}) }), jsxRuntime.jsx(Typography.Typography, { variant: 'title', color: 'secondary', weight: 'medium', children: t('dyn_wallet_funding.from_wallet.token_select.no_assets_description') })] })), !noAssets && (jsxRuntime.jsxs(jsxRuntime.Fragment, { children: [jsxRuntime.jsxs("label", { htmlFor: 'token-select-search', className: 'token-select__search', children: [jsxRuntime.jsx(Icon.Icon, { color: 'text-tertiary', size: 'small', children: jsxRuntime.jsx(search.ReactComponent, {}) }), jsxRuntime.jsx("input", { id: 'token-select-search', placeholder: t('dyn_wallet_funding.from_wallet.token_select.search_placeholder'), className: 'token-select__search__input', value: search$1, onChange: (e) => setSearch(e.target.value) })] }), jsxRuntime.jsx("div", { className: 'token-select__tokens', children: filteredTokens.map((token) => (jsxRuntime.jsx(TokenOption.TokenOption, { token: token, isSelected: token.symbol === currentToken, onSelect: () => onSelectToken(token.symbol), showTokenAsPrimary: showTokenAsPrimary, exchangeRates: exchangeRates }, token.symbol))) })] }))] }));
 };
 
 exports.TokenSelectScreen = TokenSelectScreen;

package/src/lib/widgets/DynamicWidget/views/{ReceiveExternalWalletFunds → ReceiveWalletFunds}/TokenSelectScreen/TokenSelectScreen.js

@@ -81,7 +81,7 @@ import '../../ManagePasskeysWidgetView/PasskeyCard/PasskeyCard.js';
 import { LinearGradientFrame } from '../../../../../components/LinearGradientFrame/LinearGradientFrame.js';
 import '../../../../../context/OnrampContext/OnrampContext.js';
 import 'qrcode';
-import '../ReceiveExternalWalletFunds.js';
+import '../ReceiveWalletFunds.js';
 import '../../../../../../index.js';
 import '../../../../../context/IpConfigurationContext/IpConfigurationContext.js';
 import '../../../../../context/ConnectWithOtpContext/ConnectWithOtpContext.js';
@@ -110,8 +110,8 @@ const TokenSelectScreen = ({ onClose, onSelectToken, currentToken, tokens, class
     const noAssets = tokens.length === 0;
     const closeButton = (jsx(IconButton, { type: 'button', id: 'close-button', "data-testid": 'close-button', onClick: onClose, children: jsx(SvgClose, {}) }));
     return (jsxs("div", { className: classNames('token-select', className), style: style, "data-testid": 'token-select', children: [jsx(ModalHeader, { trailing: closeButton, children: jsx(Typography, { variant: 'title', children: t(noAssets
-                        ? 'dyn_wallet_funding.from_external_wallet.token_select.no_assets_title'
-                        : 'dyn_wallet_funding.from_external_wallet.token_select.title') }) }), noAssets && (jsxs("div", { className: 'token-select__no-assets', children: [jsx(LinearGradientFrame, { Icon: jsx(SvgWalletIllustration, {}) }), jsx(Typography, { variant: 'title', color: 'secondary', weight: 'medium', children: t('dyn_wallet_funding.from_external_wallet.token_select.no_assets_description') })] })), !noAssets && (jsxs(Fragment, { children: [jsxs("label", { htmlFor: 'token-select-search', className: 'token-select__search', children: [jsx(Icon, { color: 'text-tertiary', size: 'small', children: jsx(SvgSearch, {}) }), jsx("input", { id: 'token-select-search', placeholder: t('dyn_wallet_funding.from_external_wallet.token_select.search_placeholder'), className: 'token-select__search__input', value: search, onChange: (e) => setSearch(e.target.value) })] }), jsx("div", { className: 'token-select__tokens', children: filteredTokens.map((token) => (jsx(TokenOption, { token: token, isSelected: token.symbol === currentToken, onSelect: () => onSelectToken(token.symbol), showTokenAsPrimary: showTokenAsPrimary, exchangeRates: exchangeRates }, token.symbol))) })] }))] }));
+                        ? 'dyn_wallet_funding.from_wallet.token_select.no_assets_title'
+                        : 'dyn_wallet_funding.from_wallet.token_select.title') }) }), noAssets && (jsxs("div", { className: 'token-select__no-assets', children: [jsx(LinearGradientFrame, { Icon: jsx(SvgWalletIllustration, {}) }), jsx(Typography, { variant: 'title', color: 'secondary', weight: 'medium', children: t('dyn_wallet_funding.from_wallet.token_select.no_assets_description') })] })), !noAssets && (jsxs(Fragment, { children: [jsxs("label", { htmlFor: 'token-select-search', className: 'token-select__search', children: [jsx(Icon, { color: 'text-tertiary', size: 'small', children: jsx(SvgSearch, {}) }), jsx("input", { id: 'token-select-search', placeholder: t('dyn_wallet_funding.from_wallet.token_select.search_placeholder'), className: 'token-select__search__input', value: search, onChange: (e) => setSearch(e.target.value) })] }), jsx("div", { className: 'token-select__tokens', children: filteredTokens.map((token) => (jsx(TokenOption, { token: token, isSelected: token.symbol === currentToken, onSelect: () => onSelectToken(token.symbol), showTokenAsPrimary: showTokenAsPrimary, exchangeRates: exchangeRates }, token.symbol))) })] }))] }));
 };
 
 export { TokenSelectScreen };

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

@@ -0,0 +1 @@
+export * from './ReceiveWalletFunds';

package/src/lib/widgets/DynamicWidget/views/{ReceiveExternalWalletFunds → ReceiveWalletFunds}/types.d.ts

@@ -30,8 +30,8 @@ export type FundingAmountRule = 'exact' | 'minimum' | 'recommended';
  */
 export type FundingTokenRule = 'exact' | 'recommended' | 'exact-with-amount';
 export type FiatToken = 'USD';
-export type ReceiveExternalWalletFundsProps = {
-    externalWallet: Wallet;
+export type ReceiveWalletFundsProps = {
+    wallet: Wallet;
     /**
      * Configure the amount input.
      *

package/src/lib/widgets/DynamicWidget/views/ReceiveWalletFunds/utils/useSubmitWalletFunding/index.d.ts

@@ -0,0 +1 @@
+export * from './useSubmitWalletFunding';

package/src/lib/widgets/DynamicWidget/views/{ReceiveExternalWalletFunds/utils/useSubmitExternalWalletFunding/useSubmitExternalWalletFunding.cjs → ReceiveWalletFunds/utils/useSubmitWalletFunding/useSubmitWalletFunding.cjs}

@@ -13,11 +13,11 @@ var pixelToRem = require('../../../../../../utils/functions/pixelToRem/pixelToRe
 var useFundWithWallet = require('../../../../../../utils/hooks/useFundWithWallet/useFundWithWallet.cjs');
 var DynamicWidgetContext = require('../../../../context/DynamicWidgetContext.cjs');
 
-const useSubmitExternalWalletFunding = () => {
-    const { fund } = useFundWithWallet.useFundWithWallet();
+const useSubmitWalletFunding = () => {
+    const { fund } = useFundWithWallet.useInternalFundWithWallet();
     const { goToInitialDynamicWidgetView, setHeaderAlert } = DynamicWidgetContext.useWidgetContext();
     const { t } = reactI18next.useTranslation();
-    return React.useCallback((_a) => _tslib.__awaiter(void 0, [_a], void 0, function* ({ tokenAmount, externalWallet, tokenSymbol, tokenBalances, }) {
+    return React.useCallback((_a) => _tslib.__awaiter(void 0, [_a], void 0, function* ({ tokenAmount, wallet, tokenSymbol, tokenBalances, }) {
         var _b;
         if (!tokenAmount)
             return;
@@ -30,11 +30,11 @@ const useSubmitExternalWalletFunding = () => {
         try {
             const txId = yield fund({
                 amount: parseFloat(tokenAmount),
-                fromWallet: externalWallet,
+                fromWallet: wallet,
                 token: token === 'native' ? undefined : token,
             });
-            logger.logger.info(`Funding with external wallet succeeded with transaction id: ${txId}`);
-            const blockExplorerUrl = (yield externalWallet.connector.getBlockExplorerUrlsForCurrentNetwork())[0];
+            logger.logger.info(`Funding with wallet succeeded with transaction id: ${txId}`);
+            const blockExplorerUrl = (yield wallet.connector.getBlockExplorerUrlsForCurrentNetwork())[0];
             const TxnSuccessAlert = (jsxRuntime.jsxs(Typography.Typography, { variant: 'body_normal', color: 'current-color', children: [t('dyn_wallet_funding.success'), blockExplorerUrl && (jsxRuntime.jsx(Typography.Typography, { as: 'a', href: `${blockExplorerUrl}/tx/${txId}`, target: '_blank', rel: 'noreferrer', style: {
                             marginLeft: pixelToRem.pixelToRem(4),
                             textDecoration: 'underline',
@@ -48,9 +48,9 @@ const useSubmitExternalWalletFunding = () => {
             });
         }
         catch (error) {
-            logger.logger.error('Failed to fund with external wallet', error);
+            logger.logger.error('Failed to fund with wallet', error);
         }
     }), [fund, goToInitialDynamicWidgetView, setHeaderAlert, t]);
 };
 
-exports.useSubmitExternalWalletFunding = useSubmitExternalWalletFunding;
+exports.useSubmitWalletFunding = useSubmitWalletFunding;

package/src/lib/widgets/DynamicWidget/views/ReceiveWalletFunds/utils/useSubmitWalletFunding/useSubmitWalletFunding.d.ts

@@ -0,0 +1,9 @@
+import { Wallet } from '@dynamic-labs/wallet-connector-core';
+import { FundingTokenData } from '../../types';
+export type SubmitWalletFundingProps = {
+    tokenAmount: string | undefined;
+    wallet: Wallet;
+    tokenSymbol: string;
+    tokenBalances: FundingTokenData[];
+};
+export declare const useSubmitWalletFunding: () => ({ tokenAmount, wallet, tokenSymbol, tokenBalances, }: SubmitWalletFundingProps) => Promise<void>;

package/src/lib/widgets/DynamicWidget/views/{ReceiveExternalWalletFunds/utils/useSubmitExternalWalletFunding/useSubmitExternalWalletFunding.js → ReceiveWalletFunds/utils/useSubmitWalletFunding/useSubmitWalletFunding.js}

@@ -6,14 +6,14 @@ import { useTranslation } from 'react-i18next';
 import { Typography } from '../../../../../../components/Typography/Typography.js';
 import { logger } from '../../../../../../shared/logger.js';
 import { pixelToRem } from '../../../../../../utils/functions/pixelToRem/pixelToRem.js';
-import { useFundWithWallet } from '../../../../../../utils/hooks/useFundWithWallet/useFundWithWallet.js';
+import { useInternalFundWithWallet } from '../../../../../../utils/hooks/useFundWithWallet/useFundWithWallet.js';
 import { useWidgetContext } from '../../../../context/DynamicWidgetContext.js';
 
-const useSubmitExternalWalletFunding = () => {
-    const { fund } = useFundWithWallet();
+const useSubmitWalletFunding = () => {
+    const { fund } = useInternalFundWithWallet();
     const { goToInitialDynamicWidgetView, setHeaderAlert } = useWidgetContext();
     const { t } = useTranslation();
-    return useCallback((_a) => __awaiter(void 0, [_a], void 0, function* ({ tokenAmount, externalWallet, tokenSymbol, tokenBalances, }) {
+    return useCallback((_a) => __awaiter(void 0, [_a], void 0, function* ({ tokenAmount, wallet, tokenSymbol, tokenBalances, }) {
         var _b;
         if (!tokenAmount)
             return;
@@ -26,11 +26,11 @@ const useSubmitExternalWalletFunding = () => {
         try {
             const txId = yield fund({
                 amount: parseFloat(tokenAmount),
-                fromWallet: externalWallet,
+                fromWallet: wallet,
                 token: token === 'native' ? undefined : token,
             });
-            logger.info(`Funding with external wallet succeeded with transaction id: ${txId}`);
-            const blockExplorerUrl = (yield externalWallet.connector.getBlockExplorerUrlsForCurrentNetwork())[0];
+            logger.info(`Funding with wallet succeeded with transaction id: ${txId}`);
+            const blockExplorerUrl = (yield wallet.connector.getBlockExplorerUrlsForCurrentNetwork())[0];
             const TxnSuccessAlert = (jsxs(Typography, { variant: 'body_normal', color: 'current-color', children: [t('dyn_wallet_funding.success'), blockExplorerUrl && (jsx(Typography, { as: 'a', href: `${blockExplorerUrl}/tx/${txId}`, target: '_blank', rel: 'noreferrer', style: {
                             marginLeft: pixelToRem(4),
                             textDecoration: 'underline',
@@ -44,9 +44,9 @@ const useSubmitExternalWalletFunding = () => {
             });
         }
         catch (error) {
-            logger.error('Failed to fund with external wallet', error);
+            logger.error('Failed to fund with wallet', error);
         }
     }), [fund, goToInitialDynamicWidgetView, setHeaderAlert, t]);
 };
 
-export { useSubmitExternalWalletFunding };
+export { useSubmitWalletFunding };

package/src/lib/widgets/DynamicWidget/views/{ReceiveExternalWalletFunds → ReceiveWalletFunds}/utils/useTokensForFunding/useTokensForFunding.cjs

@@ -89,7 +89,7 @@ require('../../../../components/DynamicWidgetHeader/DynamicWidgetHeader.cjs');
 require('../../../../../../views/TransactionConfirmationView/TransactionConfirmationView.cjs');
 require('../../../ManagePasskeysWidgetView/PasskeyCard/PasskeyCard.cjs');
 require('../../../../../../context/OnrampContext/OnrampContext.cjs');
-require('../../ReceiveExternalWalletFunds.cjs');
+require('../../ReceiveWalletFunds.cjs');
 require('../../../../../../../index.cjs');
 var useTokenBalances = require('../../../../../../utils/hooks/useTokenBalances/useTokenBalances.cjs');
 require('../../../../../../shared/utils/functions/getInitialUrl/getInitialUrl.cjs');

package/src/lib/widgets/DynamicWidget/views/{ReceiveExternalWalletFunds → ReceiveWalletFunds}/utils/useTokensForFunding/useTokensForFunding.js

@@ -85,7 +85,7 @@ import '../../../../components/DynamicWidgetHeader/DynamicWidgetHeader.js';
 import '../../../../../../views/TransactionConfirmationView/TransactionConfirmationView.js';
 import '../../../ManagePasskeysWidgetView/PasskeyCard/PasskeyCard.js';
 import '../../../../../../context/OnrampContext/OnrampContext.js';
-import '../../ReceiveExternalWalletFunds.js';
+import '../../ReceiveWalletFunds.js';
 import '../../../../../../../index.js';
 import { useTokenBalances } from '../../../../../../utils/hooks/useTokenBalances/useTokenBalances.js';
 import '../../../../../../shared/utils/functions/getInitialUrl/getInitialUrl.js';