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

package/src/lib/utils/functions/walletListBuilder/utils/groupWalletOptions/groupWalletOptions.cjs

@@ -39,6 +39,10 @@ const groupWalletOptions = (walletGroups, walletOptionList) => {
             return output.push(currentWalletOption);
         }
         const walletGroupData = walletGroups[currentWalletOption.group];
+        // If for some reason this is undefined, ignore it
+        if (!walletGroupData) {
+            return output.push(currentWalletOption);
+        }
         const walletGroup = {
             groupedWallets: [currentWalletOption],
             key: walletGroupData.key,

package/src/lib/utils/functions/walletListBuilder/utils/groupWalletOptions/groupWalletOptions.js

@@ -35,6 +35,10 @@ const groupWalletOptions = (walletGroups, walletOptionList) => {
             return output.push(currentWalletOption);
         }
         const walletGroupData = walletGroups[currentWalletOption.group];
+        // If for some reason this is undefined, ignore it
+        if (!walletGroupData) {
+            return output.push(currentWalletOption);
+        }
         const walletGroup = {
             groupedWallets: [currentWalletOption],
             key: walletGroupData.key,

package/src/lib/utils/hooks/authenticationHooks/helpers/showPendingConnectView.cjs

@@ -7,7 +7,7 @@ var _tslib = require('../../../../../../_virtual/_tslib.cjs');
 var getWalletProvider = require('../../../functions/getWalletProvider/getWalletProvider.cjs');
 
 const specialCareWallets = ['bloctoevm', 'perawallet', 'metamaskstarknet'];
-const showPendingConnectView = (walletConnector, setView) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
+const showPendingConnectView = (walletConnector, pushView) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
     const walletProvider = getWalletProvider.getWalletProvider(walletConnector);
     // We don't want to show the pending connect view for qrCode and walletConnect
     // They have their own view with qrCode so we don't need to show the pending connect view
@@ -19,13 +19,13 @@ const showPendingConnectView = (walletConnector, setView) => _tslib.__awaiter(vo
             // bloctoevm and some other wallets works different as Justin mentioned in this commit:
             // https://github.com/dynamic-labs/DynamicAuth/commit/57233d3620611bc91439f3d4587b8516f8d16f99
             // It needs to show the connect view before getting connected accounts
-            setView('pending-connect');
+            pushView('pending-connect');
         }
     });
     const connectedAccounts = yield walletConnector.getConnectedAccounts();
     /* istanbul ignore else */
     if (connectedAccounts.length === 0) {
-        setView('pending-connect');
+        pushView('pending-connect');
     }
 });
 

package/src/lib/utils/hooks/authenticationHooks/helpers/showPendingConnectView.d.ts

@@ -1,3 +1,3 @@
 import type { WalletConnector } from '@dynamic-labs/wallet-connector-core';
 import { ViewType } from '../../../../context/ViewContext';
-export declare const showPendingConnectView: (walletConnector: WalletConnector, setView: (view: ViewType) => void) => Promise<void>;
+export declare const showPendingConnectView: (walletConnector: WalletConnector, pushView: (view: ViewType) => void) => Promise<void>;

package/src/lib/utils/hooks/authenticationHooks/helpers/showPendingConnectView.js

@@ -3,7 +3,7 @@ import { __awaiter } from '../../../../../../_virtual/_tslib.js';
 import { getWalletProvider } from '../../../functions/getWalletProvider/getWalletProvider.js';
 
 const specialCareWallets = ['bloctoevm', 'perawallet', 'metamaskstarknet'];
-const showPendingConnectView = (walletConnector, setView) => __awaiter(void 0, void 0, void 0, function* () {
+const showPendingConnectView = (walletConnector, pushView) => __awaiter(void 0, void 0, void 0, function* () {
     const walletProvider = getWalletProvider(walletConnector);
     // We don't want to show the pending connect view for qrCode and walletConnect
     // They have their own view with qrCode so we don't need to show the pending connect view
@@ -15,13 +15,13 @@ const showPendingConnectView = (walletConnector, setView) => __awaiter(void 0, v
             // bloctoevm and some other wallets works different as Justin mentioned in this commit:
             // https://github.com/dynamic-labs/DynamicAuth/commit/57233d3620611bc91439f3d4587b8516f8d16f99
             // It needs to show the connect view before getting connected accounts
-            setView('pending-connect');
+            pushView('pending-connect');
         }
     });
     const connectedAccounts = yield walletConnector.getConnectedAccounts();
     /* istanbul ignore else */
     if (connectedAccounts.length === 0) {
-        setView('pending-connect');
+        pushView('pending-connect');
     }
 });
 

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

