@dynamic-labs/sdk-react-core 4.25.8 → 4.25.10

package/src/lib/utils/hooks/useEmailProvider/useEmailProvider.js

@@ -93,8 +93,8 @@ import '../../../widgets/DynamicWidget/components/DynamicWidgetHeader/DynamicWid
 import '../../../views/TransactionConfirmationView/TransactionConfirmationView.js';
 import '../../../widgets/DynamicWidget/components/PasskeyCard/PasskeyCard.js';
 import '../../../context/OnrampContext/OnrampContext.js';
-import '../../../widgets/DynamicWidget/views/ReceiveWalletFunds/ReceiveWalletFunds.js';
 import '../../../../index.js';
+import '../../../widgets/DynamicWidget/views/ReceiveWalletFunds/ReceiveWalletFunds.js';
 import '../../../store/state/tokenBalances.js';
 import '../../../store/state/multichainBalances.js';
 import '../../../shared/utils/functions/getInitialUrl/getInitialUrl.js';

package/src/lib/utils/hooks/useEmbeddedReveal/useEmbeddedReveal.cjs

@@ -99,8 +99,8 @@ require('../../../widgets/DynamicWidget/components/DynamicWidgetHeader/DynamicWi
 require('../../../views/TransactionConfirmationView/TransactionConfirmationView.cjs');
 require('../../../widgets/DynamicWidget/components/PasskeyCard/PasskeyCard.cjs');
 require('../../../context/OnrampContext/OnrampContext.cjs');
-require('../../../widgets/DynamicWidget/views/ReceiveWalletFunds/ReceiveWalletFunds.cjs');
 require('../../../../index.cjs');
+require('../../../widgets/DynamicWidget/views/ReceiveWalletFunds/ReceiveWalletFunds.cjs');
 require('../../../store/state/tokenBalances.cjs');
 require('../../../store/state/multichainBalances.cjs');
 require('../../../shared/utils/functions/getInitialUrl/getInitialUrl.cjs');

package/src/lib/utils/hooks/useEmbeddedReveal/useEmbeddedReveal.js

@@ -95,8 +95,8 @@ import '../../../widgets/DynamicWidget/components/DynamicWidgetHeader/DynamicWid
 import '../../../views/TransactionConfirmationView/TransactionConfirmationView.js';
 import '../../../widgets/DynamicWidget/components/PasskeyCard/PasskeyCard.js';
 import '../../../context/OnrampContext/OnrampContext.js';
-import '../../../widgets/DynamicWidget/views/ReceiveWalletFunds/ReceiveWalletFunds.js';
 import '../../../../index.js';
+import '../../../widgets/DynamicWidget/views/ReceiveWalletFunds/ReceiveWalletFunds.js';
 import '../../../store/state/tokenBalances.js';
 import '../../../store/state/multichainBalances.js';
 import '../../../shared/utils/functions/getInitialUrl/getInitialUrl.js';

package/src/lib/utils/hooks/useEmbeddedWallet/useEmbeddedWallet.cjs

@@ -103,8 +103,8 @@ require('../../../widgets/DynamicWidget/components/DynamicWidgetHeader/DynamicWi
 require('../../../views/TransactionConfirmationView/TransactionConfirmationView.cjs');
 require('../../../widgets/DynamicWidget/components/PasskeyCard/PasskeyCard.cjs');
 require('../../../context/OnrampContext/OnrampContext.cjs');
-require('../../../widgets/DynamicWidget/views/ReceiveWalletFunds/ReceiveWalletFunds.cjs');
 require('../../../../index.cjs');
+require('../../../widgets/DynamicWidget/views/ReceiveWalletFunds/ReceiveWalletFunds.cjs');
 require('../../../store/state/tokenBalances.cjs');
 require('../../../store/state/multichainBalances.cjs');
 require('../../../shared/utils/functions/getInitialUrl/getInitialUrl.cjs');

package/src/lib/utils/hooks/useEmbeddedWallet/useEmbeddedWallet.js

@@ -99,8 +99,8 @@ import '../../../widgets/DynamicWidget/components/DynamicWidgetHeader/DynamicWid
 import '../../../views/TransactionConfirmationView/TransactionConfirmationView.js';
 import '../../../widgets/DynamicWidget/components/PasskeyCard/PasskeyCard.js';
 import '../../../context/OnrampContext/OnrampContext.js';
-import '../../../widgets/DynamicWidget/views/ReceiveWalletFunds/ReceiveWalletFunds.js';
 import '../../../../index.js';
+import '../../../widgets/DynamicWidget/views/ReceiveWalletFunds/ReceiveWalletFunds.js';
 import '../../../store/state/tokenBalances.js';
 import '../../../store/state/multichainBalances.js';
 import '../../../shared/utils/functions/getInitialUrl/getInitialUrl.js';

package/src/lib/utils/hooks/useEmbeddedWallet/useSecureEnclaveEmbeddedWallet/useSecureEnclaveEmbeddedWallet.cjs

@@ -117,8 +117,8 @@ require('../../../../widgets/DynamicWidget/components/DynamicWidgetHeader/Dynami
 require('../../../../views/TransactionConfirmationView/TransactionConfirmationView.cjs');
 require('../../../../widgets/DynamicWidget/components/PasskeyCard/PasskeyCard.cjs');
 require('../../../../context/OnrampContext/OnrampContext.cjs');
-require('../../../../widgets/DynamicWidget/views/ReceiveWalletFunds/ReceiveWalletFunds.cjs');
 require('../../../../../index.cjs');
+require('../../../../widgets/DynamicWidget/views/ReceiveWalletFunds/ReceiveWalletFunds.cjs');
 require('../../../../store/state/tokenBalances.cjs');
 require('../../../../store/state/multichainBalances.cjs');
 require('../../../../shared/utils/functions/getInitialUrl/getInitialUrl.cjs');

package/src/lib/utils/hooks/useEmbeddedWallet/useSecureEnclaveEmbeddedWallet/useSecureEnclaveEmbeddedWallet.js

@@ -113,8 +113,8 @@ import '../../../../widgets/DynamicWidget/components/DynamicWidgetHeader/Dynamic
 import '../../../../views/TransactionConfirmationView/TransactionConfirmationView.js';
 import '../../../../widgets/DynamicWidget/components/PasskeyCard/PasskeyCard.js';
 import '../../../../context/OnrampContext/OnrampContext.js';
-import '../../../../widgets/DynamicWidget/views/ReceiveWalletFunds/ReceiveWalletFunds.js';
 import '../../../../../index.js';
+import '../../../../widgets/DynamicWidget/views/ReceiveWalletFunds/ReceiveWalletFunds.js';
 import '../../../../store/state/tokenBalances.js';
 import '../../../../store/state/multichainBalances.js';
 import '../../../../shared/utils/functions/getInitialUrl/getInitialUrl.js';

package/src/lib/utils/hooks/useEmbeddedWallet/useSecureEnclaveEmbeddedWallet/useTurnkey/useTurnkey.cjs

@@ -105,8 +105,8 @@ require('../../../../../widgets/DynamicWidget/components/DynamicWidgetHeader/Dyn
 require('../../../../../views/TransactionConfirmationView/TransactionConfirmationView.cjs');
 require('../../../../../widgets/DynamicWidget/components/PasskeyCard/PasskeyCard.cjs');
 require('../../../../../context/OnrampContext/OnrampContext.cjs');
-require('../../../../../widgets/DynamicWidget/views/ReceiveWalletFunds/ReceiveWalletFunds.cjs');
 require('../../../../../../index.cjs');
+require('../../../../../widgets/DynamicWidget/views/ReceiveWalletFunds/ReceiveWalletFunds.cjs');
 require('../../../../../store/state/tokenBalances.cjs');
 require('../../../../../store/state/multichainBalances.cjs');
 require('../../../../../shared/utils/functions/getInitialUrl/getInitialUrl.cjs');

package/src/lib/utils/hooks/useEmbeddedWallet/useSecureEnclaveEmbeddedWallet/useTurnkey/useTurnkey.js

@@ -101,8 +101,8 @@ import '../../../../../widgets/DynamicWidget/components/DynamicWidgetHeader/Dyna
 import '../../../../../views/TransactionConfirmationView/TransactionConfirmationView.js';
 import '../../../../../widgets/DynamicWidget/components/PasskeyCard/PasskeyCard.js';
 import '../../../../../context/OnrampContext/OnrampContext.js';
-import '../../../../../widgets/DynamicWidget/views/ReceiveWalletFunds/ReceiveWalletFunds.js';
 import '../../../../../../index.js';
+import '../../../../../widgets/DynamicWidget/views/ReceiveWalletFunds/ReceiveWalletFunds.js';
 import '../../../../../store/state/tokenBalances.js';
 import '../../../../../store/state/multichainBalances.js';
 import '../../../../../shared/utils/functions/getInitialUrl/getInitialUrl.js';

package/src/lib/utils/hooks/useEmbeddedWalletAuthenticator/useEmbeddedWalletAuthenticator.cjs

@@ -96,8 +96,8 @@ require('../../../widgets/DynamicWidget/components/DynamicWidgetHeader/DynamicWi
 require('../../../views/TransactionConfirmationView/TransactionConfirmationView.cjs');
 require('../../../widgets/DynamicWidget/components/PasskeyCard/PasskeyCard.cjs');
 require('../../../context/OnrampContext/OnrampContext.cjs');
-require('../../../widgets/DynamicWidget/views/ReceiveWalletFunds/ReceiveWalletFunds.cjs');
 require('../../../../index.cjs');
+require('../../../widgets/DynamicWidget/views/ReceiveWalletFunds/ReceiveWalletFunds.cjs');
 require('../../../store/state/tokenBalances.cjs');
 require('../../../store/state/multichainBalances.cjs');
 require('../../../shared/utils/functions/getInitialUrl/getInitialUrl.cjs');

package/src/lib/utils/hooks/useEmbeddedWalletAuthenticator/useEmbeddedWalletAuthenticator.js

@@ -92,8 +92,8 @@ import '../../../widgets/DynamicWidget/components/DynamicWidgetHeader/DynamicWid
 import '../../../views/TransactionConfirmationView/TransactionConfirmationView.js';
 import '../../../widgets/DynamicWidget/components/PasskeyCard/PasskeyCard.js';
 import '../../../context/OnrampContext/OnrampContext.js';
-import '../../../widgets/DynamicWidget/views/ReceiveWalletFunds/ReceiveWalletFunds.js';
 import '../../../../index.js';
+import '../../../widgets/DynamicWidget/views/ReceiveWalletFunds/ReceiveWalletFunds.js';
 import '../../../store/state/tokenBalances.js';
 import '../../../store/state/multichainBalances.js';
 import '../../../shared/utils/functions/getInitialUrl/getInitialUrl.js';

package/src/lib/utils/hooks/useExchangeAccounts/useExchangeAccounts.cjs

@@ -96,8 +96,8 @@ require('../../../widgets/DynamicWidget/components/DynamicWidgetHeader/DynamicWi
 require('../../../views/TransactionConfirmationView/TransactionConfirmationView.cjs');
 require('../../../widgets/DynamicWidget/components/PasskeyCard/PasskeyCard.cjs');
 require('../../../context/OnrampContext/OnrampContext.cjs');
-require('../../../widgets/DynamicWidget/views/ReceiveWalletFunds/ReceiveWalletFunds.cjs');
 require('../../../../index.cjs');
+require('../../../widgets/DynamicWidget/views/ReceiveWalletFunds/ReceiveWalletFunds.cjs');
 require('../../../store/state/tokenBalances.cjs');
 require('../../../store/state/multichainBalances.cjs');
 require('../../../shared/utils/functions/getInitialUrl/getInitialUrl.cjs');
@@ -106,14 +106,19 @@ var useInternalDynamicContext = require('../../../context/DynamicContext/useDyna
 const useExchangeAccounts = () => {
     const environmentId = dynamicContextProps.getEnvironmentId();
     const { primaryWallet, network } = useInternalDynamicContext.useInternalDynamicContext();
-    const getExchangeUserAccounts = React.useCallback((_a) => _tslib.__awaiter(void 0, [_a], void 0, function* ({ exchange }) {
-        return exchangeAccounts.getUserExchangeAccounts({
-            chainName: primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.connector.connectedChain,
+    const getExchangeUserAccounts = React.useCallback((_a) => _tslib.__awaiter(void 0, [_a], void 0, function* ({ exchange, networkId, chainName, includeChainName = true, }) {
+        const networkToUse = networkId !== null && networkId !== void 0 ? networkId : network;
+        const payload = {
             environmentId,
             exchangeKey: exchange,
-            networkId: network,
-        });
-    }), [primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.connector.connectedChain, environmentId, network]);
+            networkId: networkToUse,
+        };
+        if (includeChainName) {
+            payload.chainName =
+                chainName !== null && chainName !== void 0 ? chainName : primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.connector.connectedChain;
+        }
+        return exchangeAccounts.getUserExchangeAccounts(payload);
+    }), [network, environmentId, primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.connector.connectedChain]);
     const getExchangeTransactions = React.useCallback((_b) => _tslib.__awaiter(void 0, [_b], void 0, function* ({ exchange, accountId, }) {
         return exchangeAccounts.getExchangeAccountTransactions({
             accountId,

package/src/lib/utils/hooks/useExchangeAccounts/useExchangeAccounts.d.ts

@@ -1,7 +1,13 @@
-import { Account, CreateExchangeTransferRequest, ExchangeKeyEnum, ExchangeTransaction, ExchangeTransferResponse, TransferDestinationResponse } from '@dynamic-labs/sdk-api-core';
+import { Account, ChainEnum, CreateExchangeTransferRequest, ExchangeKeyEnum, ExchangeTransaction, ExchangeTransferResponse, TransferDestinationResponse } from '@dynamic-labs/sdk-api-core';
 type Props = {
     exchange: ExchangeKeyEnum;
 };
+type GetAccountsProps = {
+    exchange: ExchangeKeyEnum;
+    networkId?: number;
+    chainName?: ChainEnum;
+    includeChainName?: boolean;
+};
 type TransferProps = {
     exchange: ExchangeKeyEnum;
     transferRequest: CreateExchangeTransferRequest;
@@ -11,7 +17,7 @@ export declare const useExchangeAccounts: () => {
     getExchangeTransactions: ({ exchange, accountId, }: Props & {
         accountId?: string;
     }) => Promise<ExchangeTransaction[]>;
-    getExchangeUserAccounts: ({ exchange }: Props) => Promise<Account[]>;
+    getExchangeUserAccounts: ({ exchange, networkId, chainName, includeChainName, }: GetAccountsProps) => Promise<Account[]>;
     getExchangeWhitelistedDestinations: ({ exchange }: Props) => Promise<TransferDestinationResponse>;
 };
 export {};

package/src/lib/utils/hooks/useExchangeAccounts/useExchangeAccounts.js

@@ -92,8 +92,8 @@ import '../../../widgets/DynamicWidget/components/DynamicWidgetHeader/DynamicWid
 import '../../../views/TransactionConfirmationView/TransactionConfirmationView.js';
 import '../../../widgets/DynamicWidget/components/PasskeyCard/PasskeyCard.js';
 import '../../../context/OnrampContext/OnrampContext.js';
-import '../../../widgets/DynamicWidget/views/ReceiveWalletFunds/ReceiveWalletFunds.js';
 import '../../../../index.js';
+import '../../../widgets/DynamicWidget/views/ReceiveWalletFunds/ReceiveWalletFunds.js';
 import '../../../store/state/tokenBalances.js';
 import '../../../store/state/multichainBalances.js';
 import '../../../shared/utils/functions/getInitialUrl/getInitialUrl.js';
@@ -102,14 +102,19 @@ import { useInternalDynamicContext } from '../../../context/DynamicContext/useDy
 const useExchangeAccounts = () => {
     const environmentId = getEnvironmentId();
     const { primaryWallet, network } = useInternalDynamicContext();
-    const getExchangeUserAccounts = useCallback((_a) => __awaiter(void 0, [_a], void 0, function* ({ exchange }) {
-        return getUserExchangeAccounts({
-            chainName: primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.connector.connectedChain,
+    const getExchangeUserAccounts = useCallback((_a) => __awaiter(void 0, [_a], void 0, function* ({ exchange, networkId, chainName, includeChainName = true, }) {
+        const networkToUse = networkId !== null && networkId !== void 0 ? networkId : network;
+        const payload = {
             environmentId,
             exchangeKey: exchange,
-            networkId: network,
-        });
-    }), [primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.connector.connectedChain, environmentId, network]);
+            networkId: networkToUse,
+        };
+        if (includeChainName) {
+            payload.chainName =
+                chainName !== null && chainName !== void 0 ? chainName : primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.connector.connectedChain;
+        }
+        return getUserExchangeAccounts(payload);
+    }), [network, environmentId, primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.connector.connectedChain]);
     const getExchangeTransactions = useCallback((_b) => __awaiter(void 0, [_b], void 0, function* ({ exchange, accountId, }) {
         return getExchangeAccountTransactions({
             accountId,

package/src/lib/utils/hooks/useExternalAuth/useExternalAuth.cjs

@@ -98,8 +98,8 @@ require('../../../widgets/DynamicWidget/components/DynamicWidgetHeader/DynamicWi
 require('../../../views/TransactionConfirmationView/TransactionConfirmationView.cjs');
 require('../../../widgets/DynamicWidget/components/PasskeyCard/PasskeyCard.cjs');
 require('../../../context/OnrampContext/OnrampContext.cjs');
-require('../../../widgets/DynamicWidget/views/ReceiveWalletFunds/ReceiveWalletFunds.cjs');
 require('../../../../index.cjs');
+require('../../../widgets/DynamicWidget/views/ReceiveWalletFunds/ReceiveWalletFunds.cjs');
 require('../../../store/state/tokenBalances.cjs');
 require('../../../store/state/multichainBalances.cjs');
 require('../../../shared/utils/functions/getInitialUrl/getInitialUrl.cjs');

package/src/lib/utils/hooks/useExternalAuth/useExternalAuth.js

@@ -94,8 +94,8 @@ import '../../../widgets/DynamicWidget/components/DynamicWidgetHeader/DynamicWid
 import '../../../views/TransactionConfirmationView/TransactionConfirmationView.js';
 import '../../../widgets/DynamicWidget/components/PasskeyCard/PasskeyCard.js';
 import '../../../context/OnrampContext/OnrampContext.js';
-import '../../../widgets/DynamicWidget/views/ReceiveWalletFunds/ReceiveWalletFunds.js';
 import '../../../../index.js';
+import '../../../widgets/DynamicWidget/views/ReceiveWalletFunds/ReceiveWalletFunds.js';
 import '../../../store/state/tokenBalances.js';
 import '../../../store/state/multichainBalances.js';
 import '../../../shared/utils/functions/getInitialUrl/getInitialUrl.js';

package/src/lib/utils/hooks/useFundWithWallet/useChooseLinkedWallet/useChooseLinkedWallet.cjs

@@ -97,8 +97,8 @@ require('../../../../views/TransactionConfirmationView/TransactionConfirmationVi
 require('../../../../widgets/DynamicWidget/components/PasskeyCard/PasskeyCard.cjs');
 require('../../../../context/OnrampContext/OnrampContext.cjs');
 var resolvePromiseRef = require('../../../functions/resolvePromiseRef/resolvePromiseRef.cjs');
-require('../../../../widgets/DynamicWidget/views/ReceiveWalletFunds/ReceiveWalletFunds.cjs');
 require('../../../../../index.cjs');
+require('../../../../widgets/DynamicWidget/views/ReceiveWalletFunds/ReceiveWalletFunds.cjs');
 require('../../../../store/state/tokenBalances.cjs');
 require('../../../../store/state/multichainBalances.cjs');
 require('../../../../shared/utils/functions/getInitialUrl/getInitialUrl.cjs');

package/src/lib/utils/hooks/useFundWithWallet/useChooseLinkedWallet/useChooseLinkedWallet.js

@@ -93,8 +93,8 @@ import '../../../../views/TransactionConfirmationView/TransactionConfirmationVie
 import '../../../../widgets/DynamicWidget/components/PasskeyCard/PasskeyCard.js';
 import '../../../../context/OnrampContext/OnrampContext.js';
 import { resolvePromiseRef } from '../../../functions/resolvePromiseRef/resolvePromiseRef.js';
-import '../../../../widgets/DynamicWidget/views/ReceiveWalletFunds/ReceiveWalletFunds.js';
 import '../../../../../index.js';
+import '../../../../widgets/DynamicWidget/views/ReceiveWalletFunds/ReceiveWalletFunds.js';
 import '../../../../store/state/tokenBalances.js';
 import '../../../../store/state/multichainBalances.js';
 import '../../../../shared/utils/functions/getInitialUrl/getInitialUrl.js';

package/src/lib/utils/hooks/useFundWithWallet/useConnectWalletForFunding/useConnectWalletForFunding.cjs

@@ -6,6 +6,7 @@ Object.defineProperty(exports, '__esModule', { value: true });
 var _tslib = require('../../../../../../_virtual/_tslib.cjs');
 var React = require('react');
 var utils = require('@dynamic-labs/utils');
+require('../../../../../index.cjs');
 require('../../../../context/DynamicContext/DynamicContext.cjs');
 require('../../../../store/state/loadingAndLifecycle/loadingAndLifecycle.cjs');
 require('@dynamic-labs/sdk-api-core');
@@ -36,7 +37,7 @@ require('../../../../store/state/primaryWalletId/primaryWalletId.cjs');
 require('../../../../store/state/connectedWalletsInfo/connectedWalletsInfo.cjs');
 require('../../../../context/AccessDeniedContext/AccessDeniedContext.cjs');
 require('../../../../context/AccountExistsContext/AccountExistsContext.cjs');
-var UserWalletsContext = require('../../../../context/UserWalletsContext/UserWalletsContext.cjs');
+require('../../../../context/UserWalletsContext/UserWalletsContext.cjs');
 require('../../../../store/state/authMode/authMode.cjs');
 require('../../../../context/VerificationContext/VerificationContext.cjs');
 require('react-dom');
@@ -56,8 +57,7 @@ require('../../../../views/CollectUserDataView/useFields.cjs');
 require('../../../../context/FieldsStateContext/FieldsStateContext.cjs');
 require('../../../../context/UserFieldEditorContext/UserFieldEditorContext.cjs');
 require('@dynamic-labs/rpc-providers');
-var walletOptions = require('../../../../store/state/walletOptions/walletOptions.cjs');
-var useHandleWalletItem = require('../../useWalletItemActions/useHandleWalletItem/useHandleWalletItem.cjs');
+require('../../../../store/state/walletOptions/walletOptions.cjs');
 require('react-i18next');
 require('../../../../components/Accordion/components/AccordionItem/AccordionItem.cjs');
 require('../../../../components/Alert/Alert.cjs');
@@ -100,10 +100,9 @@ require('../../../../widgets/DynamicWidget/components/PasskeyCard/PasskeyCard.cj
 require('../../../../context/OnrampContext/OnrampContext.cjs');
 var resolvePromiseRef = require('../../../functions/resolvePromiseRef/resolvePromiseRef.cjs');
 var rejectPromiseRef = require('../../../functions/rejectPromiseRef/rejectPromiseRef.cjs');
-var useWalletOptions = require('../../useWalletOptions/useWalletOptions.cjs');
+var useFundingHelpers = require('../../useFundingHelpers/useFundingHelpers.cjs');
 var FilterWalletsForExternalFunding = require('../utils/FilterWalletsForExternalFunding.cjs');
 require('../../../../widgets/DynamicWidget/views/ReceiveWalletFunds/ReceiveWalletFunds.cjs');
-require('../../../../../index.cjs');
 require('../../../../store/state/tokenBalances.cjs');
 require('../../../../store/state/multichainBalances.cjs');
 require('../../../../shared/utils/functions/getInitialUrl/getInitialUrl.cjs');
@@ -112,65 +111,16 @@ var useInternalDynamicContext = require('../../../../context/DynamicContext/useD
 const useConnectWalletForFunding = () => {
     const { primaryWallet, setShowAuthFlow } = useInternalDynamicContext.useInternalDynamicContext();
     const { clearStackAndPush } = ViewContext.useViewContext();
-    const { userWallets } = UserWalletsContext.useInternalUserWallets();
-    const initiatedByWidgetRef = React.useRef(false);
-    const { walletOptions: walletOptions$1 } = useWalletOptions.useWalletOptions();
-    const internalConnectionPromiseRef = React.useRef(null);
+    const { initiatedByWidgetRef, getWalletAddress, resetWalletConnectSession } = useFundingHelpers.useFundingHelpers();
     const connectWalletPromiseRef = React.useRef(null);
-    const handleWalletMethod = React.useCallback((props) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
-        // This is for phantom redirect: store the reason for this connection
-        // so we don't lose the flow when redirected back
-        const connectionType = {
-            connectorConsumed: false,
-            initiatedByWidget: initiatedByWidgetRef.current,
-            type: 'external-wallet-funding',
-        };
-        utils.StorageService.setItem(utils.PHANTOM_REDIRECT_CONNECTION_TYPE_KEY, connectionType);
-        const address = yield props.walletConnector.getAddress(props.getAddressOpts);
-        if (!address) {
-            rejectPromiseRef.rejectPromiseRef(internalConnectionPromiseRef, new utils.DynamicError('No wallet address found'));
-            return;
-        }
-        resolvePromiseRef.resolvePromiseRef(internalConnectionPromiseRef, address);
-    }), []);
-    const { handleWalletItemClick } = useHandleWalletItem.useHandleWalletItem({
-        allowAlreadyConnectedWallet: true,
-        onConnectOnly: handleWalletMethod,
-        onCustodialWallet: handleWalletMethod,
-        onInstalledExtension: handleWalletMethod,
-        onQrCodeConnect: handleWalletMethod,
-    });
     useDynamicEvents.useInternalDynamicEvents('authFlowClose', () => {
         rejectPromiseRef.rejectPromiseRef(connectWalletPromiseRef, new utils.DynamicError('User cancelled'));
     });
-    const getWalletAddress = React.useCallback((walletConnector) => {
-        const walletOption = walletOptions$1.find(({ key }) => key === walletConnector.key);
-        if (!walletOption)
-            return Promise.reject(new utils.DynamicError(`Connect wallet for funding error: wallet option for ${walletConnector.key} not found`));
-        internalConnectionPromiseRef.current = new utils.DeferredPromise();
-        handleWalletItemClick(Object.assign(Object.assign({}, walletOption), { walletConnector }));
-        return internalConnectionPromiseRef.current.promise;
-    }, [handleWalletItemClick, walletOptions$1]);
-    const hasWalletConnectWallet = userWallets.some((wallet) => wallet.connector.isWalletConnect);
-    // WC does not allow multiple sessions, so we have 2 cases here:
-    // 1. The user has a linked WalletConnect wallet.
-    //    In this case, we should not do anything, and our logic will prevent other WCs from being
-    //    selected for funding.
-    // 2. The user does not have a WalletConnect wallet linked.
-    //    In this case, we should reset the WC session — this is because they might have just
-    //    previously connected another WC wallet for funding and that session could still be active.
-    const resetWalletConnectSession = React.useCallback(() => _tslib.__awaiter(void 0, void 0, void 0, function* () {
-        if (hasWalletConnectWallet)
-            return;
-        const walletOption = walletOptions.getWalletConnectorOptions().find(({ walletConnector }) => walletConnector.isWalletConnect);
-        yield (walletOption === null || walletOption === void 0 ? void 0 : walletOption.walletConnector.endSession());
-        yield (walletOption === null || walletOption === void 0 ? void 0 : walletOption.walletConnector.init());
-    }), [hasWalletConnectWallet]);
     const openWalletList = React.useCallback((initiatedByWidget) => {
         const onSelectWallet = (_a) => _tslib.__awaiter(void 0, [_a], void 0, function* ({ walletConnector, }) {
-            let isDuplicate = false;
             if (!connectWalletPromiseRef.current)
                 return;
+            let isDuplicate = false;
             try {
                 initiatedByWidgetRef.current = initiatedByWidget;
                 const walletAddress = yield getWalletAddress(walletConnector);
@@ -195,20 +145,18 @@ const useConnectWalletForFunding = () => {
                     key: walletConnector.key,
                 });
                 resolvePromiseRef.resolvePromiseRef(connectWalletPromiseRef, wallet);
-                dynamicEvents.dynamicEvents.emit('walletConnectedForFunding', {
-                    initiatedByWidget: initiatedByWidget,
+                dynamicEvents.publicDynamicEvents.emit('walletConnectedForFunding', {
+                    initiatedByWidget,
                     isPhantomRedirect: false,
                     wallet,
                 });
             }
             catch (error) {
                 rejectPromiseRef.rejectPromiseRef(connectWalletPromiseRef, error);
-                return;
             }
             finally {
-                if (!isDuplicate) {
+                if (!isDuplicate)
                     setShowAuthFlow(false);
-                }
             }
         });
         clearStackAndPush('external-funding-wallet-list', {
@@ -219,11 +167,12 @@ const useConnectWalletForFunding = () => {
     }, [
         clearStackAndPush,
         getWalletAddress,
+        initiatedByWidgetRef,
         primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.address,
         primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.chain,
         setShowAuthFlow,
     ]);
-    return React.useCallback((_a) => _tslib.__awaiter(void 0, [_a], void 0, function* ({ initiatedByWidget }) {
+    return React.useCallback((_a) => _tslib.__awaiter(void 0, [_a], void 0, function* ({ initiatedByWidget, }) {
         if (connectWalletPromiseRef.current) {
             return connectWalletPromiseRef.current.promise;
         }
@@ -237,7 +186,7 @@ const useConnectWalletForFunding = () => {
             performMultiWalletChecks: false,
         });
         return connectWalletPromiseRef.current.promise;
-    }), [resetWalletConnectSession, openWalletList, setShowAuthFlow]);
+    }), [openWalletList, resetWalletConnectSession, setShowAuthFlow]);
 };
 
 exports.useConnectWalletForFunding = useConnectWalletForFunding;

package/src/lib/utils/hooks/useFundWithWallet/useConnectWalletForFunding/useConnectWalletForFunding.d.ts

@@ -1,6 +1,6 @@
-import { Wallet } from '../../../../shared/types/wallets';
+import { Wallet } from '@dynamic-labs/wallet-connector-core';
 type ConnectWalletForFundingProps = {
     initiatedByWidget: boolean;
 };
-export declare const useConnectWalletForFunding: () => (props: ConnectWalletForFundingProps) => Promise<Wallet>;
+export declare const useConnectWalletForFunding: () => ({ initiatedByWidget, }: ConnectWalletForFundingProps) => Promise<Wallet>;
 export {};

package/src/lib/utils/hooks/useFundWithWallet/useConnectWalletForFunding/useConnectWalletForFunding.js

@@ -1,7 +1,8 @@
 'use client'
 import { __awaiter } from '../../../../../../_virtual/_tslib.js';
 import { useRef, useCallback } from 'react';
-import { StorageService, PHANTOM_REDIRECT_CONNECTION_TYPE_KEY, DynamicError, DeferredPromise, pipe } from '@dynamic-labs/utils';
+import { DynamicError, pipe, DeferredPromise } from '@dynamic-labs/utils';
+import '../../../../../index.js';
 import '../../../../context/DynamicContext/DynamicContext.js';
 import '../../../../store/state/loadingAndLifecycle/loadingAndLifecycle.js';
 import '@dynamic-labs/sdk-api-core';
@@ -23,7 +24,7 @@ import '../../../../store/state/nonce/nonce.js';
 import '@dynamic-labs-sdk/client/core';
 import '@dynamic-labs-sdk/client';
 import '../../../../client/client.js';
-import { dynamicEvents } from '../../../../events/dynamicEvents.js';
+import { publicDynamicEvents } from '../../../../events/dynamicEvents.js';
 import '../../../../store/state/projectSettings/projectSettings.js';
 import '../../../../config/ApiEndpoint.js';
 import '../../../../locale/locale.js';
@@ -32,7 +33,7 @@ import '../../../../store/state/primaryWalletId/primaryWalletId.js';
 import '../../../../store/state/connectedWalletsInfo/connectedWalletsInfo.js';
 import '../../../../context/AccessDeniedContext/AccessDeniedContext.js';
 import '../../../../context/AccountExistsContext/AccountExistsContext.js';
-import { useInternalUserWallets } from '../../../../context/UserWalletsContext/UserWalletsContext.js';
+import '../../../../context/UserWalletsContext/UserWalletsContext.js';
 import '../../../../store/state/authMode/authMode.js';
 import '../../../../context/VerificationContext/VerificationContext.js';
 import 'react-dom';
@@ -52,8 +53,7 @@ import '../../../../views/CollectUserDataView/useFields.js';
 import '../../../../context/FieldsStateContext/FieldsStateContext.js';
 import '../../../../context/UserFieldEditorContext/UserFieldEditorContext.js';
 import '@dynamic-labs/rpc-providers';
-import { getWalletConnectorOptions } from '../../../../store/state/walletOptions/walletOptions.js';
-import { useHandleWalletItem } from '../../useWalletItemActions/useHandleWalletItem/useHandleWalletItem.js';
+import '../../../../store/state/walletOptions/walletOptions.js';
 import 'react-i18next';
 import '../../../../components/Accordion/components/AccordionItem/AccordionItem.js';
 import '../../../../components/Alert/Alert.js';
@@ -96,10 +96,9 @@ import '../../../../widgets/DynamicWidget/components/PasskeyCard/PasskeyCard.js'
 import '../../../../context/OnrampContext/OnrampContext.js';
 import { resolvePromiseRef } from '../../../functions/resolvePromiseRef/resolvePromiseRef.js';
 import { rejectPromiseRef } from '../../../functions/rejectPromiseRef/rejectPromiseRef.js';
-import { useWalletOptions } from '../../useWalletOptions/useWalletOptions.js';
+import { useFundingHelpers } from '../../useFundingHelpers/useFundingHelpers.js';
 import { FilterWalletsForExternalFunding } from '../utils/FilterWalletsForExternalFunding.js';
 import '../../../../widgets/DynamicWidget/views/ReceiveWalletFunds/ReceiveWalletFunds.js';
-import '../../../../../index.js';
 import '../../../../store/state/tokenBalances.js';
 import '../../../../store/state/multichainBalances.js';
 import '../../../../shared/utils/functions/getInitialUrl/getInitialUrl.js';
@@ -108,65 +107,16 @@ import { useInternalDynamicContext } from '../../../../context/DynamicContext/us
 const useConnectWalletForFunding = () => {
     const { primaryWallet, setShowAuthFlow } = useInternalDynamicContext();
     const { clearStackAndPush } = useViewContext();
-    const { userWallets } = useInternalUserWallets();
-    const initiatedByWidgetRef = useRef(false);
-    const { walletOptions } = useWalletOptions();
-    const internalConnectionPromiseRef = useRef(null);
+    const { initiatedByWidgetRef, getWalletAddress, resetWalletConnectSession } = useFundingHelpers();
     const connectWalletPromiseRef = useRef(null);
-    const handleWalletMethod = useCallback((props) => __awaiter(void 0, void 0, void 0, function* () {
-        // This is for phantom redirect: store the reason for this connection
-        // so we don't lose the flow when redirected back
-        const connectionType = {
-            connectorConsumed: false,
-            initiatedByWidget: initiatedByWidgetRef.current,
-            type: 'external-wallet-funding',
-        };
-        StorageService.setItem(PHANTOM_REDIRECT_CONNECTION_TYPE_KEY, connectionType);
-        const address = yield props.walletConnector.getAddress(props.getAddressOpts);
-        if (!address) {
-            rejectPromiseRef(internalConnectionPromiseRef, new DynamicError('No wallet address found'));
-            return;
-        }
-        resolvePromiseRef(internalConnectionPromiseRef, address);
-    }), []);
-    const { handleWalletItemClick } = useHandleWalletItem({
-        allowAlreadyConnectedWallet: true,
-        onConnectOnly: handleWalletMethod,
-        onCustodialWallet: handleWalletMethod,
-        onInstalledExtension: handleWalletMethod,
-        onQrCodeConnect: handleWalletMethod,
-    });
     useInternalDynamicEvents('authFlowClose', () => {
         rejectPromiseRef(connectWalletPromiseRef, new DynamicError('User cancelled'));
     });
-    const getWalletAddress = useCallback((walletConnector) => {
-        const walletOption = walletOptions.find(({ key }) => key === walletConnector.key);
-        if (!walletOption)
-            return Promise.reject(new DynamicError(`Connect wallet for funding error: wallet option for ${walletConnector.key} not found`));
-        internalConnectionPromiseRef.current = new DeferredPromise();
-        handleWalletItemClick(Object.assign(Object.assign({}, walletOption), { walletConnector }));
-        return internalConnectionPromiseRef.current.promise;
-    }, [handleWalletItemClick, walletOptions]);
-    const hasWalletConnectWallet = userWallets.some((wallet) => wallet.connector.isWalletConnect);
-    // WC does not allow multiple sessions, so we have 2 cases here:
-    // 1. The user has a linked WalletConnect wallet.
-    //    In this case, we should not do anything, and our logic will prevent other WCs from being
-    //    selected for funding.
-    // 2. The user does not have a WalletConnect wallet linked.
-    //    In this case, we should reset the WC session — this is because they might have just
-    //    previously connected another WC wallet for funding and that session could still be active.
-    const resetWalletConnectSession = useCallback(() => __awaiter(void 0, void 0, void 0, function* () {
-        if (hasWalletConnectWallet)
-            return;
-        const walletOption = getWalletConnectorOptions().find(({ walletConnector }) => walletConnector.isWalletConnect);
-        yield (walletOption === null || walletOption === void 0 ? void 0 : walletOption.walletConnector.endSession());
-        yield (walletOption === null || walletOption === void 0 ? void 0 : walletOption.walletConnector.init());
-    }), [hasWalletConnectWallet]);
     const openWalletList = useCallback((initiatedByWidget) => {
         const onSelectWallet = (_a) => __awaiter(void 0, [_a], void 0, function* ({ walletConnector, }) {
-            let isDuplicate = false;
             if (!connectWalletPromiseRef.current)
                 return;
+            let isDuplicate = false;
             try {
                 initiatedByWidgetRef.current = initiatedByWidget;
                 const walletAddress = yield getWalletAddress(walletConnector);
@@ -191,20 +141,18 @@ const useConnectWalletForFunding = () => {
                     key: walletConnector.key,
                 });
                 resolvePromiseRef(connectWalletPromiseRef, wallet);
-                dynamicEvents.emit('walletConnectedForFunding', {
-                    initiatedByWidget: initiatedByWidget,
+                publicDynamicEvents.emit('walletConnectedForFunding', {
+                    initiatedByWidget,
                     isPhantomRedirect: false,
                     wallet,
                 });
             }
             catch (error) {
                 rejectPromiseRef(connectWalletPromiseRef, error);
-                return;
             }
             finally {
-                if (!isDuplicate) {
+                if (!isDuplicate)
                     setShowAuthFlow(false);
-                }
             }
         });
         clearStackAndPush('external-funding-wallet-list', {
@@ -215,11 +163,12 @@ const useConnectWalletForFunding = () => {
     }, [
         clearStackAndPush,
         getWalletAddress,
+        initiatedByWidgetRef,
         primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.address,
         primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.chain,
         setShowAuthFlow,
     ]);
-    return useCallback((_a) => __awaiter(void 0, [_a], void 0, function* ({ initiatedByWidget }) {
+    return useCallback((_a) => __awaiter(void 0, [_a], void 0, function* ({ initiatedByWidget, }) {
         if (connectWalletPromiseRef.current) {
             return connectWalletPromiseRef.current.promise;
         }
@@ -233,7 +182,7 @@ const useConnectWalletForFunding = () => {
             performMultiWalletChecks: false,
         });
         return connectWalletPromiseRef.current.promise;
-    }), [resetWalletConnectSession, openWalletList, setShowAuthFlow]);
+    }), [openWalletList, resetWalletConnectSession, setShowAuthFlow]);
 };
 
 export { useConnectWalletForFunding };