@dynamic-labs/sdk-react-core 4.31.2 → 4.31.4

package/CHANGELOG.md

@@ -1,4 +1,23 @@
 
+### [4.31.4](https://github.com/dynamic-labs/dynamic-auth/compare/v4.31.3...v4.31.4) (2025-09-16)
+
+
+### Bug Fixes
+
+* prevent useUserWallets from returning empty array when cancelling wallet connect connection ([#9500](https://github.com/dynamic-labs/dynamic-auth/issues/9500)) ([850f03c](https://github.com/dynamic-labs/dynamic-auth/commit/850f03cdc954da5a2af5285d873fc02a2f95e09e))
+
+### [4.31.3](https://github.com/dynamic-labs/dynamic-auth/compare/v4.31.2...v4.31.3) (2025-09-15)
+
+
+### Features
+
+* offramp links ([#9494](https://github.com/dynamic-labs/dynamic-auth/issues/9494)) ([47ff2fd](https://github.com/dynamic-labs/dynamic-auth/commit/47ff2fda1721e08fe21551b1ceb01a9f7a574cbf))
+
+
+### Bug Fixes
+
+* restructure OnrampContext with improved provider management ([#9490](https://github.com/dynamic-labs/dynamic-auth/issues/9490)) ([16bf0fc](https://github.com/dynamic-labs/dynamic-auth/commit/16bf0fc1884cb4979bbcf7cca9b77410e4957b6b))
+
 ### [4.31.2](https://github.com/dynamic-labs/dynamic-auth/compare/v4.31.1...v4.31.2) (2025-09-11)
 
 

package/package.cjs

@@ -3,7 +3,7 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var version = "4.31.2";
+var version = "4.31.4";
 var dependencies = {
 	"@dynamic-labs/sdk-api-core": "0.0.762",
 	"@dynamic-labs-sdk/client": "0.1.0-alpha.3",

package/package.js

@@ -1,5 +1,5 @@
 'use client'
-var version = "4.31.2";
+var version = "4.31.4";
 var dependencies = {
 	"@dynamic-labs/sdk-api-core": "0.0.762",
 	"@dynamic-labs-sdk/client": "0.1.0-alpha.3",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dynamic-labs/sdk-react-core",
-  "version": "4.31.2",
+  "version": "4.31.4",
   "dependencies": {
     "@dynamic-labs/sdk-api-core": "0.0.762",
     "@dynamic-labs-sdk/client": "0.1.0-alpha.3",
@@ -15,16 +15,16 @@
     "yup": "0.32.11",
     "react-international-phone": "4.5.0",
     "bs58": "5.0.0",
-    "@dynamic-labs/assert-package-version": "4.31.2",
-    "@dynamic-labs/iconic": "4.31.2",
-    "@dynamic-labs/logger": "4.31.2",
-    "@dynamic-labs/multi-wallet": "4.31.2",
-    "@dynamic-labs/rpc-providers": "4.31.2",
-    "@dynamic-labs/store": "4.31.2",
-    "@dynamic-labs/types": "4.31.2",
-    "@dynamic-labs/utils": "4.31.2",
-    "@dynamic-labs/wallet-book": "4.31.2",
-    "@dynamic-labs/wallet-connector-core": "4.31.2",
+    "@dynamic-labs/assert-package-version": "4.31.4",
+    "@dynamic-labs/iconic": "4.31.4",
+    "@dynamic-labs/logger": "4.31.4",
+    "@dynamic-labs/multi-wallet": "4.31.4",
+    "@dynamic-labs/rpc-providers": "4.31.4",
+    "@dynamic-labs/store": "4.31.4",
+    "@dynamic-labs/types": "4.31.4",
+    "@dynamic-labs/utils": "4.31.4",
+    "@dynamic-labs/wallet-book": "4.31.4",
+    "@dynamic-labs/wallet-connector-core": "4.31.4",
     "eventemitter3": "5.0.1"
   },
   "devDependencies": {

package/src/lib/context/OnrampContext/OnrampContext.cjs

@@ -7,9 +7,7 @@ var _tslib = require('../../../../_virtual/_tslib.cjs');
 var jsxRuntime = require('react/jsx-runtime');
 var React = require('react');
 var utils = require('@dynamic-labs/utils');
-var onrampConfigurationToOnrampOption = require('../../utils/functions/onrampConfigurationToOnrampOption/onrampConfigurationToOnrampOption.cjs');
 var openOnrampPopup = require('../../utils/functions/openOnrampPopup.cjs');
-var rejectPromiseRef = require('../../utils/functions/rejectPromiseRef/rejectPromiseRef.cjs');
 require('../DynamicContext/DynamicContext.cjs');
 require('../../store/state/loadingAndLifecycle/loadingAndLifecycle.cjs');
 require('@dynamic-labs/sdk-api-core');
@@ -32,7 +30,6 @@ require('../../client/client.cjs');
 require('@dynamic-labs-sdk/client');
 require('../../config/ApiEndpoint.cjs');
 require('../../store/state/projectSettings/projectSettings.cjs');
-var onramp = require('../../data/api/onramp/onramp.cjs');
 require('../../locale/locale.cjs');
 require('../../store/state/dynamicContextProps/dynamicContextProps.cjs');
 require('../../store/state/primaryWalletId/primaryWalletId.cjs');
@@ -99,12 +96,15 @@ require('../../widgets/DynamicWidget/components/DynamicWidgetHeader/DynamicWidge
 require('../../views/TransactionConfirmationView/TransactionConfirmationView.cjs');
 require('../../widgets/DynamicWidget/components/PasskeyCard/PasskeyCard.cjs');
 require('../../../index.cjs');
+var rejectPromiseRef = require('../../utils/functions/rejectPromiseRef/rejectPromiseRef.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');
 var useInternalDynamicContext = require('../DynamicContext/useDynamicContext/useInternalDynamicContext/useInternalDynamicContext.cjs');
+var onrampConfigurationToOnrampOption = require('../../utils/functions/onrampConfigurationToOnrampOption/onrampConfigurationToOnrampOption.cjs');
 var useOnrampProviders = require('./useOnrampProviders/useOnrampProviders.cjs');
+var getOnrampProviders = require('./utils/getOnrampProviders.cjs');
 
 const OnrampContext = React.createContext(undefined);
 const OnrampContextProvider = ({ children, }) => {
@@ -113,6 +113,7 @@ const OnrampContextProvider = ({ children, }) => {
     const [selectedOnrampProvider, setSelectedOnrampProvider] = React.useState();
     const [showOnramp, _setShowOnramp] = React.useState(false);
     const [override, setOverride] = React.useState(false);
+    const [overrideOnrampProvider, setOverrideOnrampProvider] = React.useState(undefined);
     const { environmentId, network, primaryWallet, projectSettings, overrides } = useInternalDynamicContext.useInternalDynamicContext();
     const [enabledOnrampProvidersTarget, setEnabledOnrampProvidersTarget] = React.useState({});
     const setShowOnramp = React.useCallback((value) => {
@@ -130,7 +131,11 @@ const OnrampContextProvider = ({ children, }) => {
             tokenAmount,
         });
     }, []);
-    const { enabledOnRamps: enabledOnrampProvidersInDashboard, allOnRamps } = useOnrampProviders.useOnrampProviders({
+    const resetOverrides = React.useCallback(() => {
+        setOverrideOnrampProvider(undefined);
+        setOverride(false);
+    }, []);
+    const { enabledOnRamps: enabledOnrampProvidersInDashboard } = useOnrampProviders.useOnrampProviders({
         environmentId,
         includeDisabled: true,
         network,
@@ -141,9 +146,6 @@ const OnrampContextProvider = ({ children, }) => {
     const enabledOnrampProvidersInDashboardOptions = React.useMemo(() => enabledOnrampProvidersInDashboard.map((provider) => onrampConfigurationToOnrampOption.onrampConfigurationToOnrampOption(provider)), 
     // eslint-disable-next-line react-hooks/exhaustive-deps
     [enabledOnrampProvidersInDashboard, primaryWallet, setShowOnramp]);
-    const allOnrampProvidersInDashboardOptions = React.useMemo(() => allOnRamps.map((provider) => onrampConfigurationToOnrampOption.onrampConfigurationToOnrampOption(provider)), 
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-    [allOnRamps, primaryWallet, setShowOnramp]);
     const onrampOverrides = React.useMemo(() => {
         const configuredOverrides = overrides === null || overrides === void 0 ? void 0 : overrides.onrampOptions;
         if (typeof configuredOverrides === 'function') {
@@ -196,7 +198,7 @@ const OnrampContextProvider = ({ children, }) => {
         onrampOverrides,
         overrides === null || overrides === void 0 ? void 0 : overrides.onrampOptions,
     ]);
-    const openOnramp = React.useCallback((_f) => _tslib.__awaiter(void 0, [_f], void 0, function* ({ onrampProvider, address, token, tokenAmount, network, chainName, overrideOnRamp, payingWithDynamic, }) {
+    const openOnramp = React.useCallback((_f) => _tslib.__awaiter(void 0, [_f], void 0, function* ({ onrampProvider, address, token, tokenAmount, network: networkOverride, chainName, overrideOnRamp, payingWithDynamic, }) {
         if (!onrampEnabled && !overrideOnRamp && !payingWithDynamic) {
             throw new Error('Onramp is not enabled');
         }
@@ -205,59 +207,66 @@ const OnrampContextProvider = ({ children, }) => {
             return promiseRef.current.promise;
         }
         promiseRef.current = new utils.DeferredPromise();
-        if (address || token || network || tokenAmount || chainName)
-            setEnabledOnrampProvidersTarget({
+        let localOnrampProviders = enabledOnrampProvidersInDashboardOptions;
+        const networkToUse = networkOverride || network;
+        const shouldOverrideOnrampProviders = overrideOnRamp ||
+            Boolean(token) ||
+            Boolean(network) ||
+            Boolean(tokenAmount) ||
+            Boolean(chainName);
+        const allPayingParameters = Boolean(chainName) &&
+            Boolean(networkToUse) &&
+            Boolean(token) &&
+            Boolean(tokenAmount) &&
+            Boolean(address);
+        if (payingWithDynamic && !allPayingParameters) {
+            return rejectPromiseRef.rejectPromiseRef(promiseRef, new Error('PayingWithDynamic: Missing parameters'));
+        }
+        if (shouldOverrideOnrampProviders)
+            setOverride(true);
+        if (shouldOverrideOnrampProviders ||
+            (payingWithDynamic && allPayingParameters)) {
+            localOnrampProviders = (yield getOnrampProviders.getOnrampProviders({
                 address,
                 chainName,
-                network,
+                environmentId,
+                includeDisabled: overrideOnRamp,
+                network: networkToUse,
+                primaryWallet,
                 token,
                 tokenAmount,
-            });
-        let enabledOnRampsToCheck = enabledOnrampProviders;
-        const allPayingParameters = chainName && network && token && tokenAmount && address;
-        if (payingWithDynamic && allPayingParameters) {
-            enabledOnRampsToCheck = (yield onramp.getOnrampProviders({
-                chain: chainName,
-                environmentId,
-                includeDisabled: false,
-                networkId: network,
-                token: token,
-                tokenAmount: tokenAmount,
-                walletAddress: address,
             })).map((provider) => onrampConfigurationToOnrampOption.onrampConfigurationToOnrampOption(provider));
         }
-        let onrampOption;
-        onrampOption = enabledOnRampsToCheck.find((p) => p.id === onrampProvider);
+        const onrampOption = localOnrampProviders.find((p) => p.id === onrampProvider);
         if (payingWithDynamic && !onrampOption) {
-            throw new Error('PayingWithDynamic: Onramp provider not found');
-        }
-        if (overrideOnRamp) {
-            onrampOption = allOnrampProvidersInDashboardOptions.find((p) => p.id === onrampProvider);
-            setOverride(true);
+            return rejectPromiseRef.rejectPromiseRef(promiseRef, new Error('PayingWithDynamic: Onramp provider not found'));
         }
         if (!onrampOption) {
-            throw new Error('Onramp provider not found');
+            return rejectPromiseRef.rejectPromiseRef(promiseRef, new Error('Onramp provider not found'));
         }
+        setOverrideOnrampProvider(onrampOption);
         setSelectedAndShowOnramp({ payingWithDynamic, provider: onrampOption });
         return promiseRef.current.promise;
     }), [
-        allOnrampProvidersInDashboardOptions,
-        enabledOnrampProviders,
+        enabledOnrampProvidersInDashboardOptions,
         environmentId,
         onrampEnabled,
+        primaryWallet,
+        network,
+        setOverride,
         setSelectedAndShowOnramp,
     ]);
     const selectedOnramp = React.useMemo(() => {
         let selected;
         if (override) {
-            selected = allOnrampProvidersInDashboardOptions.find((p) => p.id === selectedOnrampProvider);
+            selected = overrideOnrampProvider;
         }
         else if (enabledOnrampProviders.length) {
             selected = enabledOnrampProviders.find((p) => p.id === selectedOnrampProvider);
         }
         return selected;
     }, [
-        allOnrampProvidersInDashboardOptions,
+        overrideOnrampProvider,
         enabledOnrampProviders,
         override,
         selectedOnrampProvider,
@@ -267,8 +276,9 @@ const OnrampContextProvider = ({ children, }) => {
             provider.onClick({ wallet });
             return;
         }
+        resetOverrides();
         setSelectedAndShowOnramp({ provider, wallet });
-    }, [setSelectedAndShowOnramp]);
+    }, [setSelectedAndShowOnramp, resetOverrides]);
     const value = React.useMemo(() => ({
         enabledOnrampProviders,
         onrampEnabled,

package/src/lib/context/OnrampContext/OnrampContext.d.ts

@@ -1,6 +1,6 @@
 import { type ReactNode } from 'react';
-import type { OnrampProviders } from '@dynamic-labs/sdk-api-core';
-import type { Wallet } from '@dynamic-labs/wallet-connector-core';
+import { type OnrampProviders } from '@dynamic-labs/sdk-api-core';
+import { type Wallet } from '@dynamic-labs/wallet-connector-core';
 import type { OnrampOption } from '../DynamicContext';
 type OpenOnrampProps = {
     address?: string;

package/src/lib/context/OnrampContext/OnrampContext.js

@@ -3,9 +3,7 @@ import { __awaiter } from '../../../../_virtual/_tslib.js';
 import { jsx } from 'react/jsx-runtime';
 import { createContext, useContext, useRef, useState, useCallback, useMemo } from 'react';
 import { DynamicError, DeferredPromise } from '@dynamic-labs/utils';
-import { onrampConfigurationToOnrampOption } from '../../utils/functions/onrampConfigurationToOnrampOption/onrampConfigurationToOnrampOption.js';
 import { openOnrampPopup } from '../../utils/functions/openOnrampPopup.js';
-import { rejectPromiseRef } from '../../utils/functions/rejectPromiseRef/rejectPromiseRef.js';
 import '../DynamicContext/DynamicContext.js';
 import '../../store/state/loadingAndLifecycle/loadingAndLifecycle.js';
 import '@dynamic-labs/sdk-api-core';
@@ -28,7 +26,6 @@ import '../../client/client.js';
 import '@dynamic-labs-sdk/client';
 import '../../config/ApiEndpoint.js';
 import '../../store/state/projectSettings/projectSettings.js';
-import { getOnrampProviders } from '../../data/api/onramp/onramp.js';
 import '../../locale/locale.js';
 import '../../store/state/dynamicContextProps/dynamicContextProps.js';
 import '../../store/state/primaryWalletId/primaryWalletId.js';
@@ -95,12 +92,15 @@ import '../../widgets/DynamicWidget/components/DynamicWidgetHeader/DynamicWidget
 import '../../views/TransactionConfirmationView/TransactionConfirmationView.js';
 import '../../widgets/DynamicWidget/components/PasskeyCard/PasskeyCard.js';
 import '../../../index.js';
+import { rejectPromiseRef } from '../../utils/functions/rejectPromiseRef/rejectPromiseRef.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';
 import { useInternalDynamicContext } from '../DynamicContext/useDynamicContext/useInternalDynamicContext/useInternalDynamicContext.js';
+import { onrampConfigurationToOnrampOption } from '../../utils/functions/onrampConfigurationToOnrampOption/onrampConfigurationToOnrampOption.js';
 import { useOnrampProviders } from './useOnrampProviders/useOnrampProviders.js';
+import { getOnrampProviders } from './utils/getOnrampProviders.js';
 
 const OnrampContext = createContext(undefined);
 const OnrampContextProvider = ({ children, }) => {
@@ -109,6 +109,7 @@ const OnrampContextProvider = ({ children, }) => {
     const [selectedOnrampProvider, setSelectedOnrampProvider] = useState();
     const [showOnramp, _setShowOnramp] = useState(false);
     const [override, setOverride] = useState(false);
+    const [overrideOnrampProvider, setOverrideOnrampProvider] = useState(undefined);
     const { environmentId, network, primaryWallet, projectSettings, overrides } = useInternalDynamicContext();
     const [enabledOnrampProvidersTarget, setEnabledOnrampProvidersTarget] = useState({});
     const setShowOnramp = useCallback((value) => {
@@ -126,7 +127,11 @@ const OnrampContextProvider = ({ children, }) => {
             tokenAmount,
         });
     }, []);
-    const { enabledOnRamps: enabledOnrampProvidersInDashboard, allOnRamps } = useOnrampProviders({
+    const resetOverrides = useCallback(() => {
+        setOverrideOnrampProvider(undefined);
+        setOverride(false);
+    }, []);
+    const { enabledOnRamps: enabledOnrampProvidersInDashboard } = useOnrampProviders({
         environmentId,
         includeDisabled: true,
         network,
@@ -137,9 +142,6 @@ const OnrampContextProvider = ({ children, }) => {
     const enabledOnrampProvidersInDashboardOptions = useMemo(() => enabledOnrampProvidersInDashboard.map((provider) => onrampConfigurationToOnrampOption(provider)), 
     // eslint-disable-next-line react-hooks/exhaustive-deps
     [enabledOnrampProvidersInDashboard, primaryWallet, setShowOnramp]);
-    const allOnrampProvidersInDashboardOptions = useMemo(() => allOnRamps.map((provider) => onrampConfigurationToOnrampOption(provider)), 
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-    [allOnRamps, primaryWallet, setShowOnramp]);
     const onrampOverrides = useMemo(() => {
         const configuredOverrides = overrides === null || overrides === void 0 ? void 0 : overrides.onrampOptions;
         if (typeof configuredOverrides === 'function') {
@@ -192,7 +194,7 @@ const OnrampContextProvider = ({ children, }) => {
         onrampOverrides,
         overrides === null || overrides === void 0 ? void 0 : overrides.onrampOptions,
     ]);
-    const openOnramp = useCallback((_f) => __awaiter(void 0, [_f], void 0, function* ({ onrampProvider, address, token, tokenAmount, network, chainName, overrideOnRamp, payingWithDynamic, }) {
+    const openOnramp = useCallback((_f) => __awaiter(void 0, [_f], void 0, function* ({ onrampProvider, address, token, tokenAmount, network: networkOverride, chainName, overrideOnRamp, payingWithDynamic, }) {
         if (!onrampEnabled && !overrideOnRamp && !payingWithDynamic) {
             throw new Error('Onramp is not enabled');
         }
@@ -201,59 +203,66 @@ const OnrampContextProvider = ({ children, }) => {
             return promiseRef.current.promise;
         }
         promiseRef.current = new DeferredPromise();
-        if (address || token || network || tokenAmount || chainName)
-            setEnabledOnrampProvidersTarget({
+        let localOnrampProviders = enabledOnrampProvidersInDashboardOptions;
+        const networkToUse = networkOverride || network;
+        const shouldOverrideOnrampProviders = overrideOnRamp ||
+            Boolean(token) ||
+            Boolean(network) ||
+            Boolean(tokenAmount) ||
+            Boolean(chainName);
+        const allPayingParameters = Boolean(chainName) &&
+            Boolean(networkToUse) &&
+            Boolean(token) &&
+            Boolean(tokenAmount) &&
+            Boolean(address);
+        if (payingWithDynamic && !allPayingParameters) {
+            return rejectPromiseRef(promiseRef, new Error('PayingWithDynamic: Missing parameters'));
+        }
+        if (shouldOverrideOnrampProviders)
+            setOverride(true);
+        if (shouldOverrideOnrampProviders ||
+            (payingWithDynamic && allPayingParameters)) {
+            localOnrampProviders = (yield getOnrampProviders({
                 address,
                 chainName,
-                network,
+                environmentId,
+                includeDisabled: overrideOnRamp,
+                network: networkToUse,
+                primaryWallet,
                 token,
                 tokenAmount,
-            });
-        let enabledOnRampsToCheck = enabledOnrampProviders;
-        const allPayingParameters = chainName && network && token && tokenAmount && address;
-        if (payingWithDynamic && allPayingParameters) {
-            enabledOnRampsToCheck = (yield getOnrampProviders({
-                chain: chainName,
-                environmentId,
-                includeDisabled: false,
-                networkId: network,
-                token: token,
-                tokenAmount: tokenAmount,
-                walletAddress: address,
             })).map((provider) => onrampConfigurationToOnrampOption(provider));
         }
-        let onrampOption;
-        onrampOption = enabledOnRampsToCheck.find((p) => p.id === onrampProvider);
+        const onrampOption = localOnrampProviders.find((p) => p.id === onrampProvider);
         if (payingWithDynamic && !onrampOption) {
-            throw new Error('PayingWithDynamic: Onramp provider not found');
-        }
-        if (overrideOnRamp) {
-            onrampOption = allOnrampProvidersInDashboardOptions.find((p) => p.id === onrampProvider);
-            setOverride(true);
+            return rejectPromiseRef(promiseRef, new Error('PayingWithDynamic: Onramp provider not found'));
         }
         if (!onrampOption) {
-            throw new Error('Onramp provider not found');
+            return rejectPromiseRef(promiseRef, new Error('Onramp provider not found'));
         }
+        setOverrideOnrampProvider(onrampOption);
         setSelectedAndShowOnramp({ payingWithDynamic, provider: onrampOption });
         return promiseRef.current.promise;
     }), [
-        allOnrampProvidersInDashboardOptions,
-        enabledOnrampProviders,
+        enabledOnrampProvidersInDashboardOptions,
         environmentId,
         onrampEnabled,
+        primaryWallet,
+        network,
+        setOverride,
         setSelectedAndShowOnramp,
     ]);
     const selectedOnramp = useMemo(() => {
         let selected;
         if (override) {
-            selected = allOnrampProvidersInDashboardOptions.find((p) => p.id === selectedOnrampProvider);
+            selected = overrideOnrampProvider;
         }
         else if (enabledOnrampProviders.length) {
             selected = enabledOnrampProviders.find((p) => p.id === selectedOnrampProvider);
         }
         return selected;
     }, [
-        allOnrampProvidersInDashboardOptions,
+        overrideOnrampProvider,
         enabledOnrampProviders,
         override,
         selectedOnrampProvider,
@@ -263,8 +272,9 @@ const OnrampContextProvider = ({ children, }) => {
             provider.onClick({ wallet });
             return;
         }
+        resetOverrides();
         setSelectedAndShowOnramp({ provider, wallet });
-    }, [setSelectedAndShowOnramp]);
+    }, [setSelectedAndShowOnramp, resetOverrides]);
     const value = useMemo(() => ({
         enabledOnrampProviders,
         onrampEnabled,

package/src/lib/context/OnrampContext/types.d.ts

@@ -0,0 +1,11 @@
+import { Wallet } from '@dynamic-labs/wallet-connector-core';
+export type GetProvidersParams = {
+    address?: string;
+    chainName?: string;
+    environmentId: string;
+    network?: string | number | null;
+    primaryWallet?: Wallet | null;
+    token?: string;
+    tokenAmount?: number;
+    includeDisabled?: boolean;
+};

package/src/lib/context/OnrampContext/useOnrampProviders/useOnrampProviders.cjs

@@ -5,43 +5,23 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var _tslib = require('../../../../../_virtual/_tslib.cjs');
 var React = require('react');
-var sdkApiCore = require('@dynamic-labs/sdk-api-core');
-var walletConnectorCore = require('@dynamic-labs/wallet-connector-core');
-var onramp = require('../../../data/api/onramp/onramp.cjs');
-var getWalletAdditionalAddressByType = require('../../../utils/functions/getWalletAdditionalAddressByType/getWalletAdditionalAddressByType.cjs');
 var usePromise = require('../../../utils/hooks/usePromise/usePromise.cjs');
+var getOnrampProviders = require('../utils/getOnrampProviders.cjs');
 
 const useOnrampProviders = ({ primaryWallet, network, environmentId, projectSettingsOnramps, target, includeDisabled, }) => {
-    var _a, _b;
-    const chainName = (primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.chain)
-        ? (_a = walletConnectorCore.getChainInfo(primaryWallet.chain)) === null || _a === void 0 ? void 0 : _a.name
-        : undefined;
-    const chainNameToUse = (_b = target.chainName) !== null && _b !== void 0 ? _b : chainName;
-    const bitcoinAddress = primaryWallet &&
-        walletConnectorCore.isBitcoinConnector(primaryWallet.connector) &&
-        getWalletAdditionalAddressByType.getWalletAdditionalAddressByType(sdkApiCore.WalletAddressType.Payment, primaryWallet);
-    const chainHasNetwork = network && chainNameToUse === 'evm';
-    let networkToUse;
-    if (target.network) {
-        networkToUse = target.network;
-    }
-    else {
-        networkToUse = chainHasNetwork ? network.toString() : undefined;
-    }
     const { data: allOnRamps = [] } = usePromise.usePromise(() => _tslib.__awaiter(void 0, void 0, void 0, function* () {
-        if (!chainNameToUse || (!(primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.address) && !target.address))
+        var _a;
+        if (!(primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.address))
             return [];
-        const walletAddress = target.address || bitcoinAddress || (primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.address);
-        if (!walletAddress)
-            return [];
-        return onramp.getOnrampProviders({
-            chain: chainNameToUse,
+        return getOnrampProviders.getOnrampProviders({
+            address: target.address,
+            chainName: target.chainName,
             environmentId,
             includeDisabled: true,
-            networkId: networkToUse,
+            network: (_a = target.network) !== null && _a !== void 0 ? _a : network,
+            primaryWallet: primaryWallet,
             token: target.token,
             tokenAmount: target.tokenAmount,
-            walletAddress: walletAddress,
         });
     }), {
         deps: [

package/src/lib/context/OnrampContext/useOnrampProviders/useOnrampProviders.js

@@ -1,43 +1,23 @@
 'use client'
 import { __awaiter } from '../../../../../_virtual/_tslib.js';
 import { useMemo } from 'react';
-import { WalletAddressType } from '@dynamic-labs/sdk-api-core';
-import { getChainInfo, isBitcoinConnector } from '@dynamic-labs/wallet-connector-core';
-import { getOnrampProviders } from '../../../data/api/onramp/onramp.js';
-import { getWalletAdditionalAddressByType } from '../../../utils/functions/getWalletAdditionalAddressByType/getWalletAdditionalAddressByType.js';
 import { usePromise } from '../../../utils/hooks/usePromise/usePromise.js';
+import { getOnrampProviders } from '../utils/getOnrampProviders.js';
 
 const useOnrampProviders = ({ primaryWallet, network, environmentId, projectSettingsOnramps, target, includeDisabled, }) => {
-    var _a, _b;
-    const chainName = (primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.chain)
-        ? (_a = getChainInfo(primaryWallet.chain)) === null || _a === void 0 ? void 0 : _a.name
-        : undefined;
-    const chainNameToUse = (_b = target.chainName) !== null && _b !== void 0 ? _b : chainName;
-    const bitcoinAddress = primaryWallet &&
-        isBitcoinConnector(primaryWallet.connector) &&
-        getWalletAdditionalAddressByType(WalletAddressType.Payment, primaryWallet);
-    const chainHasNetwork = network && chainNameToUse === 'evm';
-    let networkToUse;
-    if (target.network) {
-        networkToUse = target.network;
-    }
-    else {
-        networkToUse = chainHasNetwork ? network.toString() : undefined;
-    }
     const { data: allOnRamps = [] } = usePromise(() => __awaiter(void 0, void 0, void 0, function* () {
-        if (!chainNameToUse || (!(primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.address) && !target.address))
-            return [];
-        const walletAddress = target.address || bitcoinAddress || (primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.address);
-        if (!walletAddress)
+        var _a;
+        if (!(primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.address))
             return [];
         return getOnrampProviders({
-            chain: chainNameToUse,
+            address: target.address,
+            chainName: target.chainName,
             environmentId,
             includeDisabled: true,
-            networkId: networkToUse,
+            network: (_a = target.network) !== null && _a !== void 0 ? _a : network,
+            primaryWallet: primaryWallet,
             token: target.token,
             tokenAmount: target.tokenAmount,
-            walletAddress: walletAddress,
         });
     }), {
         deps: [

package/src/lib/context/OnrampContext/utils/getOnrampProviders.cjs

@@ -0,0 +1,49 @@
+'use client'
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+var _tslib = require('../../../../../_virtual/_tslib.cjs');
+var sdkApiCore = require('@dynamic-labs/sdk-api-core');
+var walletConnectorCore = require('@dynamic-labs/wallet-connector-core');
+var onramp = require('../../../data/api/onramp/onramp.cjs');
+var getWalletAdditionalAddressByType = require('../../../utils/functions/getWalletAdditionalAddressByType/getWalletAdditionalAddressByType.cjs');
+
+const DEFAULT_NETWORK = 'evm';
+const DEFAULT_CHAIN = '1';
+const getOnrampProviders = (_a) => _tslib.__awaiter(void 0, [_a], void 0, function* ({ address, chainName, environmentId, network, primaryWallet, token, tokenAmount, includeDisabled = false, }) {
+    var _b;
+    const tempChainNameToUse = (primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.chain)
+        ? (_b = walletConnectorCore.getChainInfo(primaryWallet.chain)) === null || _b === void 0 ? void 0 : _b.name
+        : undefined;
+    const chainNameToUse = chainName !== null && chainName !== void 0 ? chainName : tempChainNameToUse;
+    const bitcoinAddress = primaryWallet &&
+        walletConnectorCore.isBitcoinConnector(primaryWallet.connector) &&
+        getWalletAdditionalAddressByType.getWalletAdditionalAddressByType(sdkApiCore.WalletAddressType.Payment, primaryWallet);
+    const chainHasNetwork = network && chainNameToUse === DEFAULT_NETWORK;
+    let networkToUse;
+    if (chainHasNetwork) {
+        networkToUse = (network === null || network === void 0 ? void 0 : network.toString()) || DEFAULT_CHAIN;
+    }
+    else {
+        networkToUse = undefined;
+    }
+    if (!chainNameToUse || (!(primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.address) && !address)) {
+        return [];
+    }
+    const walletAddress = address || bitcoinAddress || (primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.address);
+    if (!walletAddress)
+        return [];
+    const providers = yield onramp.getOnrampProviders({
+        chain: chainNameToUse,
+        environmentId,
+        includeDisabled,
+        networkId: networkToUse,
+        token,
+        tokenAmount,
+        walletAddress,
+    });
+    return providers || [];
+});
+
+exports.getOnrampProviders = getOnrampProviders;

package/src/lib/context/OnrampContext/utils/getOnrampProviders.d.ts

@@ -0,0 +1,3 @@
+import { RampConfiguration } from '@dynamic-labs/sdk-api-core';
+import { GetProvidersParams } from '../types';
+export declare const getOnrampProviders: ({ address, chainName, environmentId, network, primaryWallet, token, tokenAmount, includeDisabled, }: GetProvidersParams) => Promise<RampConfiguration[]>;

package/src/lib/context/OnrampContext/utils/getOnrampProviders.js

@@ -0,0 +1,45 @@
+'use client'
+import { __awaiter } from '../../../../../_virtual/_tslib.js';
+import { WalletAddressType } from '@dynamic-labs/sdk-api-core';
+import { getChainInfo, isBitcoinConnector } from '@dynamic-labs/wallet-connector-core';
+import { getOnrampProviders as getOnrampProviders$1 } from '../../../data/api/onramp/onramp.js';
+import { getWalletAdditionalAddressByType } from '../../../utils/functions/getWalletAdditionalAddressByType/getWalletAdditionalAddressByType.js';
+
+const DEFAULT_NETWORK = 'evm';
+const DEFAULT_CHAIN = '1';
+const getOnrampProviders = (_a) => __awaiter(void 0, [_a], void 0, function* ({ address, chainName, environmentId, network, primaryWallet, token, tokenAmount, includeDisabled = false, }) {
+    var _b;
+    const tempChainNameToUse = (primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.chain)
+        ? (_b = getChainInfo(primaryWallet.chain)) === null || _b === void 0 ? void 0 : _b.name
+        : undefined;
+    const chainNameToUse = chainName !== null && chainName !== void 0 ? chainName : tempChainNameToUse;
+    const bitcoinAddress = primaryWallet &&
+        isBitcoinConnector(primaryWallet.connector) &&
+        getWalletAdditionalAddressByType(WalletAddressType.Payment, primaryWallet);
+    const chainHasNetwork = network && chainNameToUse === DEFAULT_NETWORK;
+    let networkToUse;
+    if (chainHasNetwork) {
+        networkToUse = (network === null || network === void 0 ? void 0 : network.toString()) || DEFAULT_CHAIN;
+    }
+    else {
+        networkToUse = undefined;
+    }
+    if (!chainNameToUse || (!(primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.address) && !address)) {
+        return [];
+    }
+    const walletAddress = address || bitcoinAddress || (primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.address);
+    if (!walletAddress)
+        return [];
+    const providers = yield getOnrampProviders$1({
+        chain: chainNameToUse,
+        environmentId,
+        includeDisabled,
+        networkId: networkToUse,
+        token,
+        tokenAmount,
+        walletAddress,
+    });
+    return providers || [];
+});
+
+export { getOnrampProviders };

package/src/lib/context/ViewContext/ViewContext.cjs

@@ -7,6 +7,7 @@ var jsxRuntime = require('react/jsx-runtime');
 var React = require('react');
 var useDynamicEvents = require('../../utils/hooks/events/useDynamicEvents/useDynamicEvents.cjs');
 var ErrorContext = require('../ErrorContext/ErrorContext.cjs');
+var dynamicEvents = require('../../events/dynamicEvents.cjs');
 
 const ViewContext = React.createContext(undefined);
 const ViewContextProvider = ({ children, initialViewType }) => {
@@ -45,6 +46,7 @@ const ViewContextProvider = ({ children, initialViewType }) => {
             return;
         clearError();
         setStack((prev) => prev.slice(0, -1));
+        dynamicEvents.dynamicEvents.emit('goBack');
     }, [canGoBack, clearError]);
     const clearStackAndPush = React.useCallback((type, props, events) => {
         clearError();

package/src/lib/context/ViewContext/ViewContext.js

@@ -3,6 +3,7 @@ import { jsx } from 'react/jsx-runtime';
 import { createContext, useContext, useState, useMemo, useCallback } from 'react';
 import { useInternalDynamicEvents } from '../../utils/hooks/events/useDynamicEvents/useDynamicEvents.js';
 import { useErrorContext } from '../ErrorContext/ErrorContext.js';
+import { dynamicEvents } from '../../events/dynamicEvents.js';
 
 const ViewContext = createContext(undefined);
 const ViewContextProvider = ({ children, initialViewType }) => {
@@ -41,6 +42,7 @@ const ViewContextProvider = ({ children, initialViewType }) => {
             return;
         clearError();
         setStack((prev) => prev.slice(0, -1));
+        dynamicEvents.emit('goBack');
     }, [canGoBack, clearError]);
     const clearStackAndPush = useCallback((type, props, events) => {
         clearError();

package/src/lib/events/ui.d.ts

@@ -17,4 +17,8 @@ export type UIEvents = {
     }) => void;
     userProfileOpen: () => void;
     userProfileClose: () => void;
+    /**
+     * Triggered when the user clicks the back button
+     */
+    goBack: () => void;
 };

package/src/lib/utils/hooks/authenticationHooks/useConnectAndSign/useConnectAndSign.cjs

@@ -163,11 +163,18 @@ const useConnectAndSign = ({ shouldUpdateWallets = true, shouldCallCallback = tr
     };
     return (_a) => _tslib.__awaiter(void 0, [_a], void 0, function* ({ walletConnector, getAddressOpts = undefined, }) {
         var _b;
+        const connectionCancelPromise = new utils.DeferredPromise();
+        const onGoBack = () => _tslib.__awaiter(void 0, void 0, void 0, function* () {
+            loadingAndLifecycle.setIsInitialWalletVerificationInProgress(false);
+            connectionCancelPromise.reject(new utils.GetAddressCancelledError());
+        });
         try {
+            dynamicEvents.dynamicEvents.on('goBack', onGoBack);
+            dynamicEvents.dynamicEvents.on('authFlowClose', onGoBack);
+            dynamicEvents.dynamicEvents.once('walletAdded', unsetInitialWalletVerificationFlag.unsetInitialWalletVerificationFlag);
             // Lock the variable that indicates that the login wallet verification is in progress
             // Read UserWalletsContext.tsx explanation for more context
             loadingAndLifecycle.setIsInitialWalletVerificationInProgress(true);
-            dynamicEvents.dynamicEvents.once('walletAdded', unsetInitialWalletVerificationFlag.unsetInitialWalletVerificationFlag);
             yield showPendingConnectView.showPendingConnectView(walletConnector, pushView);
             if (walletConnectorCore.isEmailWalletConnector(walletConnector)) {
                 if (walletConnectorCore.isEmailOTPWalletConnector(walletConnector)) {
@@ -177,16 +184,20 @@ const useConnectAndSign = ({ shouldUpdateWallets = true, shouldCallCallback = tr
                     pushView('wait-for-email-confirmation-view');
                 }
             }
-            let connectionResult;
+            const connectionPromise = connectWallet(walletConnector, getAddressOpts, {
+                applyHandleConnectedWallet: shouldCallCallback,
+            });
             try {
-                connectionResult = yield connectWallet(walletConnector, getAddressOpts, {
-                    applyHandleConnectedWallet: shouldCallCallback,
-                });
+                yield Promise.race([
+                    connectionPromise,
+                    connectionCancelPromise.promise,
+                ]);
             }
             catch (error) {
                 handleWalletConnectionError(error);
                 return;
             }
+            const connectionResult = yield connectionPromise;
             // Fallback to catch any errors that were missed.
             if (!(connectionResult === null || connectionResult === void 0 ? void 0 : connectionResult.address)) {
                 handleWalletConnectionError();
@@ -246,6 +257,8 @@ const useConnectAndSign = ({ shouldUpdateWallets = true, shouldCallCallback = tr
             // 3. The SDK will enter a broken state. Try signing a message with wagmi.
             // You can also add a "pause on exception" breakpoint in the debugger and see what happens during verification.
             unsetInitialWalletVerificationFlag.unsetInitialWalletVerificationFlagWithTimeout();
+            dynamicEvents.dynamicEvents.removeListener('goBack', onGoBack);
+            dynamicEvents.dynamicEvents.removeListener('authFlowClose', onGoBack);
         }
     });
 };

package/src/lib/utils/hooks/authenticationHooks/useConnectAndSign/useConnectAndSign.js

@@ -1,6 +1,6 @@
 'use client'
 import { __awaiter } from '../../../../../../_virtual/_tslib.js';
-import { StorageService, CustomError, GetAddressCancelledError } from '@dynamic-labs/utils';
+import { DeferredPromise, StorageService, CustomError, GetAddressCancelledError } from '@dynamic-labs/utils';
 import { isEmailWalletConnector, isEmailOTPWalletConnector, isBloctoConnector } from '@dynamic-labs/wallet-connector-core';
 import { useCaptchaContext } from '../../../../context/CaptchaContext/CaptchaContext.js';
 import 'react';
@@ -159,11 +159,18 @@ const useConnectAndSign = ({ shouldUpdateWallets = true, shouldCallCallback = tr
     };
     return (_a) => __awaiter(void 0, [_a], void 0, function* ({ walletConnector, getAddressOpts = undefined, }) {
         var _b;
+        const connectionCancelPromise = new DeferredPromise();
+        const onGoBack = () => __awaiter(void 0, void 0, void 0, function* () {
+            setIsInitialWalletVerificationInProgress(false);
+            connectionCancelPromise.reject(new GetAddressCancelledError());
+        });
         try {
+            dynamicEvents.on('goBack', onGoBack);
+            dynamicEvents.on('authFlowClose', onGoBack);
+            dynamicEvents.once('walletAdded', unsetInitialWalletVerificationFlag);
             // Lock the variable that indicates that the login wallet verification is in progress
             // Read UserWalletsContext.tsx explanation for more context
             setIsInitialWalletVerificationInProgress(true);
-            dynamicEvents.once('walletAdded', unsetInitialWalletVerificationFlag);
             yield showPendingConnectView(walletConnector, pushView);
             if (isEmailWalletConnector(walletConnector)) {
                 if (isEmailOTPWalletConnector(walletConnector)) {
@@ -173,16 +180,20 @@ const useConnectAndSign = ({ shouldUpdateWallets = true, shouldCallCallback = tr
                     pushView('wait-for-email-confirmation-view');
                 }
             }
-            let connectionResult;
+            const connectionPromise = connectWallet(walletConnector, getAddressOpts, {
+                applyHandleConnectedWallet: shouldCallCallback,
+            });
             try {
-                connectionResult = yield connectWallet(walletConnector, getAddressOpts, {
-                    applyHandleConnectedWallet: shouldCallCallback,
-                });
+                yield Promise.race([
+                    connectionPromise,
+                    connectionCancelPromise.promise,
+                ]);
             }
             catch (error) {
                 handleWalletConnectionError(error);
                 return;
             }
+            const connectionResult = yield connectionPromise;
             // Fallback to catch any errors that were missed.
             if (!(connectionResult === null || connectionResult === void 0 ? void 0 : connectionResult.address)) {
                 handleWalletConnectionError();
@@ -242,6 +253,8 @@ const useConnectAndSign = ({ shouldUpdateWallets = true, shouldCallCallback = tr
             // 3. The SDK will enter a broken state. Try signing a message with wagmi.
             // You can also add a "pause on exception" breakpoint in the debugger and see what happens during verification.
             unsetInitialWalletVerificationFlagWithTimeout();
+            dynamicEvents.removeListener('goBack', onGoBack);
+            dynamicEvents.removeListener('authFlowClose', onGoBack);
         }
     });
 };

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

@@ -3,21 +3,15 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var React = require('react');
 var OnrampContext = require('../../../context/OnrampContext/OnrampContext.cjs');
 
 const useOnramp = () => {
-    const { onrampEnabled, openOnramp } = OnrampContext.useOnrampContext();
-    return React.useMemo(() => ({
-        /**
-         * Whether onramp is enabled.
-         */
+    const { onrampEnabled, enabledOnrampProviders, openOnramp } = OnrampContext.useOnrampContext();
+    return {
         enabled: onrampEnabled,
-        /**
-         * Opens the onramp modal.
-         */
         open: openOnramp,
-    }), [onrampEnabled, openOnramp]);
+        providers: enabledOnrampProviders,
+    };
 };
 
 exports.useOnramp = useOnramp;

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

@@ -1,11 +1,5 @@
 export declare const useOnramp: () => {
-    /**
-     * Whether onramp is enabled.
-     */
     enabled: boolean;
-    /**
-     * Opens the onramp modal.
-     */
     open: (props: {
         address?: string | undefined;
         token?: string | undefined;
@@ -16,4 +10,5 @@ export declare const useOnramp: () => {
         overrideOnRamp?: boolean | undefined;
         payingWithDynamic?: boolean | undefined;
     }) => Promise<void>;
+    providers: import("../../../context/DynamicContext").OnrampOption[];
 };

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

@@ -1,19 +1,13 @@
 'use client'
-import { useMemo } from 'react';
 import { useOnrampContext } from '../../../context/OnrampContext/OnrampContext.js';
 
 const useOnramp = () => {
-    const { onrampEnabled, openOnramp } = useOnrampContext();
-    return useMemo(() => ({
-        /**
-         * Whether onramp is enabled.
-         */
+    const { onrampEnabled, enabledOnrampProviders, openOnramp } = useOnrampContext();
+    return {
         enabled: onrampEnabled,
-        /**
-         * Opens the onramp modal.
-         */
         open: openOnramp,
-    }), [onrampEnabled, openOnramp]);
+        providers: enabledOnrampProviders,
+    };
 };
 
 export { useOnramp };