@@ -4,8 +4,8 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 var _tslib = require('../../../../../../_virtual/_tslib.cjs');
-var walletConnectorCore = require('@dynamic-labs/wallet-connector-core');
 var utils = require('@dynamic-labs/utils');
+var walletConnectorCore = require('@dynamic-labs/wallet-connector-core');
 var CaptchaContext = require('../../../../context/CaptchaContext/CaptchaContext.cjs');
 require('react');
 require('../../../../context/DynamicContext/DynamicContext.cjs');
@@ -99,7 +99,7 @@ require('../../../../shared/utils/functions/getInitialUrl/getInitialUrl.cjs');
 var useInternalDynamicContext = require('../../../../context/DynamicContext/useDynamicContext/useInternalDynamicContext.cjs');
 
 const useConnectAndSign = ({ shouldUpdateWallets = true, shouldCallCallback = true, } = {}) => {
-    const { setView, goToInitialView, replaceView } = ViewContext.useViewContext();
+    const { pushView, clearStackAndPushInitialView, replaceView } = ViewContext.useViewContext();
     const { engageCaptcha, getCaptchaToken } = CaptchaContext.useCaptchaContext();
     const { setErrorMessage } = ErrorContext.useErrorContext();
     const { authMode, connectWallet, displaySiweStatement, environmentId, projectSettings, networkValidationMode, setIsSingleWalletAccount, user, walletUiUtils, } = useInternalDynamicContext.useInternalDynamicContext();
@@ -130,18 +130,18 @@ const useConnectAndSign = ({ shouldUpdateWallets = true, shouldCallCallback = tr
         if (!userCancelled)
             logger.logger.debug(err);
         setErrorMessage((_a = err === null || err === void 0 ? void 0 : err.code) === null || _a === void 0 ? void 0 : _a.toString());
-        goToInitialView();
+        clearStackAndPushInitialView();
     };
     return (_a) => _tslib.__awaiter(void 0, [_a], void 0, function* ({ walletConnector, getAddressOpts = undefined, }) {
         var _b;
         try {
-            yield showPendingConnectView.showPendingConnectView(walletConnector, setView);
+            yield showPendingConnectView.showPendingConnectView(walletConnector, pushView);
             if (walletConnectorCore.isEmailWalletConnector(walletConnector)) {
                 if (walletConnectorCore.isEmailOTPWalletConnector(walletConnector)) {
-                    setView('email-wallet-otp-verification-view');
+                    pushView('email-wallet-otp-verification-view');
                 }
                 else if (!walletConnectorCore.isBloctoConnector(walletConnector)) {
-                    setView('wait-for-email-confirmation-view');
+                    pushView('wait-for-email-confirmation-view');
                 }
             }
             const connectionResult = yield connectWallet(walletConnector, getAddressOpts, {
@@ -160,9 +160,9 @@ const useConnectAndSign = ({ shouldUpdateWallets = true, shouldCallCallback = tr
                 networkValidationMode === 'sign-in';
             if (!usesSupportedNetwork && isNetworkValidationEnabledForSignIn) {
                 if (!isProgrammableNetworkSwitchSupported.isProgrammableNetworkSwitchSupported(walletConnector)) {
-                    return setView('network-not-supported-manual');
+                    return pushView('network-not-supported-manual');
                 }
-                return setView('network-not-supported');
+                return pushView('network-not-supported');
             }
             if (isConnectOnly.isConnectOnly(user, authMode)) {
                 utils.StorageService.setItem(localStorage.LAST_USED_WALLET, walletConnector.key);

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

@@ -1,7 +1,7 @@
 'use client'
 import { __awaiter } from '../../../../../../_virtual/_tslib.js';
-import { isEmailWalletConnector, isEmailOTPWalletConnector, isBloctoConnector } from '@dynamic-labs/wallet-connector-core';
 import { StorageService } from '@dynamic-labs/utils';
+import { isEmailWalletConnector, isEmailOTPWalletConnector, isBloctoConnector } from '@dynamic-labs/wallet-connector-core';
 import { useCaptchaContext } from '../../../../context/CaptchaContext/CaptchaContext.js';
 import 'react';
 import '../../../../context/DynamicContext/DynamicContext.js';
@@ -95,7 +95,7 @@ import '../../../../shared/utils/functions/getInitialUrl/getInitialUrl.js';
 import { useInternalDynamicContext } from '../../../../context/DynamicContext/useDynamicContext/useInternalDynamicContext.js';
 
 const useConnectAndSign = ({ shouldUpdateWallets = true, shouldCallCallback = true, } = {}) => {
-    const { setView, goToInitialView, replaceView } = useViewContext();
+    const { pushView, clearStackAndPushInitialView, replaceView } = useViewContext();
     const { engageCaptcha, getCaptchaToken } = useCaptchaContext();
     const { setErrorMessage } = useErrorContext();
     const { authMode, connectWallet, displaySiweStatement, environmentId, projectSettings, networkValidationMode, setIsSingleWalletAccount, user, walletUiUtils, } = useInternalDynamicContext();
@@ -126,18 +126,18 @@ const useConnectAndSign = ({ shouldUpdateWallets = true, shouldCallCallback = tr
         if (!userCancelled)
             logger.debug(err);
         setErrorMessage((_a = err === null || err === void 0 ? void 0 : err.code) === null || _a === void 0 ? void 0 : _a.toString());
-        goToInitialView();
+        clearStackAndPushInitialView();
     };
     return (_a) => __awaiter(void 0, [_a], void 0, function* ({ walletConnector, getAddressOpts = undefined, }) {
         var _b;
         try {
-            yield showPendingConnectView(walletConnector, setView);
+            yield showPendingConnectView(walletConnector, pushView);
             if (isEmailWalletConnector(walletConnector)) {
                 if (isEmailOTPWalletConnector(walletConnector)) {
-                    setView('email-wallet-otp-verification-view');
+                    pushView('email-wallet-otp-verification-view');
                 }
                 else if (!isBloctoConnector(walletConnector)) {
-                    setView('wait-for-email-confirmation-view');
+                    pushView('wait-for-email-confirmation-view');
                 }
             }
             const connectionResult = yield connectWallet(walletConnector, getAddressOpts, {
@@ -156,9 +156,9 @@ const useConnectAndSign = ({ shouldUpdateWallets = true, shouldCallCallback = tr
                 networkValidationMode === 'sign-in';
             if (!usesSupportedNetwork && isNetworkValidationEnabledForSignIn) {
                 if (!isProgrammableNetworkSwitchSupported(walletConnector)) {
-                    return setView('network-not-supported-manual');
+                    return pushView('network-not-supported-manual');
                 }
-                return setView('network-not-supported');
+                return pushView('network-not-supported');
             }
             if (isConnectOnly(user, authMode)) {
                 StorageService.setItem(LAST_USED_WALLET, walletConnector.key);

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

@@ -99,7 +99,7 @@ require('../../../../shared/utils/functions/getInitialUrl/getInitialUrl.cjs');
 var useInternalDynamicContext = require('../../../../context/DynamicContext/useDynamicContext/useInternalDynamicContext.cjs');
 
 const useConnectAndSignSplitSteps = () => {
-    const { setView, goToInitialView } = ViewContext.useViewContext();
+    const { pushView, clearStackAndPushInitialView } = ViewContext.useViewContext();
     const { setErrorMessage } = ErrorContext.useErrorContext();
     const { getCaptchaToken, engageCaptcha } = CaptchaContext.useCaptchaContext();
     const { connectWallet, displaySiweStatement, projectSettings, environmentId, networkValidationMode, setIsSingleWalletAccount, setShowAuthFlow, user, authMode, } = useInternalDynamicContext.useInternalDynamicContext();
@@ -120,7 +120,7 @@ const useConnectAndSignSplitSteps = () => {
          */
         if (err instanceof utils.MissingPublicAddressError && utils.isMobile())
             return;
-        goToInitialView();
+        clearStackAndPushInitialView();
         setErrorMessage((_a = err.code) !== null && _a !== void 0 ? _a : err.toString());
     };
     // This method is similar to useConnectAndSign, but it skips signing for now
@@ -130,7 +130,7 @@ const useConnectAndSignSplitSteps = () => {
     const onlyConnectUser = (_a) => _tslib.__awaiter(void 0, [_a], void 0, function* ({ walletConnector, getAddressOpts = undefined, shouldShowPendingConnectView = true, }) {
         var _b;
         if (shouldShowPendingConnectView)
-            yield showPendingConnectView.showPendingConnectView(walletConnector, setView);
+            yield showPendingConnectView.showPendingConnectView(walletConnector, pushView);
         try {
             yield connectWallet(walletConnector, getAddressOpts);
             if (isConnectOnly.isConnectOnly(user, authMode)) {
@@ -143,13 +143,13 @@ const useConnectAndSignSplitSteps = () => {
                     authMethod: 'wallet',
                     onCaptchaSuccess: (_captchaToken) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
                         setShowAuthFlow(true);
-                        setView('pending-signature');
+                        pushView('pending-signature');
                     }),
                 });
                 return;
             }
             setShowAuthFlow(true);
-            setView('pending-signature');
+            pushView('pending-signature');
         }
         catch (err) {
             onErrorHandler(err);
@@ -173,9 +173,9 @@ const useConnectAndSignSplitSteps = () => {
                 networkValidationMode === 'sign-in';
             if (!usesSupportedNetwork && isNetworkValidationEnabledForSignIn) {
                 if (!isProgrammableNetworkSwitchSupported.isProgrammableNetworkSwitchSupported(walletConnector)) {
-                    return setView('network-not-supported-manual');
+                    return pushView('network-not-supported-manual');
                 }
-                return setView('network-not-supported');
+                return pushView('network-not-supported');
             }
             yield verifyWallet({
                 captchaToken: getCaptchaToken(),

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

@@ -95,7 +95,7 @@ import '../../../../shared/utils/functions/getInitialUrl/getInitialUrl.js';
 import { useInternalDynamicContext } from '../../../../context/DynamicContext/useDynamicContext/useInternalDynamicContext.js';
 
 const useConnectAndSignSplitSteps = () => {
-    const { setView, goToInitialView } = useViewContext();
+    const { pushView, clearStackAndPushInitialView } = useViewContext();
     const { setErrorMessage } = useErrorContext();
     const { getCaptchaToken, engageCaptcha } = useCaptchaContext();
     const { connectWallet, displaySiweStatement, projectSettings, environmentId, networkValidationMode, setIsSingleWalletAccount, setShowAuthFlow, user, authMode, } = useInternalDynamicContext();
@@ -116,7 +116,7 @@ const useConnectAndSignSplitSteps = () => {
          */
         if (err instanceof MissingPublicAddressError && isMobile())
             return;
-        goToInitialView();
+        clearStackAndPushInitialView();
         setErrorMessage((_a = err.code) !== null && _a !== void 0 ? _a : err.toString());
     };
     // This method is similar to useConnectAndSign, but it skips signing for now
@@ -126,7 +126,7 @@ const useConnectAndSignSplitSteps = () => {
     const onlyConnectUser = (_a) => __awaiter(void 0, [_a], void 0, function* ({ walletConnector, getAddressOpts = undefined, shouldShowPendingConnectView = true, }) {
         var _b;
         if (shouldShowPendingConnectView)
-            yield showPendingConnectView(walletConnector, setView);
+            yield showPendingConnectView(walletConnector, pushView);
         try {
             yield connectWallet(walletConnector, getAddressOpts);
             if (isConnectOnly(user, authMode)) {
@@ -139,13 +139,13 @@ const useConnectAndSignSplitSteps = () => {
                     authMethod: 'wallet',
                     onCaptchaSuccess: (_captchaToken) => __awaiter(void 0, void 0, void 0, function* () {
                         setShowAuthFlow(true);
-                        setView('pending-signature');
+                        pushView('pending-signature');
                     }),
                 });
                 return;
             }
             setShowAuthFlow(true);
-            setView('pending-signature');
+            pushView('pending-signature');
         }
         catch (err) {
             onErrorHandler(err);
@@ -169,9 +169,9 @@ const useConnectAndSignSplitSteps = () => {
                 networkValidationMode === 'sign-in';
             if (!usesSupportedNetwork && isNetworkValidationEnabledForSignIn) {
                 if (!isProgrammableNetworkSwitchSupported(walletConnector)) {
-                    return setView('network-not-supported-manual');
+                    return pushView('network-not-supported-manual');
                 }
-                return setView('network-not-supported');
+                return pushView('network-not-supported');
             }
             yield verifyWallet({
                 captchaToken: getCaptchaToken(),

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

@@ -93,7 +93,7 @@ require('../../../../shared/utils/functions/getInitialUrl/getInitialUrl.cjs');
 var useInternalDynamicContext = require('../../../../context/DynamicContext/useDynamicContext/useInternalDynamicContext.cjs');
 
 const useSignConnectOnlyUser = () => {
-    const { setView } = ViewContext.useViewContext();
+    const { pushView } = ViewContext.useViewContext();
     const { setErrorMessage } = ErrorContext.useErrorContext();
     const { getCaptchaToken } = CaptchaContext.useCaptchaContext();
     const { connectWallet, displaySiweStatement, projectSettings, environmentId, setIsSingleWalletAccount, setShowAuthFlow, setSelectedWalletConnectorKey, walletUiUtils, } = useInternalDynamicContext.useInternalDynamicContext();
@@ -114,7 +114,7 @@ const useSignConnectOnlyUser = () => {
             // We don't want to show the back button in the pending signature view
             // because we don't want to go back to the wallet-list
             setSelectedWalletConnectorKey(walletConnector.key);
-            setView('pending-signature-without-back-button');
+            pushView('pending-signature-without-back-button');
             setShowAuthFlow(true);
             // Wallet should be already connected at this point
             // We just need to verify it

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

@@ -89,7 +89,7 @@ import '../../../../shared/utils/functions/getInitialUrl/getInitialUrl.js';
 import { useInternalDynamicContext } from '../../../../context/DynamicContext/useDynamicContext/useInternalDynamicContext.js';
 
 const useSignConnectOnlyUser = () => {
-    const { setView } = useViewContext();
+    const { pushView } = useViewContext();
     const { setErrorMessage } = useErrorContext();
     const { getCaptchaToken } = useCaptchaContext();
     const { connectWallet, displaySiweStatement, projectSettings, environmentId, setIsSingleWalletAccount, setShowAuthFlow, setSelectedWalletConnectorKey, walletUiUtils, } = useInternalDynamicContext();
@@ -110,7 +110,7 @@ const useSignConnectOnlyUser = () => {
             // We don't want to show the back button in the pending signature view
             // because we don't want to go back to the wallet-list
             setSelectedWalletConnectorKey(walletConnector.key);
-            setView('pending-signature-without-back-button');
+            pushView('pending-signature-without-back-button');
             setShowAuthFlow(true);
             // Wallet should be already connected at this point
             // We just need to verify it

package/src/lib/utils/hooks/multiWallet/useVerifyOnAwaitingSignature/useVerifyOnAwaitingSignature.cjs

@@ -128,6 +128,11 @@ const useVerifyOnAwaitingSignature = () => {
         setMultiWalletWidgetState,
         triggerConnectAndSign,
     ]);
+    // This is the effect that triggers the connect and sign flow
+    // when the multi wallet widget is in the awaiting_signature state
+    // with linking_new_wallet signature sub state.
+    // This is a very, very bad pattern and should be refactored if possible,
+    // though that would be a lot of work and this works for now.
     React.useEffect(() => {
         if (!legacyIsVerifying &&
             !isVerifying.current &&

package/src/lib/utils/hooks/multiWallet/useVerifyOnAwaitingSignature/useVerifyOnAwaitingSignature.js

@@ -124,6 +124,11 @@ const useVerifyOnAwaitingSignature = () => {
         setMultiWalletWidgetState,
         triggerConnectAndSign,
     ]);
+    // This is the effect that triggers the connect and sign flow
+    // when the multi wallet widget is in the awaiting_signature state
+    // with linking_new_wallet signature sub state.
+    // This is a very, very bad pattern and should be refactored if possible,
+    // though that would be a lot of work and this works for now.
     useEffect(() => {
         if (!legacyIsVerifying &&
             !isVerifying.current &&

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

@@ -97,7 +97,7 @@ var useInternalDynamicContext = require('../../../context/DynamicContext/useDyna
 
 const useConnectedWalletsNetworkValidation = () => {
     const { connectedWallets, selectedWalletConnector, setSelectedWalletConnectorKey, setShowAuthFlow, bridgeChainsToConnect, sdkHasLoaded, } = useInternalDynamicContext.useInternalDynamicContext();
-    const { setView } = ViewContext.useViewContext();
+    const { pushView } = ViewContext.useViewContext();
     const isLoggedIn = useIsLoggedIn.useIsLoggedIn();
     const getConnectedWalletsWithInvalidNetwork = React.useCallback(() => _tslib.__awaiter(void 0, void 0, void 0, function* () {
         const connectedWalletsWithInvalidNetwork = [];
@@ -133,13 +133,13 @@ const useConnectedWalletsNetworkValidation = () => {
             : 'network-not-supported-manual';
         // Doesn't rerender if it's already true
         setShowAuthFlow(true);
-        setView(networkNotSupportedView);
+        pushView(networkNotSupportedView);
     }), [
         getConnectedWalletsWithInvalidNetwork,
         selectedWalletConnector === null || selectedWalletConnector === void 0 ? void 0 : selectedWalletConnector.key,
         setSelectedWalletConnectorKey,
         setShowAuthFlow,
-        setView,
+        pushView,
     ]);
     const uniqueConnectors = React.useMemo(() => {
         const connectors = connectedWallets.map(({ connector }) => connector);

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

@@ -93,7 +93,7 @@ import { useInternalDynamicContext } from '../../../context/DynamicContext/useDy
 
 const useConnectedWalletsNetworkValidation = () => {
     const { connectedWallets, selectedWalletConnector, setSelectedWalletConnectorKey, setShowAuthFlow, bridgeChainsToConnect, sdkHasLoaded, } = useInternalDynamicContext();
-    const { setView } = useViewContext();
+    const { pushView } = useViewContext();
     const isLoggedIn = useIsLoggedIn();
     const getConnectedWalletsWithInvalidNetwork = useCallback(() => __awaiter(void 0, void 0, void 0, function* () {
         const connectedWalletsWithInvalidNetwork = [];
@@ -129,13 +129,13 @@ const useConnectedWalletsNetworkValidation = () => {
             : 'network-not-supported-manual';
         // Doesn't rerender if it's already true
         setShowAuthFlow(true);
-        setView(networkNotSupportedView);
+        pushView(networkNotSupportedView);
     }), [
         getConnectedWalletsWithInvalidNetwork,
         selectedWalletConnector === null || selectedWalletConnector === void 0 ? void 0 : selectedWalletConnector.key,
         setSelectedWalletConnectorKey,
         setShowAuthFlow,
-        setView,
+        pushView,
     ]);
     const uniqueConnectors = useMemo(() => {
         const connectors = connectedWallets.map(({ connector }) => connector);

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

@@ -105,7 +105,7 @@ var useInternalDynamicContext = require('../../../context/DynamicContext/useDyna
 const useDynamicModals = () => {
     const { projectSettings, user, multiWallet, setShowAuthFlow } = useInternalDynamicContext.useInternalDynamicContext();
     const isLoggedIn = useIsLoggedIn.useIsLoggedIn();
-    const { setView } = ViewContext.useViewContext();
+    const { clearStackAndPush } = ViewContext.useViewContext();
     const canLink = isAllowedToLinkWallet.isAllowedToLinkWallet(projectSettings, user === null || user === void 0 ? void 0 : user.verifiedCredentials, multiWallet);
     const { setShowMfaChooseType, setShowMfaEnterBackupCodes, setShowMfaQRCode, setShowMfaViewBackupCodes, setShowOTPVerification, } = useMfaModals.useMfaModals();
     const setSetShowLinkNewWalletModalWithInit = React.useCallback((value) => {
@@ -119,7 +119,7 @@ const useDynamicModals = () => {
                 logger.logger.warn('setShowLinkNewWalletModal was called but the user is not allowed to link a wallet. This results in a no-op. Please double check that multi-wallet is enabled in the dashboard. For more information, see: https://docs.dynamic.xyz/branded-wallets/multi-wallet');
                 return;
             }
-            setView('multi-wallet-wallet-list');
+            clearStackAndPush('multi-wallet-wallet-list');
         }
         setShowAuthFlow(value, {
             emitCancelAuth: true,
@@ -127,7 +127,7 @@ const useDynamicModals = () => {
             initializeWalletConnect: true,
             performMultiWalletChecks: false,
         });
-    }, [canLink, isLoggedIn, setShowAuthFlow, setView]);
+    }, [canLink, isLoggedIn, setShowAuthFlow, clearStackAndPush]);
     return {
         setShowLinkNewWalletModal: setSetShowLinkNewWalletModalWithInit,
         setShowMfaChooseType,

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

@@ -101,7 +101,7 @@ import { useInternalDynamicContext } from '../../../context/DynamicContext/useDy
 const useDynamicModals = () => {
     const { projectSettings, user, multiWallet, setShowAuthFlow } = useInternalDynamicContext();
     const isLoggedIn = useIsLoggedIn();
-    const { setView } = useViewContext();
+    const { clearStackAndPush } = useViewContext();
     const canLink = isAllowedToLinkWallet(projectSettings, user === null || user === void 0 ? void 0 : user.verifiedCredentials, multiWallet);
     const { setShowMfaChooseType, setShowMfaEnterBackupCodes, setShowMfaQRCode, setShowMfaViewBackupCodes, setShowOTPVerification, } = useMfaModals();
     const setSetShowLinkNewWalletModalWithInit = useCallback((value) => {
@@ -115,7 +115,7 @@ const useDynamicModals = () => {
                 logger.warn('setShowLinkNewWalletModal was called but the user is not allowed to link a wallet. This results in a no-op. Please double check that multi-wallet is enabled in the dashboard. For more information, see: https://docs.dynamic.xyz/branded-wallets/multi-wallet');
                 return;
             }
-            setView('multi-wallet-wallet-list');
+            clearStackAndPush('multi-wallet-wallet-list');
         }
         setShowAuthFlow(value, {
             emitCancelAuth: true,
@@ -123,7 +123,7 @@ const useDynamicModals = () => {
             initializeWalletConnect: true,
             performMultiWalletChecks: false,
         });
-    }, [canLink, isLoggedIn, setShowAuthFlow, setView]);
+    }, [canLink, isLoggedIn, setShowAuthFlow, clearStackAndPush]);
     return {
         setShowLinkNewWalletModal: setSetShowLinkNewWalletModalWithInit,
         setShowMfaChooseType,

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

@@ -100,7 +100,7 @@ var useInternalDynamicContext = require('../../../context/DynamicContext/useDyna
 const useEmbeddedReveal = () => {
     const { primaryWallet, projectSettings, user, setShowAuthFlow } = useInternalDynamicContext.useInternalDynamicContext();
     const { userHasEmbeddedWallet } = useEmbeddedWallet.useEmbeddedWallet();
-    const { setView } = ViewContext.useViewContext();
+    const { pushView } = ViewContext.useViewContext();
     const { isTurnkeyWallet } = useIsTurnkeyWallet.useIsTurnkeyWallet();
     const turnkeyChecks = ({ user, recoveryPhrase, }) => {
         var _a, _b;
@@ -144,7 +144,7 @@ const useEmbeddedReveal = () => {
             ignoreIfIsEmbeddedWidget: false,
             performMultiWalletChecks: false,
         });
-        setView('embedded-reveal-view', {
+        pushView('embedded-reveal-view', {
             exportPrivateKey: !recoveryPhrase,
             isPromptForExport,
         });
@@ -152,7 +152,7 @@ const useEmbeddedReveal = () => {
             dynamicEvents.dynamicEvents.once('embeddedWalletRevealCompleted', (wallet) => resolve(wallet));
             dynamicEvents.dynamicEvents.once('embeddedWalletRevealFailed', (error) => reject(error));
         });
-    }), [primaryWallet, isTurnkeyWallet, setShowAuthFlow, setView, user]);
+    }), [primaryWallet, isTurnkeyWallet, setShowAuthFlow, pushView, user]);
     return {
         initExportProcess,
     };

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

@@ -96,7 +96,7 @@ import { useInternalDynamicContext } from '../../../context/DynamicContext/useDy
 const useEmbeddedReveal = () => {
     const { primaryWallet, projectSettings, user, setShowAuthFlow } = useInternalDynamicContext();
     const { userHasEmbeddedWallet } = useEmbeddedWallet();
-    const { setView } = useViewContext();
+    const { pushView } = useViewContext();
     const { isTurnkeyWallet } = useIsTurnkeyWallet();
     const turnkeyChecks = ({ user, recoveryPhrase, }) => {
         var _a, _b;
@@ -140,7 +140,7 @@ const useEmbeddedReveal = () => {
             ignoreIfIsEmbeddedWidget: false,
             performMultiWalletChecks: false,
         });
-        setView('embedded-reveal-view', {
+        pushView('embedded-reveal-view', {
             exportPrivateKey: !recoveryPhrase,
             isPromptForExport,
         });
@@ -148,7 +148,7 @@ const useEmbeddedReveal = () => {
             dynamicEvents.once('embeddedWalletRevealCompleted', (wallet) => resolve(wallet));
             dynamicEvents.once('embeddedWalletRevealFailed', (error) => reject(error));
         });
-    }), [primaryWallet, isTurnkeyWallet, setShowAuthFlow, setView, user]);
+    }), [primaryWallet, isTurnkeyWallet, setShowAuthFlow, pushView, user]);
     return {
         initExportProcess,
     };

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

@@ -105,7 +105,7 @@ var useInternalDynamicContext = require('../../../../../context/DynamicContext/u
 // Hook exposed to customers and used internally to trigger embedded wallet creation
 const useTurnkey = () => {
     const { projectSettings, walletConnectorOptions, setShowAuthFlow, environmentId, user, primaryWallet, } = useInternalDynamicContext.useInternalDynamicContext();
-    const { setView } = ViewContext.useViewContext();
+    const { pushView } = ViewContext.useViewContext();
     const { createDynamicEmbeddedWalletMutation } = useCreateDynamicEmbeddedWalletMutation.useCreateDynamicEmbeddedWalletMutation();
     const { getEOAWallet } = useSmartWallets.useSmartWallets();
     const startHeadlessEmbeddedWalletCreationFlow = React.useCallback((chains, options) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
@@ -141,7 +141,7 @@ const useTurnkey = () => {
             ignoreIfIsEmbeddedWidget: false,
             performMultiWalletChecks: false,
         });
-        setView('passkey-intro', { chains });
+        pushView('passkey-intro', { chains });
         return new Promise((resolve, reject) => {
             dynamicEvents.dynamicEvents.once('embeddedWalletCreated', (wallet) => resolve(wallet));
             dynamicEvents.dynamicEvents.once('embeddedWalletFailed', (error) => {
@@ -156,7 +156,7 @@ const useTurnkey = () => {
                 reject(error);
             });
         });
-    }), [setShowAuthFlow, setView]);
+    }), [setShowAuthFlow, pushView]);
     const returnEmbeddedWallet = React.useCallback((embeddedWalletVerifiedCredential) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
         var _a, _b;
         const { chain } = embeddedWalletVerifiedCredential;

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

@@ -101,7 +101,7 @@ import { useInternalDynamicContext } from '../../../../../context/DynamicContext
 // Hook exposed to customers and used internally to trigger embedded wallet creation
 const useTurnkey = () => {
     const { projectSettings, walletConnectorOptions, setShowAuthFlow, environmentId, user, primaryWallet, } = useInternalDynamicContext();
-    const { setView } = useViewContext();
+    const { pushView } = useViewContext();
     const { createDynamicEmbeddedWalletMutation } = useCreateDynamicEmbeddedWalletMutation();
     const { getEOAWallet } = useSmartWallets();
     const startHeadlessEmbeddedWalletCreationFlow = useCallback((chains, options) => __awaiter(void 0, void 0, void 0, function* () {
@@ -137,7 +137,7 @@ const useTurnkey = () => {
             ignoreIfIsEmbeddedWidget: false,
             performMultiWalletChecks: false,
         });
-        setView('passkey-intro', { chains });
+        pushView('passkey-intro', { chains });
         return new Promise((resolve, reject) => {
             dynamicEvents.once('embeddedWalletCreated', (wallet) => resolve(wallet));
             dynamicEvents.once('embeddedWalletFailed', (error) => {
@@ -152,7 +152,7 @@ const useTurnkey = () => {
                 reject(error);
             });
         });
-    }), [setShowAuthFlow, setView]);
+    }), [setShowAuthFlow, pushView]);
     const returnEmbeddedWallet = useCallback((embeddedWalletVerifiedCredential) => __awaiter(void 0, void 0, void 0, function* () {
         var _a, _b;
         const { chain } = embeddedWalletVerifiedCredential;

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

@@ -95,7 +95,7 @@ var useInternalDynamicContext = require('../../../context/DynamicContext/useDyna
 const useEmbeddedWalletAuthenticator = () => {
     const { initPasskeyRecoveryProcess, shouldInitRecovery } = usePasskeyRecovery.usePasskeyRecovery();
     const { setShowAuthFlow } = useInternalDynamicContext.useInternalDynamicContext();
-    const { setView } = ViewContext.useViewContext();
+    const { pushView } = ViewContext.useViewContext();
     const createOrRefreshAuthenticatorSession = (authenticatorType) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
         // user has passkey authenticator set up OR active session
         // there is no need to create or refresh the authenticator
@@ -105,7 +105,7 @@ const useEmbeddedWalletAuthenticator = () => {
         return initPasskeyRecoveryProcess(authenticatorType);
     });
     const addEmbeddedWalletRecoveryEmail = () => _tslib.__awaiter(void 0, void 0, void 0, function* () {
-        setView('passkey-recovery-add-email');
+        pushView('passkey-recovery-add-email');
         setShowAuthFlow(true);
     });
     return {

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

@@ -91,7 +91,7 @@ import { useInternalDynamicContext } from '../../../context/DynamicContext/useDy
 const useEmbeddedWalletAuthenticator = () => {
     const { initPasskeyRecoveryProcess, shouldInitRecovery } = usePasskeyRecovery();
     const { setShowAuthFlow } = useInternalDynamicContext();
-    const { setView } = useViewContext();
+    const { pushView } = useViewContext();
     const createOrRefreshAuthenticatorSession = (authenticatorType) => __awaiter(void 0, void 0, void 0, function* () {
         // user has passkey authenticator set up OR active session
         // there is no need to create or refresh the authenticator
@@ -101,7 +101,7 @@ const useEmbeddedWalletAuthenticator = () => {
         return initPasskeyRecoveryProcess(authenticatorType);
     });
     const addEmbeddedWalletRecoveryEmail = () => __awaiter(void 0, void 0, void 0, function* () {
-        setView('passkey-recovery-add-email');
+        pushView('passkey-recovery-add-email');
         setShowAuthFlow(true);
     });
     return {