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

package/src/lib/utils/hooks/useUserUpdateRequest/useUpdateUserWithModal/useUpdateUserWithModal.js

@@ -89,7 +89,7 @@ import '../../../../shared/utils/functions/getInitialUrl/getInitialUrl.js';
 import { useInternalDynamicContext } from '../../../../context/DynamicContext/useDynamicContext/useInternalDynamicContext.js';
 
 /** Saves the values updated by the user */
-const saveUserValues = (_a, setShowAuthFlow_1, setView_1, resolve_1, reject_1) => __awaiter(void 0, [_a, setShowAuthFlow_1, setView_1, resolve_1, reject_1], void 0, function* ({ fields: newValues, updateUserResult: { isEmailVerificationRequired, isSmsVerificationRequired, }, }, setShowAuthFlow, setView, resolve, reject) {
+const saveUserValues = (_a, setShowAuthFlow_1, pushView_1, resolve_1, reject_1) => __awaiter(void 0, [_a, setShowAuthFlow_1, pushView_1, resolve_1, reject_1], void 0, function* ({ fields: newValues, updateUserResult: { isEmailVerificationRequired, isSmsVerificationRequired, }, }, setShowAuthFlow, pushView, resolve, reject) {
     // If no verification is needed, we are done
     if (!isEmailVerificationRequired && !isSmsVerificationRequired) {
         resolve(newValues);
@@ -101,7 +101,7 @@ const saveUserValues = (_a, setShowAuthFlow_1, setView_1, resolve_1, reject_1) =
         performMultiWalletChecks: false,
     });
     if (isEmailVerificationRequired) {
-        setView('verify-email');
+        pushView('verify-email');
         // Subscribe to email verification result
         dynamicEvents.once('emailVerificationResult', (wasSuccessful, newEmail) => {
             // Make sure we're using the correct, updated email. User might have changed it mid-OTP
@@ -112,7 +112,7 @@ const saveUserValues = (_a, setShowAuthFlow_1, setView_1, resolve_1, reject_1) =
         });
         return;
     }
-    setView('verify-sms');
+    pushView('verify-sms');
     // Subscribe to sms verification result
     dynamicEvents.once('smsVerificationResult', (wasSuccessful, { phone: newPhone }) => {
         // Make sure we're using the correct, updated phone number. User might have changed it mid-OTP
@@ -128,7 +128,7 @@ const saveUserValues = (_a, setShowAuthFlow_1, setView_1, resolve_1, reject_1) =
  */
 const useUpdateUserWithModal = (updateUser) => {
     const { user, projectSettings, setShowAuthFlow } = useInternalDynamicContext();
-    const { setView } = useViewContext();
+    const { pushView } = useViewContext();
     const editorContext = useContext(UserFieldEditorContext);
     if (!editorContext)
         throw new DynamicError('useUserUpdateRequest can only be used inside the context of DynamicContextProvider');
@@ -147,7 +147,7 @@ const useUpdateUserWithModal = (updateUser) => {
             subtitle: options === null || options === void 0 ? void 0 : options.subtitle,
             title: options === null || options === void 0 ? void 0 : options.title,
         }, updateUser)
-            .then((updateValues) => saveUserValues(updateValues, setShowAuthFlow, setView, resolve, reject))
+            .then((updateValues) => saveUserValues(updateValues, setShowAuthFlow, pushView, resolve, reject))
             .catch((error) => {
             if (/email already exists/gi.test(error))
                 throw error;
@@ -159,7 +159,7 @@ const useUpdateUserWithModal = (updateUser) => {
         promptUserForValues,
         updateUser,
         setShowAuthFlow,
-        setView,
+        pushView,
     ]);
     return updateUserWithModal;
 };

package/src/lib/utils/hooks/useValidateSession/handleStoreVersionChanged/handleStoreVersionChanged.cjs

@@ -0,0 +1,12 @@
+'use client'
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+const handleStoreVersionChanged = ({ didStoreVersionChangedRef, logout, }) => {
+    if (didStoreVersionChangedRef.current) {
+        logout('store version changed', {});
+    }
+};
+
+exports.handleStoreVersionChanged = handleStoreVersionChanged;

package/src/lib/utils/hooks/useValidateSession/handleStoreVersionChanged/handleStoreVersionChanged.d.ts

@@ -0,0 +1,7 @@
+import { MutableRefObject } from 'react';
+type HandleStoreVersionChangedParams = {
+    logout: (reason: string, params: any) => Promise<void>;
+    didStoreVersionChangedRef: MutableRefObject<boolean>;
+};
+export declare const handleStoreVersionChanged: ({ didStoreVersionChangedRef, logout, }: HandleStoreVersionChangedParams) => void;
+export {};

package/src/lib/utils/hooks/useValidateSession/handleStoreVersionChanged/handleStoreVersionChanged.js

@@ -0,0 +1,8 @@
+'use client'
+const handleStoreVersionChanged = ({ didStoreVersionChangedRef, logout, }) => {
+    if (didStoreVersionChangedRef.current) {
+        logout('store version changed', {});
+    }
+};
+
+export { handleStoreVersionChanged };

package/src/lib/utils/hooks/useValidateSession/handleStoreVersionChanged/index.d.ts

@@ -0,0 +1 @@
+export { handleStoreVersionChanged } from './handleStoreVersionChanged';

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

@@ -11,8 +11,9 @@ var loadingAndLifecycle = require('../../../store/state/loadingAndLifecycle.cjs'
 var useDynamicEvents = require('../events/useDynamicEvents/useDynamicEvents.cjs');
 var handleStoreAndEnvironmentMismatch = require('./handleStoreAndEnvironmentMismatch/handleStoreAndEnvironmentMismatch.cjs');
 var handleUserDataOutOfSync = require('./handleUserDataOutOfSync/handleUserDataOutOfSync.cjs');
+var handleStoreVersionChanged = require('./handleStoreVersionChanged/handleStoreVersionChanged.cjs');
 
-const useValidateSession = ({ environmentId, handleLogOut }) => {
+const useValidateSession = ({ environmentId, handleLogOut, didStoreVersionChangedRef, }) => {
     const logout = React.useCallback(
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
     (reason, params) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
@@ -20,14 +21,15 @@ const useValidateSession = ({ environmentId, handleLogOut }) => {
         return handleLogOut();
     }), [handleLogOut]);
     const validateSession = React.useCallback(() => _tslib.__awaiter(void 0, void 0, void 0, function* () {
-        const params = { environmentId, logout };
+        const params = { didStoreVersionChangedRef, environmentId, logout };
         yield Promise.all([
             handleStoreAndEnvironmentMismatch.handleStoreAndEnvironmentMismatch(params),
             handleUserDataOutOfSync.handleUserDataOutOfSync(params),
+            handleStoreVersionChanged.handleStoreVersionChanged(params),
         ]);
         // Regardless of whether we logged out or not, session validation is now complete
         loadingAndLifecycle.setLoadingAndLifecycle({ sessionValidation: true });
-    }), [environmentId, logout]);
+    }), [environmentId, logout, didStoreVersionChangedRef]);
     useEffectOnce.useEffectOnce(() => {
         validateSession();
     });

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

@@ -1,6 +1,8 @@
+import { MutableRefObject } from 'react';
 type Props = {
     environmentId: string;
     handleLogOut: () => Promise<void>;
+    didStoreVersionChangedRef: MutableRefObject<boolean>;
 };
-export declare const useValidateSession: ({ environmentId, handleLogOut }: Props) => void;
+export declare const useValidateSession: ({ environmentId, handleLogOut, didStoreVersionChangedRef, }: Props) => void;
 export {};

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

@@ -7,8 +7,9 @@ import { setLoadingAndLifecycle } from '../../../store/state/loadingAndLifecycle
 import { useInternalDynamicEvents } from '../events/useDynamicEvents/useDynamicEvents.js';
 import { handleStoreAndEnvironmentMismatch } from './handleStoreAndEnvironmentMismatch/handleStoreAndEnvironmentMismatch.js';
 import { handleUserDataOutOfSync } from './handleUserDataOutOfSync/handleUserDataOutOfSync.js';
+import { handleStoreVersionChanged } from './handleStoreVersionChanged/handleStoreVersionChanged.js';
 
-const useValidateSession = ({ environmentId, handleLogOut }) => {
+const useValidateSession = ({ environmentId, handleLogOut, didStoreVersionChangedRef, }) => {
     const logout = useCallback(
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
     (reason, params) => __awaiter(void 0, void 0, void 0, function* () {
@@ -16,14 +17,15 @@ const useValidateSession = ({ environmentId, handleLogOut }) => {
         return handleLogOut();
     }), [handleLogOut]);
     const validateSession = useCallback(() => __awaiter(void 0, void 0, void 0, function* () {
-        const params = { environmentId, logout };
+        const params = { didStoreVersionChangedRef, environmentId, logout };
         yield Promise.all([
             handleStoreAndEnvironmentMismatch(params),
             handleUserDataOutOfSync(params),
+            handleStoreVersionChanged(params),
         ]);
         // Regardless of whether we logged out or not, session validation is now complete
         setLoadingAndLifecycle({ sessionValidation: true });
-    }), [environmentId, logout]);
+    }), [environmentId, logout, didStoreVersionChangedRef]);
     useEffectOnce(() => {
         validateSession();
     });

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

@@ -106,7 +106,7 @@ require('../../../shared/utils/functions/getInitialUrl/getInitialUrl.cjs');
 const useVerifyWallet = ({ displaySiweStatement, environmentId, projectSettings, setIsSingleWalletAccount, }) => {
     const { setExistentAccountData } = AccountExistsContext.useAccountExistsContext();
     const { setDeniedAddress, setDeniedOauthProvider } = AccessDeniedContext.useAccessDeniedContext();
-    const { setView, goToInitialView } = ViewContext.useViewContext();
+    const { pushView, clearStackAndPushInitialView } = ViewContext.useViewContext();
     const { setErrorMessage, setError } = ErrorContext.useErrorContext();
     const { multiWalletWidgetState, debugError, multiWallet: multiWalletEnabled, appName, primaryWalletId, setShowAuthFlow, siweStatement, connectedWallets, authMode, user, setAuthMode, removeConnectedWalletsInfo, events, primaryWallet, enableConnectOnlyFallback, selectedWalletConnector, } = useInternalDynamicContext.useInternalDynamicContext();
     const { addedWalletsIds } = UserWalletsContext.useInternalUserWallets();
@@ -169,11 +169,11 @@ const useVerifyWallet = ({ displaySiweStatement, environmentId, projectSettings,
         // This is a special case where the user is trying to link a wallet
         // and the wallet is already linked and we don't want to kill the session.
         setShowAuthFlow(true);
-        setView('wallet-used');
+        pushView('wallet-used');
         setIsSingleWalletAccount(false);
         if (e.code === 'reassign_wallet_error') {
             if ((_a = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk) === null || _a === void 0 ? void 0 : _a.preventOrphanedAccounts) {
-                setView('wallet-cannot-be-transferred');
+                pushView('wallet-cannot-be-transferred');
             }
             setIsSingleWalletAccount(true);
         }
@@ -199,7 +199,7 @@ const useVerifyWallet = ({ displaySiweStatement, environmentId, projectSettings,
                 type: 'wallet',
             }, { error: e });
         if (e instanceof utils.EmbeddedWalletExistsError) {
-            setView('embedded-wallet-exists');
+            pushView('embedded-wallet-exists');
             setShowAuthFlow(true);
             return;
         }
@@ -208,24 +208,24 @@ const useVerifyWallet = ({ displaySiweStatement, environmentId, projectSettings,
             return handleWalletUsedError(e);
         }
         if (e instanceof utils.MergeAccountsConfirmationError) {
-            setView('merge-user-accounts', Object.assign({}, e));
+            pushView('merge-user-accounts', Object.assign({}, e));
             setShowAuthFlow(true);
             return;
         }
         if (e instanceof utils.ChainalysisError) {
             handleDisconnectWallet({ walletConnector });
             setDeniedAddress(address);
-            setView('chainalysis-blocked-wallet');
+            pushView('chainalysis-blocked-wallet');
             return;
         }
         if (e instanceof utils.GateBlockedError) {
             handleDisconnectWallet({ walletConnector });
             setDeniedAddress(address);
-            setView('gate-blocked-wallet');
+            pushView('gate-blocked-wallet');
             return;
         }
         if (e instanceof utils.SandboxMaximumThresholdReachedError) {
-            setView('sandbox-maximum-threshold-reached');
+            pushView('sandbox-maximum-threshold-reached');
             return;
         }
         if (e instanceof utils.NoAccessError) {
@@ -235,13 +235,13 @@ const useVerifyWallet = ({ displaySiweStatement, environmentId, projectSettings,
             if (walletConnectorCore.isSocialWalletConnector(walletConnector)) {
                 setDeniedOauthProvider(oauth === null || oauth === void 0 ? void 0 : oauth.provider);
             }
-            setView('no-access');
+            pushView('no-access');
             return;
         }
         if (e instanceof utils.AccountExistsError) {
             handleDisconnectWallet({ walletConnector });
             setExistentAccountData(e.errorPayload);
-            setView('account-exists');
+            pushView('account-exists');
             return;
         }
         if (connectedWallets.length && authMode === 'connect-only') {
@@ -253,12 +253,12 @@ const useVerifyWallet = ({ displaySiweStatement, environmentId, projectSettings,
             logger.logger.warn('Verification failed, changing to connect-only');
             // verification failed for unknown reason, set authmode to connect-only and show wallet list
             setAuthMode('connect-only');
-            setView('wallet-list');
+            pushView('wallet-list');
             return;
         }
         else {
             handleDisconnectWallet({ walletConnector });
-            goToInitialView();
+            clearStackAndPushInitialView();
         }
         logger.logger.error(e);
         if (debugError) {

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

@@ -102,7 +102,7 @@ import '../../../shared/utils/functions/getInitialUrl/getInitialUrl.js';
 const useVerifyWallet = ({ displaySiweStatement, environmentId, projectSettings, setIsSingleWalletAccount, }) => {
     const { setExistentAccountData } = useAccountExistsContext();
     const { setDeniedAddress, setDeniedOauthProvider } = useAccessDeniedContext();
-    const { setView, goToInitialView } = useViewContext();
+    const { pushView, clearStackAndPushInitialView } = useViewContext();
     const { setErrorMessage, setError } = useErrorContext();
     const { multiWalletWidgetState, debugError, multiWallet: multiWalletEnabled, appName, primaryWalletId, setShowAuthFlow, siweStatement, connectedWallets, authMode, user, setAuthMode, removeConnectedWalletsInfo, events, primaryWallet, enableConnectOnlyFallback, selectedWalletConnector, } = useInternalDynamicContext();
     const { addedWalletsIds } = useInternalUserWallets();
@@ -165,11 +165,11 @@ const useVerifyWallet = ({ displaySiweStatement, environmentId, projectSettings,
         // This is a special case where the user is trying to link a wallet
         // and the wallet is already linked and we don't want to kill the session.
         setShowAuthFlow(true);
-        setView('wallet-used');
+        pushView('wallet-used');
         setIsSingleWalletAccount(false);
         if (e.code === 'reassign_wallet_error') {
             if ((_a = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk) === null || _a === void 0 ? void 0 : _a.preventOrphanedAccounts) {
-                setView('wallet-cannot-be-transferred');
+                pushView('wallet-cannot-be-transferred');
             }
             setIsSingleWalletAccount(true);
         }
@@ -195,7 +195,7 @@ const useVerifyWallet = ({ displaySiweStatement, environmentId, projectSettings,
                 type: 'wallet',
             }, { error: e });
         if (e instanceof EmbeddedWalletExistsError) {
-            setView('embedded-wallet-exists');
+            pushView('embedded-wallet-exists');
             setShowAuthFlow(true);
             return;
         }
@@ -204,24 +204,24 @@ const useVerifyWallet = ({ displaySiweStatement, environmentId, projectSettings,
             return handleWalletUsedError(e);
         }
         if (e instanceof MergeAccountsConfirmationError) {
-            setView('merge-user-accounts', Object.assign({}, e));
+            pushView('merge-user-accounts', Object.assign({}, e));
             setShowAuthFlow(true);
             return;
         }
         if (e instanceof ChainalysisError) {
             handleDisconnectWallet({ walletConnector });
             setDeniedAddress(address);
-            setView('chainalysis-blocked-wallet');
+            pushView('chainalysis-blocked-wallet');
             return;
         }
         if (e instanceof GateBlockedError) {
             handleDisconnectWallet({ walletConnector });
             setDeniedAddress(address);
-            setView('gate-blocked-wallet');
+            pushView('gate-blocked-wallet');
             return;
         }
         if (e instanceof SandboxMaximumThresholdReachedError) {
-            setView('sandbox-maximum-threshold-reached');
+            pushView('sandbox-maximum-threshold-reached');
             return;
         }
         if (e instanceof NoAccessError) {
@@ -231,13 +231,13 @@ const useVerifyWallet = ({ displaySiweStatement, environmentId, projectSettings,
             if (isSocialWalletConnector(walletConnector)) {
                 setDeniedOauthProvider(oauth === null || oauth === void 0 ? void 0 : oauth.provider);
             }
-            setView('no-access');
+            pushView('no-access');
             return;
         }
         if (e instanceof AccountExistsError) {
             handleDisconnectWallet({ walletConnector });
             setExistentAccountData(e.errorPayload);
-            setView('account-exists');
+            pushView('account-exists');
             return;
         }
         if (connectedWallets.length && authMode === 'connect-only') {
@@ -249,12 +249,12 @@ const useVerifyWallet = ({ displaySiweStatement, environmentId, projectSettings,
             logger.warn('Verification failed, changing to connect-only');
             // verification failed for unknown reason, set authmode to connect-only and show wallet list
             setAuthMode('connect-only');
-            setView('wallet-list');
+            pushView('wallet-list');
             return;
         }
         else {
             handleDisconnectWallet({ walletConnector });
-            goToInitialView();
+            clearStackAndPushInitialView();
         }
         logger.error(e);
         if (debugError) {

package/src/lib/utils/hooks/useWalletItemActions/useHandleWalletItem/useHandleWalletItem.cjs

@@ -98,7 +98,7 @@ const useHandleWalletItem = ({ allowAlreadyConnectedWallet, onQrCodeConnect, onC
     const { setMultiWalletWidgetState, setShowAuthFlow, setSelectedWalletConnectorKey, walletConnectorOptions, setQrcodeUri, setDesktopUri, user, linkedWallets, setLegacyIsVerifying, authMode, } = useInternalDynamicContext.useInternalDynamicContext();
     const { mockedSDK } = MockContext.useMockContext();
     const { setError, setErrorMessage } = ErrorContext.useErrorContext();
-    const { setView, goToInitialView } = ViewContext.useViewContext();
+    const { pushView, clearStackAndPushInitialView } = ViewContext.useViewContext();
     const handleCustodialWalletClick = (walletConnector) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
         logger.logger.debug('handleCustodialWalletClick', walletConnector);
         const twoStepAuthentication = requiresTwoStepAuthentication.requiresTwoStepAuthentication(walletConnector);
@@ -133,7 +133,7 @@ const useHandleWalletItem = ({ allowAlreadyConnectedWallet, onQrCodeConnect, onC
         const attemptConnection = () => {
             onConnectOnly({ shouldShowPendingConnectView: false, walletConnector });
         };
-        setView('mobile-wallet-redirect-view', { onRetry: attemptConnection });
+        pushView('mobile-wallet-redirect-view', { onRetry: attemptConnection });
         attemptConnection();
     });
     const handleInstalledExtensionClick = (walletConnector) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
@@ -145,7 +145,7 @@ const useHandleWalletItem = ({ allowAlreadyConnectedWallet, onQrCodeConnect, onC
         logger.logger.debug('handleUninstalledClick', walletConnector);
         setSelectedWalletConnectorKey(walletConnector.key);
         if (!walletConnector.canConnectViaQrCode) {
-            setView('no-qr-not-installed');
+            pushView('no-qr-not-installed');
         }
         else {
             onQrCodeConnect({
@@ -159,7 +159,7 @@ const useHandleWalletItem = ({ allowAlreadyConnectedWallet, onQrCodeConnect, onC
                 },
                 walletConnector,
             });
-            setView('qr-code');
+            pushView('qr-code');
         }
         setError(undefined);
     });
@@ -224,13 +224,13 @@ const useHandleWalletItem = ({ allowAlreadyConnectedWallet, onQrCodeConnect, onC
         if (authMode !== 'connect-only' && isMetamask) {
             try {
                 setSelectedWalletConnectorKey(walletConnector.key);
-                setView('pending-connect');
+                pushView('pending-connect');
                 yield walletConnector.chooseAccountsToConnect();
             }
             catch (error) {
                 if (error instanceof utils.UserRejectedRequestError) {
                     setErrorMessage('connection_rejected');
-                    goToInitialView();
+                    clearStackAndPushInitialView();
                     return;
                 }
             }
@@ -242,13 +242,13 @@ const useHandleWalletItem = ({ allowAlreadyConnectedWallet, onQrCodeConnect, onC
             handleAlreadyConnectedWallet(walletConnector);
         }
         else if (walletConnector.canConnectViaCustodialService) {
-            // providers like blocto and dapper
+            // providers like coinbase, blocto and dapper
             handleCustodialWalletClick(walletConnector);
         }
         else if (utils.isMobile()) {
             // mobile wallets
             if (walletConnector.key === 'walletconnect') {
-                setView('wallet-connect-mobile-wallets-list');
+                pushView('wallet-connect-mobile-wallets-list');
             }
             else {
                 handleMobileWalletClick(walletConnector);

package/src/lib/utils/hooks/useWalletItemActions/useHandleWalletItem/useHandleWalletItem.js

@@ -94,7 +94,7 @@ const useHandleWalletItem = ({ allowAlreadyConnectedWallet, onQrCodeConnect, onC
     const { setMultiWalletWidgetState, setShowAuthFlow, setSelectedWalletConnectorKey, walletConnectorOptions, setQrcodeUri, setDesktopUri, user, linkedWallets, setLegacyIsVerifying, authMode, } = useInternalDynamicContext();
     const { mockedSDK } = useMockContext();
     const { setError, setErrorMessage } = useErrorContext();
-    const { setView, goToInitialView } = useViewContext();
+    const { pushView, clearStackAndPushInitialView } = useViewContext();
     const handleCustodialWalletClick = (walletConnector) => __awaiter(void 0, void 0, void 0, function* () {
         logger.debug('handleCustodialWalletClick', walletConnector);
         const twoStepAuthentication = requiresTwoStepAuthentication(walletConnector);
@@ -129,7 +129,7 @@ const useHandleWalletItem = ({ allowAlreadyConnectedWallet, onQrCodeConnect, onC
         const attemptConnection = () => {
             onConnectOnly({ shouldShowPendingConnectView: false, walletConnector });
         };
-        setView('mobile-wallet-redirect-view', { onRetry: attemptConnection });
+        pushView('mobile-wallet-redirect-view', { onRetry: attemptConnection });
         attemptConnection();
     });
     const handleInstalledExtensionClick = (walletConnector) => __awaiter(void 0, void 0, void 0, function* () {
@@ -141,7 +141,7 @@ const useHandleWalletItem = ({ allowAlreadyConnectedWallet, onQrCodeConnect, onC
         logger.debug('handleUninstalledClick', walletConnector);
         setSelectedWalletConnectorKey(walletConnector.key);
         if (!walletConnector.canConnectViaQrCode) {
-            setView('no-qr-not-installed');
+            pushView('no-qr-not-installed');
         }
         else {
             onQrCodeConnect({
@@ -155,7 +155,7 @@ const useHandleWalletItem = ({ allowAlreadyConnectedWallet, onQrCodeConnect, onC
                 },
                 walletConnector,
             });
-            setView('qr-code');
+            pushView('qr-code');
         }
         setError(undefined);
     });
@@ -220,13 +220,13 @@ const useHandleWalletItem = ({ allowAlreadyConnectedWallet, onQrCodeConnect, onC
         if (authMode !== 'connect-only' && isMetamask) {
             try {
                 setSelectedWalletConnectorKey(walletConnector.key);
-                setView('pending-connect');
+                pushView('pending-connect');
                 yield walletConnector.chooseAccountsToConnect();
             }
             catch (error) {
                 if (error instanceof UserRejectedRequestError) {
                     setErrorMessage('connection_rejected');
-                    goToInitialView();
+                    clearStackAndPushInitialView();
                     return;
                 }
             }
@@ -238,13 +238,13 @@ const useHandleWalletItem = ({ allowAlreadyConnectedWallet, onQrCodeConnect, onC
             handleAlreadyConnectedWallet(walletConnector);
         }
         else if (walletConnector.canConnectViaCustodialService) {
-            // providers like blocto and dapper
+            // providers like coinbase, blocto and dapper
             handleCustodialWalletClick(walletConnector);
         }
         else if (isMobile()) {
             // mobile wallets
             if (walletConnector.key === 'walletconnect') {
-                setView('wallet-connect-mobile-wallets-list');
+                pushView('wallet-connect-mobile-wallets-list');
             }
             else {
                 handleMobileWalletClick(walletConnector);

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

@@ -95,33 +95,25 @@ require('../../../shared/utils/functions/getInitialUrl/getInitialUrl.cjs');
 var useInternalDynamicContext = require('../../../context/DynamicContext/useDynamicContext/useInternalDynamicContext.cjs');
 
 const useWalletItemActions = () => {
+    const { setMultiWalletWidgetState, authMode } = useInternalDynamicContext.useInternalDynamicContext();
     const { onlyConnectUser } = useConnectAndSignSplitSteps.useConnectAndSignSplitSteps();
     const connectAndSignWallet = useConnectAndSign.useConnectAndSign();
-    const { setMultiWalletWidgetState, authMode } = useInternalDynamicContext.useInternalDynamicContext();
-    const { setView } = ViewContext.useViewContext();
+    const { pushView } = ViewContext.useViewContext();
+    const handleExtensionAndCustodial = (_a) => _tslib.__awaiter(void 0, [_a], void 0, function* ({ requiresTwoStepAuthentication, walletConnector, }) {
+        if (requiresTwoStepAuthentication || authMode === 'connect-only') {
+            pushView('pending-connect');
+            yield onlyConnectUser({ walletConnector });
+        }
+        else {
+            // See useVerifyOnAwaitingSignature's useEffect for more context.
+            setMultiWalletWidgetState('awaiting_signature', undefined, 'linking_new_wallet');
+        }
+    });
     return useHandleWalletItem.useHandleWalletItem({
         allowAlreadyConnectedWallet: false,
         onConnectOnly: onlyConnectUser,
-        onCustodialWallet: (_a) => _tslib.__awaiter(void 0, [_a], void 0, function* ({ requiresTwoStepAuthentication, walletConnector, }) {
-            if (requiresTwoStepAuthentication) {
-                yield onlyConnectUser({
-                    walletConnector,
-                });
-            }
-            else {
-                setMultiWalletWidgetState('awaiting_signature', undefined, 'linking_new_wallet');
-            }
-            setView('pending-signature');
-        }),
-        onInstalledExtension: (_b) => _tslib.__awaiter(void 0, [_b], void 0, function* ({ walletConnector }) {
-            if (authMode === 'connect-only') {
-                setView('pending-connect');
-                onlyConnectUser({ walletConnector });
-            }
-            else {
-                setMultiWalletWidgetState('awaiting_signature', undefined, 'linking_new_wallet');
-            }
-        }),
+        onCustodialWallet: handleExtensionAndCustodial,
+        onInstalledExtension: handleExtensionAndCustodial,
         onQrCodeConnect: connectAndSignWallet,
     });
 };

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

@@ -1,9 +1,10 @@
+import { WalletConnectorCore } from '@dynamic-labs/wallet-connector-core';
 export declare const useWalletItemActions: () => {
-    handleAlreadyConnectedWallet: (walletConnector: import("dist/packages/wallet-connector-core/src").WalletConnectorCore.WalletConnector) => Promise<void>;
-    handleCustodialWalletClick: (walletConnector: import("dist/packages/wallet-connector-core/src").WalletConnectorCore.WalletConnector) => Promise<void>;
-    handleInstalledExtensionClick: (walletConnector: import("dist/packages/wallet-connector-core/src").WalletConnectorCore.WalletConnector) => Promise<void>;
-    handleMobileWalletClick: (walletConnector: import("dist/packages/wallet-connector-core/src").WalletConnectorCore.WalletConnector) => Promise<void>;
-    handleUninstalledClick: (walletConnector: import("dist/packages/wallet-connector-core/src").WalletConnectorCore.WalletConnector) => Promise<void>;
+    handleAlreadyConnectedWallet: (walletConnector: WalletConnectorCore.WalletConnector) => Promise<void>;
+    handleCustodialWalletClick: (walletConnector: WalletConnectorCore.WalletConnector) => Promise<void>;
+    handleInstalledExtensionClick: (walletConnector: WalletConnectorCore.WalletConnector) => Promise<void>;
+    handleMobileWalletClick: (walletConnector: WalletConnectorCore.WalletConnector) => Promise<void>;
+    handleUninstalledClick: (walletConnector: WalletConnectorCore.WalletConnector) => Promise<void>;
     handleWalletItemClick: (wallet: import("../../../shared").WalletOption) => Promise<void>;
     openWallet: import("./useWalletItemActions.types").OpenWalletHandler;
 };

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

@@ -91,33 +91,25 @@ import '../../../shared/utils/functions/getInitialUrl/getInitialUrl.js';
 import { useInternalDynamicContext } from '../../../context/DynamicContext/useDynamicContext/useInternalDynamicContext.js';
 
 const useWalletItemActions = () => {
+    const { setMultiWalletWidgetState, authMode } = useInternalDynamicContext();
     const { onlyConnectUser } = useConnectAndSignSplitSteps();
     const connectAndSignWallet = useConnectAndSign();
-    const { setMultiWalletWidgetState, authMode } = useInternalDynamicContext();
-    const { setView } = useViewContext();
+    const { pushView } = useViewContext();
+    const handleExtensionAndCustodial = (_a) => __awaiter(void 0, [_a], void 0, function* ({ requiresTwoStepAuthentication, walletConnector, }) {
+        if (requiresTwoStepAuthentication || authMode === 'connect-only') {
+            pushView('pending-connect');
+            yield onlyConnectUser({ walletConnector });
+        }
+        else {
+            // See useVerifyOnAwaitingSignature's useEffect for more context.
+            setMultiWalletWidgetState('awaiting_signature', undefined, 'linking_new_wallet');
+        }
+    });
     return useHandleWalletItem({
         allowAlreadyConnectedWallet: false,
         onConnectOnly: onlyConnectUser,
-        onCustodialWallet: (_a) => __awaiter(void 0, [_a], void 0, function* ({ requiresTwoStepAuthentication, walletConnector, }) {
-            if (requiresTwoStepAuthentication) {
-                yield onlyConnectUser({
-                    walletConnector,
-                });
-            }
-            else {
-                setMultiWalletWidgetState('awaiting_signature', undefined, 'linking_new_wallet');
-            }
-            setView('pending-signature');
-        }),
-        onInstalledExtension: (_b) => __awaiter(void 0, [_b], void 0, function* ({ walletConnector }) {
-            if (authMode === 'connect-only') {
-                setView('pending-connect');
-                onlyConnectUser({ walletConnector });
-            }
-            else {
-                setMultiWalletWidgetState('awaiting_signature', undefined, 'linking_new_wallet');
-            }
-        }),
+        onCustodialWallet: handleExtensionAndCustodial,
+        onInstalledExtension: handleExtensionAndCustodial,
         onQrCodeConnect: connectAndSignWallet,
     });
 };

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

@@ -106,7 +106,7 @@ const embeddedWalletsKeys = [
 const useWalletOptions = () => {
     const { walletConnectorOptions, setShowAuthFlow } = useInternalDynamicContext.useInternalDynamicContext();
     const walletGroups = walletOptions.useWalletGroups();
-    const { setView } = ViewContext.useViewContext();
+    const { pushView } = ViewContext.useViewContext();
     const { navigateToWalletGroup } = WalletGroupContext.useWalletGroupContext();
     const { handleWalletItemClick } = useWalletItemActions.useWalletItemActions();
     const getFilteredWalletOptions = React.useCallback((filter) => {
@@ -143,7 +143,7 @@ const useWalletOptions = () => {
         }
         else if (walletConnectorCore.isHardwareWalletConnector(walletOption.walletConnector) &&
             walletOption.walletConnector.canConnectWithHardwareWallet()) {
-            setView('select-hardware-wallet', {
+            pushView('select-hardware-wallet', {
                 onSelectWallet: handleWalletItemClick,
                 wallet: walletOption,
             });
@@ -156,7 +156,7 @@ const useWalletOptions = () => {
         handleWalletItemClick,
         navigateToWalletGroup,
         setShowAuthFlow,
-        setView,
+        pushView,
         walletConnectorOptions,
         walletGroups,
     ]);