@dynamic-labs/sdk-react-core 4.25.1 → 4.25.2

package/CHANGELOG.md

@@ -1,4 +1,13 @@
 
+### [4.25.2](https://github.com/dynamic-labs/dynamic-auth/compare/v4.25.1...v4.25.2) (2025-07-18)
+
+
+### Bug Fixes
+
+* ensure captcha is engaged only once ([#9197](https://github.com/dynamic-labs/dynamic-auth/issues/9197)) ([708edea](https://github.com/dynamic-labs/dynamic-auth/commit/708edea5d492f1dedb398886bf6201d458b40454))
+* **GVTY-3193:** emit embedded wallet create event for waas ([#9179](https://github.com/dynamic-labs/dynamic-auth/issues/9179)) ([59c354d](https://github.com/dynamic-labs/dynamic-auth/commit/59c354d09524eed7d2f7727d1afbb567aabd1da2))
+* reset user/wallet state when removing last wallet ([#9192](https://github.com/dynamic-labs/dynamic-auth/issues/9192)) ([78d84f9](https://github.com/dynamic-labs/dynamic-auth/commit/78d84f9bd6cafd75ec3f18a312600e2bf46db85f))
+
 ### [4.25.1](https://github.com/dynamic-labs/dynamic-auth/compare/v4.25.0...v4.25.1) (2025-07-18)
 
 

package/package.cjs

@@ -3,7 +3,7 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var version = "4.25.1";
+var version = "4.25.2";
 var dependencies = {
 	"@dynamic-labs/sdk-api-core": "0.0.718",
 	"@dynamic-labs-sdk/client": "0.0.1-alpha.16",

package/package.js

@@ -1,5 +1,5 @@
 'use client'
-var version = "4.25.1";
+var version = "4.25.2";
 var dependencies = {
 	"@dynamic-labs/sdk-api-core": "0.0.718",
 	"@dynamic-labs-sdk/client": "0.0.1-alpha.16",

package/package.json

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

package/src/lib/context/ConnectWithOtpContext/ConnectWithOtpProvider.cjs

@@ -139,7 +139,8 @@ const ConnectWithOtpProvider = ({ children }) => {
             }),
         });
     });
-    const connectWithEmail = (email) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
+    const connectWithEmail = (email_1, ...args_1) => _tslib.__awaiter(void 0, [email_1, ...args_1], void 0, function* (email, options = {}) {
+        var _a;
         if (!isEmailValid.isEmailValid(email)) {
             throw new Error('Email is not valid');
         }
@@ -147,16 +148,17 @@ const ConnectWithOtpProvider = ({ children }) => {
         if (!mapProvider[effectiveEmailProvider].enabled) {
             throw new Error('Email provider is not enabled');
         }
-        const captchaToken = yield engageCaptchaIfNeeded('email');
+        const captchaToken = (_a = options.captchaToken) !== null && _a !== void 0 ? _a : (yield engageCaptchaIfNeeded('email'));
         const verificationHandler = yield mapProvider[effectiveEmailProvider].handler(email, captchaToken);
         lastVerificationHandlerRef.current = verificationHandler;
     });
-    const connectWithSms = (phone) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
+    const connectWithSms = (phone_1, ...args_2) => _tslib.__awaiter(void 0, [phone_1, ...args_2], void 0, function* (phone, options = {}) {
+        var _b;
         if (!isProviderEnabled.isProviderEnabled(providers, sdkApiCore.ProviderEnum.Sms)) {
             throw new Error('SMS provider is not enabled');
         }
         const handler = createSmsHandler.createSmsHandler(environmentId, embeddedWalletSessionKeys);
-        const captchaToken = yield engageCaptchaIfNeeded('phone');
+        const captchaToken = (_b = options.captchaToken) !== null && _b !== void 0 ? _b : (yield engageCaptchaIfNeeded('phone'));
         const verificationHandler = yield handler(phone, captchaToken);
         lastVerificationHandlerRef.current = verificationHandler;
     });

package/src/lib/context/ConnectWithOtpContext/ConnectWithOtpProvider.js

@@ -135,7 +135,8 @@ const ConnectWithOtpProvider = ({ children }) => {
             }),
         });
     });
-    const connectWithEmail = (email) => __awaiter(void 0, void 0, void 0, function* () {
+    const connectWithEmail = (email_1, ...args_1) => __awaiter(void 0, [email_1, ...args_1], void 0, function* (email, options = {}) {
+        var _a;
         if (!isEmailValid(email)) {
             throw new Error('Email is not valid');
         }
@@ -143,16 +144,17 @@ const ConnectWithOtpProvider = ({ children }) => {
         if (!mapProvider[effectiveEmailProvider].enabled) {
             throw new Error('Email provider is not enabled');
         }
-        const captchaToken = yield engageCaptchaIfNeeded('email');
+        const captchaToken = (_a = options.captchaToken) !== null && _a !== void 0 ? _a : (yield engageCaptchaIfNeeded('email'));
         const verificationHandler = yield mapProvider[effectiveEmailProvider].handler(email, captchaToken);
         lastVerificationHandlerRef.current = verificationHandler;
     });
-    const connectWithSms = (phone) => __awaiter(void 0, void 0, void 0, function* () {
+    const connectWithSms = (phone_1, ...args_2) => __awaiter(void 0, [phone_1, ...args_2], void 0, function* (phone, options = {}) {
+        var _b;
         if (!isProviderEnabled(providers, ProviderEnum.Sms)) {
             throw new Error('SMS provider is not enabled');
         }
         const handler = createSmsHandler(environmentId, embeddedWalletSessionKeys);
-        const captchaToken = yield engageCaptchaIfNeeded('phone');
+        const captchaToken = (_b = options.captchaToken) !== null && _b !== void 0 ? _b : (yield engageCaptchaIfNeeded('phone'));
         const verificationHandler = yield handler(phone, captchaToken);
         lastVerificationHandlerRef.current = verificationHandler;
     });

package/src/lib/context/DynamicContext/hooks/useRemoveWallet/useRemoveWallet.cjs

@@ -37,7 +37,11 @@ const useRemoveWallet = ({ secondaryWallets, handleLogOut, setPrimaryWallet, })
     const { removedWalletsIds, userWallets } = UserWalletsContext.useInternalUserWallets();
     const connectedWalletsInfo$1 = connectedWalletsInfo.useConnectedWalletsInfo();
     const nextWalletId = React.useMemo(() => (secondaryWallets[0] ? secondaryWallets[0].id : undefined), [secondaryWallets]);
-    const callback = React.useCallback((walletId) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
+    const onLastWalletRemoved = React.useCallback((clearStackAndPushInitialView) => {
+        primaryWalletId.resetPrimaryWalletId();
+        clearStackAndPushInitialView === null || clearStackAndPushInitialView === void 0 ? void 0 : clearStackAndPushInitialView();
+    }, []);
+    const callback = React.useCallback((walletId, clearStackAndPushInitialView) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
         var _a;
         const wallet = userWallets.find((w) => w.id === walletId);
         if (!wallet)
@@ -45,8 +49,9 @@ const useRemoveWallet = ({ secondaryWallets, handleLogOut, setPrimaryWallet, })
         const primaryWalletId$1 = primaryWalletId.getPrimaryWalletId();
         const isUnlinkingPrimaryWallet = walletId === primaryWalletId$1;
         const authMode$1 = authMode.getAuthMode();
+        const user = (_a = client.getDynamicClient()) === null || _a === void 0 ? void 0 : _a.user;
         if (authMode$1 === 'connect-and-sign') {
-            const isLastVerifiedCredential = ((_a = client.getDynamicClient().user) === null || _a === void 0 ? void 0 : _a.verifiedCredentials.length) === 1;
+            const isLastVerifiedCredential = (user === null || user === void 0 ? void 0 : user.verifiedCredentials.length) === 1;
             if (isLastVerifiedCredential) {
                 throw new utils.DynamicError('This is your only login method. Add another wallet or log in method before removing it.');
             }
@@ -71,6 +76,10 @@ const useRemoveWallet = ({ secondaryWallets, handleLogOut, setPrimaryWallet, })
         if (isUnlinkingPrimaryWallet && nextWalletId) {
             setPrimaryWallet(nextWalletId);
         }
+        // If there are no wallets left and no user, we need to reset the primary wallet and clear the view stack
+        if (!nextWalletId) {
+            onLastWalletRemoved(clearStackAndPushInitialView);
+        }
         const numberOfWalletsWithSameConnector = userWallets.filter(({ connector }) => connector.key === wallet.connector.key).length;
         // If there's only 1, it's the one being removed and we can kill the session
         if (numberOfWalletsWithSameConnector === 1) {
@@ -82,6 +91,7 @@ const useRemoveWallet = ({ secondaryWallets, handleLogOut, setPrimaryWallet, })
         nextWalletId,
         removedWalletsIds,
         setPrimaryWallet,
+        onLastWalletRemoved,
     ]);
     return callback;
 };

package/src/lib/context/DynamicContext/hooks/useRemoveWallet/useRemoveWallet.d.ts

@@ -4,4 +4,4 @@ export type UseRemoveWalletProps = {
     handleLogOut: () => void;
     setPrimaryWallet: (walletId: string) => void;
 };
-export declare const useRemoveWallet: ({ secondaryWallets, handleLogOut, setPrimaryWallet, }: UseRemoveWalletProps) => (walletId: string) => Promise<void>;
+export declare const useRemoveWallet: ({ secondaryWallets, handleLogOut, setPrimaryWallet, }: UseRemoveWalletProps) => (walletId: string, clearStackAndPushInitialView?: () => void) => Promise<void>;

package/src/lib/context/DynamicContext/hooks/useRemoveWallet/useRemoveWallet.js

@@ -19,7 +19,7 @@ import '@dynamic-labs/wallet-book';
 import '../../../../shared/consts/index.js';
 import '../../../../store/state/nonce/nonce.js';
 import { getEnvironmentId } from '../../../../store/state/dynamicContextProps/dynamicContextProps.js';
-import { getPrimaryWalletId } from '../../../../store/state/primaryWalletId/primaryWalletId.js';
+import { resetPrimaryWalletId, getPrimaryWalletId } from '../../../../store/state/primaryWalletId/primaryWalletId.js';
 import { useConnectedWalletsInfo, setConnectedWalletsInfo } from '../../../../store/state/connectedWalletsInfo/connectedWalletsInfo.js';
 import '../../../../events/dynamicEvents.js';
 import '../../../../store/state/projectSettings/projectSettings.js';
@@ -33,7 +33,11 @@ const useRemoveWallet = ({ secondaryWallets, handleLogOut, setPrimaryWallet, })
     const { removedWalletsIds, userWallets } = useInternalUserWallets();
     const connectedWalletsInfo = useConnectedWalletsInfo();
     const nextWalletId = useMemo(() => (secondaryWallets[0] ? secondaryWallets[0].id : undefined), [secondaryWallets]);
-    const callback = useCallback((walletId) => __awaiter(void 0, void 0, void 0, function* () {
+    const onLastWalletRemoved = useCallback((clearStackAndPushInitialView) => {
+        resetPrimaryWalletId();
+        clearStackAndPushInitialView === null || clearStackAndPushInitialView === void 0 ? void 0 : clearStackAndPushInitialView();
+    }, []);
+    const callback = useCallback((walletId, clearStackAndPushInitialView) => __awaiter(void 0, void 0, void 0, function* () {
         var _a;
         const wallet = userWallets.find((w) => w.id === walletId);
         if (!wallet)
@@ -41,8 +45,9 @@ const useRemoveWallet = ({ secondaryWallets, handleLogOut, setPrimaryWallet, })
         const primaryWalletId = getPrimaryWalletId();
         const isUnlinkingPrimaryWallet = walletId === primaryWalletId;
         const authMode = getAuthMode();
+        const user = (_a = getDynamicClient()) === null || _a === void 0 ? void 0 : _a.user;
         if (authMode === 'connect-and-sign') {
-            const isLastVerifiedCredential = ((_a = getDynamicClient().user) === null || _a === void 0 ? void 0 : _a.verifiedCredentials.length) === 1;
+            const isLastVerifiedCredential = (user === null || user === void 0 ? void 0 : user.verifiedCredentials.length) === 1;
             if (isLastVerifiedCredential) {
                 throw new DynamicError('This is your only login method. Add another wallet or log in method before removing it.');
             }
@@ -67,6 +72,10 @@ const useRemoveWallet = ({ secondaryWallets, handleLogOut, setPrimaryWallet, })
         if (isUnlinkingPrimaryWallet && nextWalletId) {
             setPrimaryWallet(nextWalletId);
         }
+        // If there are no wallets left and no user, we need to reset the primary wallet and clear the view stack
+        if (!nextWalletId) {
+            onLastWalletRemoved(clearStackAndPushInitialView);
+        }
         const numberOfWalletsWithSameConnector = userWallets.filter(({ connector }) => connector.key === wallet.connector.key).length;
         // If there's only 1, it's the one being removed and we can kill the session
         if (numberOfWalletsWithSameConnector === 1) {
@@ -78,6 +87,7 @@ const useRemoveWallet = ({ secondaryWallets, handleLogOut, setPrimaryWallet, })
         nextWalletId,
         removedWalletsIds,
         setPrimaryWallet,
+        onLastWalletRemoved,
     ]);
     return callback;
 };

package/src/lib/context/DynamicContext/types/IDynamicContext.d.ts

@@ -62,7 +62,7 @@ export interface IDynamicContext {
     getConnectedWalletById: (walletId: string) => Wallet | undefined;
     getNameService: (address?: string) => Promise<NameServiceData | undefined>;
     handleLogOut: () => Promise<void>;
-    removeWallet: (walletId: string) => Promise<void>;
+    removeWallet: (walletId: string, clearStackAndPushInitialView?: () => void) => Promise<void>;
     handlers?: DynamicHandlers;
     isBridgeFlow: boolean;
     /** Whether there is an instance of DynamicEmbeddedAuthFlow being rendered */

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

@@ -7,17 +7,18 @@ var _tslib = require('../../../../../_virtual/_tslib.cjs');
 var React = require('react');
 var sdkApiCore = require('@dynamic-labs/sdk-api-core');
 var utils = require('@dynamic-labs/utils');
+var walletConnectorCore = require('@dynamic-labs/wallet-connector-core');
+var dynamicEvents = require('../../../events/dynamicEvents.cjs');
 require('@dynamic-labs-sdk/client/core');
 require('@dynamic-labs-sdk/client');
 require('../../../client/client.cjs');
-require('../../constants/values.cjs');
+var values = require('../../constants/values.cjs');
 require('@dynamic-labs/multi-wallet');
 require('../../../shared/logger.cjs');
 require('../../constants/colors.cjs');
 var getMinAuthToken = require('../../functions/getMinAuthToken/getMinAuthToken.cjs');
 require('react-international-phone');
 require('@dynamic-labs/iconic');
-require('@dynamic-labs/wallet-connector-core');
 require('react/jsx-runtime');
 require('../../../context/ViewContext/ViewContext.cjs');
 require('@dynamic-labs/wallet-book');
@@ -28,7 +29,6 @@ var updatePrimaryWalletId = require('../../functions/updatePrimaryWalletId/updat
 require('../../../store/state/connectedWalletsInfo/connectedWalletsInfo.cjs');
 var dynamicContextProps = require('../../../store/state/dynamicContextProps/dynamicContextProps.cjs');
 require('../../../store/state/primaryWalletId/primaryWalletId.cjs');
-require('../../../events/dynamicEvents.cjs');
 var projectSettings = require('../../../store/state/projectSettings/projectSettings.cjs');
 var useOnboardingCompleteUser = require('../../../client/extension/user/useOnboardingCompleteUser/useOnboardingCompleteUser.cjs');
 require('../../../context/DynamicContext/DynamicContext.cjs');
@@ -212,9 +212,29 @@ const useDynamicWaas = () => {
         const refreshedUser = yield refresh();
         if (refreshedUser) {
             // Add new wallet IDs to trigger walletAdded events
-            const newWalletIds = getNewVerifiedCredentialsFromDiff.getNewVerifiedCredentialsFromDiff(previousVerifiedCredentials, refreshedUser.verifiedCredentials)
-                .filter(({ format }) => format === sdkApiCore.JwtVerifiedCredentialFormatEnum.Blockchain)
-                .map(({ id }) => id);
+            const newWalletVerifiedCredentials = getNewVerifiedCredentialsFromDiff.getNewVerifiedCredentialsFromDiff(previousVerifiedCredentials, refreshedUser.verifiedCredentials).filter(({ format }) => format === sdkApiCore.JwtVerifiedCredentialFormatEnum.Blockchain);
+            newWalletVerifiedCredentials.forEach((walletVerifiedCredential) => {
+                var _a, _b, _c;
+                try {
+                    const chain = values.VerifiedCredentialNameToChainEnum[(_a = walletVerifiedCredential === null || walletVerifiedCredential === void 0 ? void 0 : walletVerifiedCredential.chain) !== null && _a !== void 0 ? _a : ''];
+                    const walletConnector = getWalletConnector(chain);
+                    if (!walletConnector)
+                        return;
+                    const wallet = walletConnector.createWallet({
+                        address: (_b = walletVerifiedCredential.address) !== null && _b !== void 0 ? _b : '',
+                        chain,
+                        connector: walletConnector,
+                        id: walletVerifiedCredential.id,
+                        isAuthenticated: true,
+                        key: (_c = walletVerifiedCredential.walletName) !== null && _c !== void 0 ? _c : '',
+                    });
+                    dynamicEvents.dynamicEvents.emit('embeddedWalletCreated', wallet, walletVerifiedCredential, user);
+                }
+                catch (error) {
+                    walletConnectorCore.logger.error(error);
+                }
+            });
+            const newWalletIds = newWalletVerifiedCredentials.map(({ id }) => id);
             addedWalletsIds.current = addedWalletsIds.current.concat(newWalletIds);
             if (primaryWalletAccount) {
                 const createdPrimaryWallet = refreshedUser.verifiedCredentials.find((wallet) => {

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

@@ -3,17 +3,18 @@ import { __awaiter } from '../../../../../_virtual/_tslib.js';
 import { useCallback, useMemo } from 'react';
 import { EmbeddedWalletVersionEnum, JwtVerifiedCredentialFormatEnum, WalletProviderEnum } from '@dynamic-labs/sdk-api-core';
 import { DynamicError } from '@dynamic-labs/utils';
+import { logger } from '@dynamic-labs/wallet-connector-core';
+import { dynamicEvents } from '../../../events/dynamicEvents.js';
 import '@dynamic-labs-sdk/client/core';
 import '@dynamic-labs-sdk/client';
 import '../../../client/client.js';
-import '../../constants/values.js';
+import { VerifiedCredentialNameToChainEnum } from '../../constants/values.js';
 import '@dynamic-labs/multi-wallet';
 import '../../../shared/logger.js';
 import '../../constants/colors.js';
 import { getMinAuthToken } from '../../functions/getMinAuthToken/getMinAuthToken.js';
 import 'react-international-phone';
 import '@dynamic-labs/iconic';
-import '@dynamic-labs/wallet-connector-core';
 import 'react/jsx-runtime';
 import '../../../context/ViewContext/ViewContext.js';
 import '@dynamic-labs/wallet-book';
@@ -24,7 +25,6 @@ import { updatePrimaryWalletId } from '../../functions/updatePrimaryWalletId/upd
 import '../../../store/state/connectedWalletsInfo/connectedWalletsInfo.js';
 import { useApiBaseUrl, useEnvironmentId } from '../../../store/state/dynamicContextProps/dynamicContextProps.js';
 import '../../../store/state/primaryWalletId/primaryWalletId.js';
-import '../../../events/dynamicEvents.js';
 import { useProjectSettings } from '../../../store/state/projectSettings/projectSettings.js';
 import { useOnboardingCompleteUserProfile } from '../../../client/extension/user/useOnboardingCompleteUser/useOnboardingCompleteUser.js';
 import '../../../context/DynamicContext/DynamicContext.js';
@@ -208,9 +208,29 @@ const useDynamicWaas = () => {
         const refreshedUser = yield refresh();
         if (refreshedUser) {
             // Add new wallet IDs to trigger walletAdded events
-            const newWalletIds = getNewVerifiedCredentialsFromDiff(previousVerifiedCredentials, refreshedUser.verifiedCredentials)
-                .filter(({ format }) => format === JwtVerifiedCredentialFormatEnum.Blockchain)
-                .map(({ id }) => id);
+            const newWalletVerifiedCredentials = getNewVerifiedCredentialsFromDiff(previousVerifiedCredentials, refreshedUser.verifiedCredentials).filter(({ format }) => format === JwtVerifiedCredentialFormatEnum.Blockchain);
+            newWalletVerifiedCredentials.forEach((walletVerifiedCredential) => {
+                var _a, _b, _c;
+                try {
+                    const chain = VerifiedCredentialNameToChainEnum[(_a = walletVerifiedCredential === null || walletVerifiedCredential === void 0 ? void 0 : walletVerifiedCredential.chain) !== null && _a !== void 0 ? _a : ''];
+                    const walletConnector = getWalletConnector(chain);
+                    if (!walletConnector)
+                        return;
+                    const wallet = walletConnector.createWallet({
+                        address: (_b = walletVerifiedCredential.address) !== null && _b !== void 0 ? _b : '',
+                        chain,
+                        connector: walletConnector,
+                        id: walletVerifiedCredential.id,
+                        isAuthenticated: true,
+                        key: (_c = walletVerifiedCredential.walletName) !== null && _c !== void 0 ? _c : '',
+                    });
+                    dynamicEvents.emit('embeddedWalletCreated', wallet, walletVerifiedCredential, user);
+                }
+                catch (error) {
+                    logger.error(error);
+                }
+            });
+            const newWalletIds = newWalletVerifiedCredentials.map(({ id }) => id);
             addedWalletsIds.current = addedWalletsIds.current.concat(newWalletIds);
             if (primaryWalletAccount) {
                 const createdPrimaryWallet = refreshedUser.verifiedCredentials.find((wallet) => {

package/src/lib/widgets/DynamicWidget/components/ActiveWalletInformation/ActiveWalletInformation.cjs

@@ -16,7 +16,7 @@ var key = require('../../../../shared/assets/key.cjs');
 var unlink = require('../../../../shared/assets/unlink.cjs');
 var walletV2 = require('../../../../shared/assets/wallet-v2.cjs');
 require('@dynamic-labs/iconic');
-require('../../../../context/ViewContext/ViewContext.cjs');
+var ViewContext = require('../../../../context/ViewContext/ViewContext.cjs');
 require('@dynamic-labs/sdk-api-core');
 var logger = require('../../../../shared/logger.cjs');
 require('@dynamic-labs/wallet-book');
@@ -127,6 +127,7 @@ const ActiveWalletInformation = ({ isLoading = false, }) => {
     /** Controls the [WalletDetailsCard] open state */
     const [detailsCardOpen, setDetailsCardOpen] = React.useState(false);
     const { primaryWallet, network, user, removeWallet } = useInternalDynamicContext.useInternalDynamicContext();
+    const { clearStackAndPushInitialView } = ViewContext.useViewContext();
     const authMode$1 = authMode.useAuthMode();
     const projectSettings$1 = projectSettings.useProjectSettings();
     const { setDynamicWidgetView, headerAlert } = DynamicWidgetContext.useWidgetContext();
@@ -146,9 +147,9 @@ const ActiveWalletInformation = ({ isLoading = false, }) => {
     const removePrimaryWallet = React.useCallback(() => {
         const primaryWalletId$1 = primaryWalletId.getPrimaryWalletId();
         if (primaryWalletId$1) {
-            removeWallet(primaryWalletId$1);
+            removeWallet(primaryWalletId$1, clearStackAndPushInitialView);
         }
-    }, [removeWallet]);
+    }, [removeWallet, clearStackAndPushInitialView]);
     const options = [
         {
             Icon: jsxRuntime.jsx(copy.ReactComponent, { width: DROPDOWN_ICON_SIZE, height: DROPDOWN_ICON_SIZE }),

package/src/lib/widgets/DynamicWidget/components/ActiveWalletInformation/ActiveWalletInformation.js

@@ -12,7 +12,7 @@ import { ReactComponent as SvgKey } from '../../../../shared/assets/key.js';
 import { ReactComponent as SvgUnlink } from '../../../../shared/assets/unlink.js';
 import { ReactComponent as SvgWalletV2 } from '../../../../shared/assets/wallet-v2.js';
 import '@dynamic-labs/iconic';
-import '../../../../context/ViewContext/ViewContext.js';
+import { useViewContext } from '../../../../context/ViewContext/ViewContext.js';
 import '@dynamic-labs/sdk-api-core';
 import { logger } from '../../../../shared/logger.js';
 import '@dynamic-labs/wallet-book';
@@ -123,6 +123,7 @@ const ActiveWalletInformation = ({ isLoading = false, }) => {
     /** Controls the [WalletDetailsCard] open state */
     const [detailsCardOpen, setDetailsCardOpen] = useState(false);
     const { primaryWallet, network, user, removeWallet } = useInternalDynamicContext();
+    const { clearStackAndPushInitialView } = useViewContext();
     const authMode = useAuthMode();
     const projectSettings = useProjectSettings();
     const { setDynamicWidgetView, headerAlert } = useWidgetContext();
@@ -142,9 +143,9 @@ const ActiveWalletInformation = ({ isLoading = false, }) => {
     const removePrimaryWallet = useCallback(() => {
         const primaryWalletId = getPrimaryWalletId();
         if (primaryWalletId) {
-            removeWallet(primaryWalletId);
+            removeWallet(primaryWalletId, clearStackAndPushInitialView);
         }
-    }, [removeWallet]);
+    }, [removeWallet, clearStackAndPushInitialView]);
     const options = [
         {
             Icon: jsx(SvgCopy, { width: DROPDOWN_ICON_SIZE, height: DROPDOWN_ICON_SIZE }),

package/src/lib/widgets/DynamicWidget/prompts/UnlinkWalletPopUp/UnlinkWalletPopUp.cjs

@@ -6,20 +6,24 @@ Object.defineProperty(exports, '__esModule', { value: true });
 var _tslib = require('../../../../../../_virtual/_tslib.cjs');
 var jsxRuntime = require('react/jsx-runtime');
 var reactI18next = require('react-i18next');
+require('@dynamic-labs/utils');
+require('../../../../components/Accordion/components/AccordionItem/AccordionItem.cjs');
 require('react');
-require('../../../../context/DynamicContext/DynamicContext.cjs');
-require('../../../../store/state/loadingAndLifecycle/loadingAndLifecycle.cjs');
+require('@dynamic-labs/iconic');
+require('../../../../context/ViewContext/ViewContext.cjs');
 require('@dynamic-labs/sdk-api-core');
 var logger = require('../../../../shared/logger.cjs');
-require('@dynamic-labs/iconic');
 require('@dynamic-labs/wallet-connector-core');
-require('../../../../context/ViewContext/ViewContext.cjs');
 require('@dynamic-labs/wallet-book');
-require('@dynamic-labs/utils');
 require('../../../../utils/constants/colors.cjs');
 require('../../../../utils/constants/values.cjs');
 require('../../../../shared/consts/index.cjs');
+require('../../../../components/Alert/Alert.cjs');
 require('../../../../events/dynamicEvents.cjs');
+require('../../../../context/DynamicContext/DynamicContext.cjs');
+require('../../../../store/state/loadingAndLifecycle/loadingAndLifecycle.cjs');
+var authMode = require('../../../../store/state/authMode/authMode.cjs');
+var useInternalDynamicContext = require('../../../../context/DynamicContext/useDynamicContext/useInternalDynamicContext/useInternalDynamicContext.cjs');
 require('../../../../context/CaptchaContext/CaptchaContext.cjs');
 require('../../../../context/ErrorContext/ErrorContext.cjs');
 require('@dynamic-labs/multi-wallet');
@@ -37,7 +41,6 @@ require('../../../../store/state/connectedWalletsInfo/connectedWalletsInfo.cjs')
 require('../../../../context/AccessDeniedContext/AccessDeniedContext.cjs');
 require('../../../../context/AccountExistsContext/AccountExistsContext.cjs');
 require('../../../../context/UserWalletsContext/UserWalletsContext.cjs');
-var authMode = require('../../../../store/state/authMode/authMode.cjs');
 require('../../../../context/VerificationContext/VerificationContext.cjs');
 require('react-dom');
 require('../../../../utils/functions/compareChains/compareChains.cjs');
@@ -57,53 +60,50 @@ require('../../../../context/FieldsStateContext/FieldsStateContext.cjs');
 require('../../../../context/UserFieldEditorContext/UserFieldEditorContext.cjs');
 require('@dynamic-labs/rpc-providers');
 require('../../../../store/state/walletOptions/walletOptions.cjs');
-require('../../../../components/Accordion/components/AccordionItem/AccordionItem.cjs');
-require('../../../../components/Alert/Alert.cjs');
 var Typography = require('../../../../components/Typography/Typography.cjs');
+require('../../../../context/FooterAnimationContext/index.cjs');
 require('../../../../components/ShadowDOM/ShadowDOM.cjs');
-var TypographyButton = require('../../../../components/TypographyButton/TypographyButton.cjs');
-require('../../../../components/IconButton/IconButton.cjs');
-require('../../../../components/InlineWidget/InlineWidget.cjs');
-require('../../../../components/Input/Input.cjs');
-require('../../../../components/IsBrowser/IsBrowser.cjs');
-require('../../../../components/MenuList/Dropdown/Dropdown.cjs');
-require('../../../../components/OverlayCard/OverlayCard.cjs');
 require('../../../../components/Transition/ZoomTransition/ZoomTransition.cjs');
 require('../../../../components/Transition/SlideInUpTransition/SlideInUpTransition.cjs');
 require('../../../../components/Transition/OpacityTransition/OpacityTransition.cjs');
-require('../../../../components/PasskeyCreatedSuccessBanner/PasskeyCreatedSuccessBanner.cjs');
-require('../../../../components/Popper/Popper/Popper.cjs');
-require('../../../../components/Popper/PopperContext/PopperContext.cjs');
-require('react-focus-lock');
-require('qrcode');
-var useCloseMultiWalletPrompt = require('../../hooks/useCloseMultiWalletPrompt/useCloseMultiWalletPrompt.cjs');
-require('formik');
-require('../../../../utils/hooks/useSubdomainCheck/useSubdomainCheck.cjs');
-require('../../../../context/WalletGroupContext/WalletGroupContext.cjs');
-require('../../../../context/IpConfigurationContext/IpConfigurationContext.cjs');
-require('../../../../context/ConnectWithOtpContext/ConnectWithOtpContext.cjs');
-require('../../../DynamicBridgeWidget/views/WalletsView/components/SecondaryWallets/SecondaryWallets.cjs');
-require('@hcaptcha/react-hcaptcha');
-require('../../context/DynamicWidgetContext.cjs');
-require('../../../../context/FooterAnimationContext/index.cjs');
-require('../../../../context/ErrorContext/hooks/useErrorText/useErrorText.cjs');
-require('../../../../context/PasskeyContext/PasskeyContext.cjs');
-require('../../helpers/convertExchangeKeyAndProviderEnum.cjs');
-require('../../../../store/state/sendBalances.cjs');
-require('../../../../store/state/connectorsInitializing/connectorsInitializing.cjs');
 require('../../../../components/OverlayCardBase/OverlayCardTarget/OverlayCardTarget.cjs');
+require('../../../../context/WalletGroupContext/WalletGroupContext.cjs');
 require('../../components/DynamicWidgetHeader/DynamicWidgetHeader.cjs');
 var PromptModal = require('../../components/PromptModal/PromptModal.cjs');
 var WidgetPortal = require('../../components/WidgetPortal/WidgetPortal.cjs');
+var useCloseMultiWalletPrompt = require('../../hooks/useCloseMultiWalletPrompt/useCloseMultiWalletPrompt.cjs');
+require('../../context/DynamicWidgetContext.cjs');
+require('../../../../components/IconButton/IconButton.cjs');
+require('../../../../components/MenuList/Dropdown/Dropdown.cjs');
+var TypographyButton = require('../../../../components/TypographyButton/TypographyButton.cjs');
+require('formik');
+require('../../../../utils/hooks/useSubdomainCheck/useSubdomainCheck.cjs');
+require('../../../../store/state/sendBalances.cjs');
+require('../../../../components/Input/Input.cjs');
+require('../../../../components/OverlayCard/OverlayCard.cjs');
 require('../../../../views/TransactionConfirmationView/TransactionConfirmationView.cjs');
+require('../../../../components/PasskeyCreatedSuccessBanner/PasskeyCreatedSuccessBanner.cjs');
+require('../../../../context/PasskeyContext/PasskeyContext.cjs');
 require('../../components/PasskeyCard/PasskeyCard.cjs');
 require('../../../../context/OnrampContext/OnrampContext.cjs');
+require('../../helpers/convertExchangeKeyAndProviderEnum.cjs');
+require('qrcode');
 require('../../views/ReceiveWalletFunds/ReceiveWalletFunds.cjs');
 require('../../../../../index.cjs');
+require('../../../../context/IpConfigurationContext/IpConfigurationContext.cjs');
+require('../../../../context/ConnectWithOtpContext/ConnectWithOtpContext.cjs');
+require('../../../DynamicBridgeWidget/views/WalletsView/components/SecondaryWallets/SecondaryWallets.cjs');
+require('@hcaptcha/react-hcaptcha');
+require('../../../../context/ErrorContext/hooks/useErrorText/useErrorText.cjs');
+require('../../../../store/state/connectorsInitializing/connectorsInitializing.cjs');
 require('../../../../store/state/tokenBalances.cjs');
 require('../../../../store/state/multichainBalances.cjs');
 require('../../../../shared/utils/functions/getInitialUrl/getInitialUrl.cjs');
-var useInternalDynamicContext = require('../../../../context/DynamicContext/useDynamicContext/useInternalDynamicContext/useInternalDynamicContext.cjs');
+require('../../../../components/InlineWidget/InlineWidget.cjs');
+require('../../../../components/IsBrowser/IsBrowser.cjs');
+require('../../../../components/Popper/Popper/Popper.cjs');
+require('../../../../components/Popper/PopperContext/PopperContext.cjs');
+require('react-focus-lock');
 
 const UnlinkWalletPopUpContent = ({ onClickCancel, }) => {
     var _a;

package/src/lib/widgets/DynamicWidget/prompts/UnlinkWalletPopUp/UnlinkWalletPopUp.js

@@ -2,20 +2,24 @@
 import { __awaiter } from '../../../../../../_virtual/_tslib.js';
 import { jsx, jsxs } from 'react/jsx-runtime';
 import { useTranslation } from 'react-i18next';
+import '@dynamic-labs/utils';
+import '../../../../components/Accordion/components/AccordionItem/AccordionItem.js';
 import 'react';
-import '../../../../context/DynamicContext/DynamicContext.js';
-import '../../../../store/state/loadingAndLifecycle/loadingAndLifecycle.js';
+import '@dynamic-labs/iconic';
+import '../../../../context/ViewContext/ViewContext.js';
 import '@dynamic-labs/sdk-api-core';
 import { logger } from '../../../../shared/logger.js';
-import '@dynamic-labs/iconic';
 import '@dynamic-labs/wallet-connector-core';
-import '../../../../context/ViewContext/ViewContext.js';
 import '@dynamic-labs/wallet-book';
-import '@dynamic-labs/utils';
 import '../../../../utils/constants/colors.js';
 import '../../../../utils/constants/values.js';
 import '../../../../shared/consts/index.js';
+import '../../../../components/Alert/Alert.js';
 import '../../../../events/dynamicEvents.js';
+import '../../../../context/DynamicContext/DynamicContext.js';
+import '../../../../store/state/loadingAndLifecycle/loadingAndLifecycle.js';
+import { useAuthMode } from '../../../../store/state/authMode/authMode.js';
+import { useInternalDynamicContext } from '../../../../context/DynamicContext/useDynamicContext/useInternalDynamicContext/useInternalDynamicContext.js';
 import '../../../../context/CaptchaContext/CaptchaContext.js';
 import '../../../../context/ErrorContext/ErrorContext.js';
 import '@dynamic-labs/multi-wallet';
@@ -33,7 +37,6 @@ import '../../../../store/state/connectedWalletsInfo/connectedWalletsInfo.js';
 import '../../../../context/AccessDeniedContext/AccessDeniedContext.js';
 import '../../../../context/AccountExistsContext/AccountExistsContext.js';
 import '../../../../context/UserWalletsContext/UserWalletsContext.js';
-import { useAuthMode } from '../../../../store/state/authMode/authMode.js';
 import '../../../../context/VerificationContext/VerificationContext.js';
 import 'react-dom';
 import '../../../../utils/functions/compareChains/compareChains.js';
@@ -53,53 +56,50 @@ import '../../../../context/FieldsStateContext/FieldsStateContext.js';
 import '../../../../context/UserFieldEditorContext/UserFieldEditorContext.js';
 import '@dynamic-labs/rpc-providers';
 import '../../../../store/state/walletOptions/walletOptions.js';
-import '../../../../components/Accordion/components/AccordionItem/AccordionItem.js';
-import '../../../../components/Alert/Alert.js';
 import { Typography } from '../../../../components/Typography/Typography.js';
+import '../../../../context/FooterAnimationContext/index.js';
 import '../../../../components/ShadowDOM/ShadowDOM.js';
-import { TypographyButton } from '../../../../components/TypographyButton/TypographyButton.js';
-import '../../../../components/IconButton/IconButton.js';
-import '../../../../components/InlineWidget/InlineWidget.js';
-import '../../../../components/Input/Input.js';
-import '../../../../components/IsBrowser/IsBrowser.js';
-import '../../../../components/MenuList/Dropdown/Dropdown.js';
-import '../../../../components/OverlayCard/OverlayCard.js';
 import '../../../../components/Transition/ZoomTransition/ZoomTransition.js';
 import '../../../../components/Transition/SlideInUpTransition/SlideInUpTransition.js';
 import '../../../../components/Transition/OpacityTransition/OpacityTransition.js';
-import '../../../../components/PasskeyCreatedSuccessBanner/PasskeyCreatedSuccessBanner.js';
-import '../../../../components/Popper/Popper/Popper.js';
-import '../../../../components/Popper/PopperContext/PopperContext.js';
-import 'react-focus-lock';
-import 'qrcode';
-import { useCloseMultiWalletPrompt } from '../../hooks/useCloseMultiWalletPrompt/useCloseMultiWalletPrompt.js';
-import 'formik';
-import '../../../../utils/hooks/useSubdomainCheck/useSubdomainCheck.js';
-import '../../../../context/WalletGroupContext/WalletGroupContext.js';
-import '../../../../context/IpConfigurationContext/IpConfigurationContext.js';
-import '../../../../context/ConnectWithOtpContext/ConnectWithOtpContext.js';
-import '../../../DynamicBridgeWidget/views/WalletsView/components/SecondaryWallets/SecondaryWallets.js';
-import '@hcaptcha/react-hcaptcha';
-import '../../context/DynamicWidgetContext.js';
-import '../../../../context/FooterAnimationContext/index.js';
-import '../../../../context/ErrorContext/hooks/useErrorText/useErrorText.js';
-import '../../../../context/PasskeyContext/PasskeyContext.js';
-import '../../helpers/convertExchangeKeyAndProviderEnum.js';
-import '../../../../store/state/sendBalances.js';
-import '../../../../store/state/connectorsInitializing/connectorsInitializing.js';
 import '../../../../components/OverlayCardBase/OverlayCardTarget/OverlayCardTarget.js';
+import '../../../../context/WalletGroupContext/WalletGroupContext.js';
 import '../../components/DynamicWidgetHeader/DynamicWidgetHeader.js';
 import { PromptModal } from '../../components/PromptModal/PromptModal.js';
 import { WidgetPortal } from '../../components/WidgetPortal/WidgetPortal.js';
+import { useCloseMultiWalletPrompt } from '../../hooks/useCloseMultiWalletPrompt/useCloseMultiWalletPrompt.js';
+import '../../context/DynamicWidgetContext.js';
+import '../../../../components/IconButton/IconButton.js';
+import '../../../../components/MenuList/Dropdown/Dropdown.js';
+import { TypographyButton } from '../../../../components/TypographyButton/TypographyButton.js';
+import 'formik';
+import '../../../../utils/hooks/useSubdomainCheck/useSubdomainCheck.js';
+import '../../../../store/state/sendBalances.js';
+import '../../../../components/Input/Input.js';
+import '../../../../components/OverlayCard/OverlayCard.js';
 import '../../../../views/TransactionConfirmationView/TransactionConfirmationView.js';
+import '../../../../components/PasskeyCreatedSuccessBanner/PasskeyCreatedSuccessBanner.js';
+import '../../../../context/PasskeyContext/PasskeyContext.js';
 import '../../components/PasskeyCard/PasskeyCard.js';
 import '../../../../context/OnrampContext/OnrampContext.js';
+import '../../helpers/convertExchangeKeyAndProviderEnum.js';
+import 'qrcode';
 import '../../views/ReceiveWalletFunds/ReceiveWalletFunds.js';
 import '../../../../../index.js';
+import '../../../../context/IpConfigurationContext/IpConfigurationContext.js';
+import '../../../../context/ConnectWithOtpContext/ConnectWithOtpContext.js';
+import '../../../DynamicBridgeWidget/views/WalletsView/components/SecondaryWallets/SecondaryWallets.js';
+import '@hcaptcha/react-hcaptcha';
+import '../../../../context/ErrorContext/hooks/useErrorText/useErrorText.js';
+import '../../../../store/state/connectorsInitializing/connectorsInitializing.js';
 import '../../../../store/state/tokenBalances.js';
 import '../../../../store/state/multichainBalances.js';
 import '../../../../shared/utils/functions/getInitialUrl/getInitialUrl.js';
-import { useInternalDynamicContext } from '../../../../context/DynamicContext/useDynamicContext/useInternalDynamicContext/useInternalDynamicContext.js';
+import '../../../../components/InlineWidget/InlineWidget.js';
+import '../../../../components/IsBrowser/IsBrowser.js';
+import '../../../../components/Popper/Popper/Popper.js';
+import '../../../../components/Popper/PopperContext/PopperContext.js';
+import 'react-focus-lock';
 
 const UnlinkWalletPopUpContent = ({ onClickCancel, }) => {
     var _a;