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

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/useFunding/useConnectWalletForFunding/useConnectWalletForFunding.cjs

@@ -33,7 +33,7 @@ var resolvePromiseRef = require('../../../functions/resolvePromiseRef/resolvePro
 var rejectPromiseRef = require('../../../functions/rejectPromiseRef/rejectPromiseRef.cjs');
 require('../../../../context/AccessDeniedContext/AccessDeniedContext.cjs');
 require('../../../../context/AccountExistsContext/AccountExistsContext.cjs');
-require('../../../../context/UserWalletsContext/UserWalletsContext.cjs');
+var UserWalletsContext = require('../../../../context/UserWalletsContext/UserWalletsContext.cjs');
 require('../../../../events/dynamicEvents.cjs');
 require('../../../../context/VerificationContext/VerificationContext.cjs');
 require('react-dom');
@@ -52,7 +52,7 @@ require('../../../../context/FieldsStateContext/FieldsStateContext.cjs');
 require('../../../../context/UserFieldEditorContext/UserFieldEditorContext.cjs');
 require('@dynamic-labs/rpc-providers');
 require('../../../../store/state/loadingAndLifecycle.cjs');
-require('../../../../store/state/walletOptions/walletOptions.cjs');
+var walletOptions = require('../../../../store/state/walletOptions/walletOptions.cjs');
 var useHandleWalletItem = require('../../useWalletItemActions/useHandleWalletItem/useHandleWalletItem.cjs');
 require('react-i18next');
 require('../../../../components/Accordion/components/AccordionItem/AccordionItem.cjs');
@@ -100,7 +100,8 @@ var useInternalDynamicContext = require('../../../../context/DynamicContext/useD
 const useConnectWalletForFunding = ({ externalWalletFundingEnabled, }) => {
     const { primaryWallet, setShowAuthFlow } = useInternalDynamicContext.useInternalDynamicContext();
     const { clearStackAndPush } = ViewContext.useViewContext();
-    const { walletOptions } = useWalletOptions.useWalletOptions();
+    const userWallets = UserWalletsContext.useUserWallets();
+    const { walletOptions: walletOptions$1 } = useWalletOptions.useWalletOptions();
     const internalConnectionPromiseRef = React.useRef(null);
     const connectWalletPromiseRef = React.useRef(null);
     const handleWalletMethod = React.useCallback((props) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
@@ -122,20 +123,36 @@ const useConnectWalletForFunding = ({ externalWalletFundingEnabled, }) => {
         rejectPromiseRef.rejectPromiseRef(connectWalletPromiseRef, new utils.DynamicError('User cancelled'));
     });
     const getWalletAddress = React.useCallback((walletConnector) => {
-        const walletOption = walletOptions.find(({ key }) => key === walletConnector.key);
+        const walletOption = walletOptions$1.find(({ key }) => key === walletConnector.key);
         if (!walletOption)
             return Promise.reject(new utils.DynamicError(`Connect wallet for funding error: wallet option for ${walletConnector.key} not found`));
         internalConnectionPromiseRef.current = new utils.DeferredPromise();
         handleWalletItemClick(Object.assign(Object.assign({}, walletOption), { walletConnector }));
         return internalConnectionPromiseRef.current.promise;
-    }, [handleWalletItemClick, walletOptions]);
-    return React.useCallback(() => {
+    }, [handleWalletItemClick, walletOptions$1]);
+    const hasWalletConnectWallet = userWallets.some((wallet) => wallet.connector.isWalletConnect);
+    // WC does not allow multiple sessions, so we have 2 cases here:
+    // 1. The user has a linked WalletConnect wallet.
+    //    In this case, we should not do anything, and our logic will prevent other WCs from being
+    //    selected for funding.
+    // 2. The user does not have a WalletConnect wallet linked.
+    //    In this case, we should reset the WC session — this is because they might have just
+    //    previously connected another WC wallet for funding and that session could still be active.
+    const resetWalletConnectSession = React.useCallback(() => _tslib.__awaiter(void 0, void 0, void 0, function* () {
+        if (hasWalletConnectWallet)
+            return;
+        const walletOption = walletOptions.getWalletConnectorOptions().find(({ walletConnector }) => walletConnector.isWalletConnect);
+        yield (walletOption === null || walletOption === void 0 ? void 0 : walletOption.walletConnector.endSession());
+        yield (walletOption === null || walletOption === void 0 ? void 0 : walletOption.walletConnector.init());
+    }), [hasWalletConnectWallet]);
+    return React.useCallback(() => _tslib.__awaiter(void 0, void 0, void 0, function* () {
         if (!externalWalletFundingEnabled) {
             return Promise.reject(new Error('External wallet funding is not enabled'));
         }
         if (connectWalletPromiseRef.current) {
             return connectWalletPromiseRef.current.promise;
         }
+        resetWalletConnectSession();
         connectWalletPromiseRef.current = new utils.DeferredPromise();
         clearStackAndPush('external-funding-wallet-list', {
             onSelectWallet: (_a) => _tslib.__awaiter(void 0, [_a], void 0, function* ({ walletConnector }) {
@@ -176,8 +193,9 @@ const useConnectWalletForFunding = ({ externalWalletFundingEnabled, }) => {
             performMultiWalletChecks: false,
         });
         return connectWalletPromiseRef.current.promise;
-    }, [
+    }), [
         externalWalletFundingEnabled,
+        resetWalletConnectSession,
         clearStackAndPush,
         primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.chain,
         setShowAuthFlow,

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

@@ -29,7 +29,7 @@ import { resolvePromiseRef } from '../../../functions/resolvePromiseRef/resolveP
 import { rejectPromiseRef } from '../../../functions/rejectPromiseRef/rejectPromiseRef.js';
 import '../../../../context/AccessDeniedContext/AccessDeniedContext.js';
 import '../../../../context/AccountExistsContext/AccountExistsContext.js';
-import '../../../../context/UserWalletsContext/UserWalletsContext.js';
+import { useUserWallets } from '../../../../context/UserWalletsContext/UserWalletsContext.js';
 import '../../../../events/dynamicEvents.js';
 import '../../../../context/VerificationContext/VerificationContext.js';
 import 'react-dom';
@@ -48,7 +48,7 @@ import '../../../../context/FieldsStateContext/FieldsStateContext.js';
 import '../../../../context/UserFieldEditorContext/UserFieldEditorContext.js';
 import '@dynamic-labs/rpc-providers';
 import '../../../../store/state/loadingAndLifecycle.js';
-import '../../../../store/state/walletOptions/walletOptions.js';
+import { getWalletConnectorOptions } from '../../../../store/state/walletOptions/walletOptions.js';
 import { useHandleWalletItem } from '../../useWalletItemActions/useHandleWalletItem/useHandleWalletItem.js';
 import 'react-i18next';
 import '../../../../components/Accordion/components/AccordionItem/AccordionItem.js';
@@ -96,6 +96,7 @@ import { useInternalDynamicContext } from '../../../../context/DynamicContext/us
 const useConnectWalletForFunding = ({ externalWalletFundingEnabled, }) => {
     const { primaryWallet, setShowAuthFlow } = useInternalDynamicContext();
     const { clearStackAndPush } = useViewContext();
+    const userWallets = useUserWallets();
     const { walletOptions } = useWalletOptions();
     const internalConnectionPromiseRef = useRef(null);
     const connectWalletPromiseRef = useRef(null);
@@ -125,13 +126,29 @@ const useConnectWalletForFunding = ({ externalWalletFundingEnabled, }) => {
         handleWalletItemClick(Object.assign(Object.assign({}, walletOption), { walletConnector }));
         return internalConnectionPromiseRef.current.promise;
     }, [handleWalletItemClick, walletOptions]);
-    return useCallback(() => {
+    const hasWalletConnectWallet = userWallets.some((wallet) => wallet.connector.isWalletConnect);
+    // WC does not allow multiple sessions, so we have 2 cases here:
+    // 1. The user has a linked WalletConnect wallet.
+    //    In this case, we should not do anything, and our logic will prevent other WCs from being
+    //    selected for funding.
+    // 2. The user does not have a WalletConnect wallet linked.
+    //    In this case, we should reset the WC session — this is because they might have just
+    //    previously connected another WC wallet for funding and that session could still be active.
+    const resetWalletConnectSession = useCallback(() => __awaiter(void 0, void 0, void 0, function* () {
+        if (hasWalletConnectWallet)
+            return;
+        const walletOption = getWalletConnectorOptions().find(({ walletConnector }) => walletConnector.isWalletConnect);
+        yield (walletOption === null || walletOption === void 0 ? void 0 : walletOption.walletConnector.endSession());
+        yield (walletOption === null || walletOption === void 0 ? void 0 : walletOption.walletConnector.init());
+    }), [hasWalletConnectWallet]);
+    return useCallback(() => __awaiter(void 0, void 0, void 0, function* () {
         if (!externalWalletFundingEnabled) {
             return Promise.reject(new Error('External wallet funding is not enabled'));
         }
         if (connectWalletPromiseRef.current) {
             return connectWalletPromiseRef.current.promise;
         }
+        resetWalletConnectSession();
         connectWalletPromiseRef.current = new DeferredPromise();
         clearStackAndPush('external-funding-wallet-list', {
             onSelectWallet: (_a) => __awaiter(void 0, [_a], void 0, function* ({ walletConnector }) {
@@ -172,8 +189,9 @@ const useConnectWalletForFunding = ({ externalWalletFundingEnabled, }) => {
             performMultiWalletChecks: false,
         });
         return connectWalletPromiseRef.current.promise;
-    }, [
+    }), [
         externalWalletFundingEnabled,
+        resetWalletConnectSession,
         clearStackAndPush,
         primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.chain,
         setShowAuthFlow,

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

@@ -4,13 +4,13 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 var React = require('react');
-var ViewContext = require('../../../context/ViewContext/ViewContext.cjs');
 require('../../../context/DynamicContext/DynamicContext.cjs');
 require('@dynamic-labs/sdk-api-core');
 require('../../../shared/logger.cjs');
 require('@dynamic-labs/iconic');
 require('@dynamic-labs/wallet-connector-core');
 require('react/jsx-runtime');
+var ViewContext = require('../../../context/ViewContext/ViewContext.cjs');
 require('@dynamic-labs/wallet-book');
 require('@dynamic-labs/utils');
 require('../../constants/colors.cjs');
@@ -94,49 +94,49 @@ var useInternalDynamicContext = require('../../../context/DynamicContext/useDyna
 const useMfaModals = () => {
     var _a;
     const { setShowAuthFlow, projectSettings } = useInternalDynamicContext.useInternalDynamicContext();
-    const { pushView } = ViewContext.useViewContext();
+    const { clearStackAndPush } = ViewContext.useViewContext();
     const isMfaEnabled = (_a = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.security.mfa) === null || _a === void 0 ? void 0 : _a.enabled;
     const setShowMfaChooseType = React.useCallback((value) => {
         if (value) {
             if (!isMfaEnabled)
                 return;
-            pushView('mfa-choose-device');
+            clearStackAndPush('mfa-choose-device');
         }
         setShowAuthFlow(value, { emitCancelAuth: true });
-    }, [isMfaEnabled, setShowAuthFlow, pushView]);
+    }, [isMfaEnabled, setShowAuthFlow, clearStackAndPush]);
     const setShowMfaQRCode = React.useCallback((value) => {
         if (value) {
             if (!isMfaEnabled)
                 return;
             // If MFA is enabled, show the MFA setup view and set it as the initial setup
-            pushView('mfa-secure-device', { isInitialSetup: true });
+            clearStackAndPush('mfa-secure-device', { isInitialSetup: true });
         }
         setShowAuthFlow(value, { emitCancelAuth: true });
-    }, [isMfaEnabled, setShowAuthFlow, pushView]);
+    }, [isMfaEnabled, setShowAuthFlow, clearStackAndPush]);
     const setShowOTPVerification = React.useCallback((value) => {
         if (value) {
             if (!isMfaEnabled)
                 return;
-            pushView('mfa-verification');
+            clearStackAndPush('mfa-verification');
         }
         setShowAuthFlow(value, { emitCancelAuth: true });
-    }, [isMfaEnabled, setShowAuthFlow, pushView]);
+    }, [isMfaEnabled, setShowAuthFlow, clearStackAndPush]);
     const setShowMfaViewBackupCodes = React.useCallback((value) => {
         if (value) {
             if (!isMfaEnabled)
                 return;
-            pushView('mfa-display-backup-codes');
+            clearStackAndPush('mfa-display-backup-codes');
         }
         setShowAuthFlow(value, { emitCancelAuth: true });
-    }, [isMfaEnabled, setShowAuthFlow, pushView]);
+    }, [isMfaEnabled, setShowAuthFlow, clearStackAndPush]);
     const setShowMfaEnterBackupCodes = React.useCallback((value) => {
         if (value) {
             if (!isMfaEnabled)
                 return;
-            pushView('mfa-recovery');
+            clearStackAndPush('mfa-recovery');
         }
         setShowAuthFlow(value, { emitCancelAuth: true });
-    }, [isMfaEnabled, setShowAuthFlow, pushView]);
+    }, [isMfaEnabled, setShowAuthFlow, clearStackAndPush]);
     return {
         setShowMfaChooseType,
         setShowMfaEnterBackupCodes,

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

@@ -1,12 +1,12 @@
 'use client'
 import { useCallback } from 'react';
-import { useViewContext } from '../../../context/ViewContext/ViewContext.js';
 import '../../../context/DynamicContext/DynamicContext.js';
 import '@dynamic-labs/sdk-api-core';
 import '../../../shared/logger.js';
 import '@dynamic-labs/iconic';
 import '@dynamic-labs/wallet-connector-core';
 import 'react/jsx-runtime';
+import { useViewContext } from '../../../context/ViewContext/ViewContext.js';
 import '@dynamic-labs/wallet-book';
 import '@dynamic-labs/utils';
 import '../../constants/colors.js';
@@ -90,49 +90,49 @@ import { useInternalDynamicContext } from '../../../context/DynamicContext/useDy
 const useMfaModals = () => {
     var _a;
     const { setShowAuthFlow, projectSettings } = useInternalDynamicContext();
-    const { pushView } = useViewContext();
+    const { clearStackAndPush } = useViewContext();
     const isMfaEnabled = (_a = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.security.mfa) === null || _a === void 0 ? void 0 : _a.enabled;
     const setShowMfaChooseType = useCallback((value) => {
         if (value) {
             if (!isMfaEnabled)
                 return;
-            pushView('mfa-choose-device');
+            clearStackAndPush('mfa-choose-device');
         }
         setShowAuthFlow(value, { emitCancelAuth: true });
-    }, [isMfaEnabled, setShowAuthFlow, pushView]);
+    }, [isMfaEnabled, setShowAuthFlow, clearStackAndPush]);
     const setShowMfaQRCode = useCallback((value) => {
         if (value) {
             if (!isMfaEnabled)
                 return;
             // If MFA is enabled, show the MFA setup view and set it as the initial setup
-            pushView('mfa-secure-device', { isInitialSetup: true });
+            clearStackAndPush('mfa-secure-device', { isInitialSetup: true });
         }
         setShowAuthFlow(value, { emitCancelAuth: true });
-    }, [isMfaEnabled, setShowAuthFlow, pushView]);
+    }, [isMfaEnabled, setShowAuthFlow, clearStackAndPush]);
     const setShowOTPVerification = useCallback((value) => {
         if (value) {
             if (!isMfaEnabled)
                 return;
-            pushView('mfa-verification');
+            clearStackAndPush('mfa-verification');
         }
         setShowAuthFlow(value, { emitCancelAuth: true });
-    }, [isMfaEnabled, setShowAuthFlow, pushView]);
+    }, [isMfaEnabled, setShowAuthFlow, clearStackAndPush]);
     const setShowMfaViewBackupCodes = useCallback((value) => {
         if (value) {
             if (!isMfaEnabled)
                 return;
-            pushView('mfa-display-backup-codes');
+            clearStackAndPush('mfa-display-backup-codes');
         }
         setShowAuthFlow(value, { emitCancelAuth: true });
-    }, [isMfaEnabled, setShowAuthFlow, pushView]);
+    }, [isMfaEnabled, setShowAuthFlow, clearStackAndPush]);
     const setShowMfaEnterBackupCodes = useCallback((value) => {
         if (value) {
             if (!isMfaEnabled)
                 return;
-            pushView('mfa-recovery');
+            clearStackAndPush('mfa-recovery');
         }
         setShowAuthFlow(value, { emitCancelAuth: true });
-    }, [isMfaEnabled, setShowAuthFlow, pushView]);
+    }, [isMfaEnabled, setShowAuthFlow, clearStackAndPush]);
     return {
         setShowMfaChooseType,
         setShowMfaEnterBackupCodes,

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/useWalletItemActions/useHandleWalletItem/useHandleWalletItem.cjs

@@ -242,7 +242,7 @@ 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()) {

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

@@ -238,7 +238,7 @@ 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()) {

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

@@ -99,29 +99,21 @@ const useWalletItemActions = () => {
     const { onlyConnectUser } = useConnectAndSignSplitSteps.useConnectAndSignSplitSteps();
     const connectAndSignWallet = useConnectAndSign.useConnectAndSign();
     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');
-            }
-            pushView('pending-signature');
-        }),
-        onInstalledExtension: (_b) => _tslib.__awaiter(void 0, [_b], void 0, function* ({ walletConnector }) {
-            if (authMode === 'connect-only') {
-                pushView('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

@@ -95,29 +95,21 @@ const useWalletItemActions = () => {
     const { onlyConnectUser } = useConnectAndSignSplitSteps();
     const connectAndSignWallet = useConnectAndSign();
     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');
-            }
-            pushView('pending-signature');
-        }),
-        onInstalledExtension: (_b) => __awaiter(void 0, [_b], void 0, function* ({ walletConnector }) {
-            if (authMode === 'connect-only') {
-                pushView('pending-connect');
-                onlyConnectUser({ walletConnector });
-            }
-            else {
-                setMultiWalletWidgetState('awaiting_signature', undefined, 'linking_new_wallet');
-            }
-        }),
+        onCustodialWallet: handleExtensionAndCustodial,
+        onInstalledExtension: handleExtensionAndCustodial,
         onQrCodeConnect: connectAndSignWallet,
     });
 };

package/src/lib/views/MfaChooseDeviceView/MfaChooseDeviceView.cjs

@@ -105,12 +105,7 @@ const MfaChooseDeviceView = ({ isInitialSetup = true, }) => {
     const mfaOptions = getMfaOptions.getMfaOptions(isInitialSetup);
     const handleClick = (option) => {
         if (option.type === 'backupCode') {
-            pushView('mfa-recovery', undefined, {
-                onBackClick: () => {
-                    pushView('mfa-choose-device', { isInitialSetup: false });
-                    return 'override';
-                },
-            });
+            pushView('mfa-recovery');
             return;
         }
         if (isInitialSetup) {

package/src/lib/views/MfaChooseDeviceView/MfaChooseDeviceView.js

@@ -101,12 +101,7 @@ const MfaChooseDeviceView = ({ isInitialSetup = true, }) => {
     const mfaOptions = getMfaOptions(isInitialSetup);
     const handleClick = (option) => {
         if (option.type === 'backupCode') {
-            pushView('mfa-recovery', undefined, {
-                onBackClick: () => {
-                    pushView('mfa-choose-device', { isInitialSetup: false });
-                    return 'override';
-                },
-            });
+            pushView('mfa-recovery');
             return;
         }
         if (isInitialSetup) {

package/src/lib/views/MfaSecureDeviceView/MfaSecureDeviceView.cjs

@@ -105,13 +105,11 @@ const MfaSecureDeviceView = ({ type, isInitialSetup = false, }) => {
     const { addDevice } = useMfa.useMfa();
     const { data, isLoading } = usePromise.usePromise(() => addDevice(type));
     const onContinue = () => {
-        // back button on mfa verification view should go back to this view
-        const onMfaVerificationBackClick = () => {
-            pushView('mfa-secure-device', { type });
-            return 'override';
-        };
-        pushView('mfa-verification', { deviceId: data === null || data === void 0 ? void 0 : data.id, isInitialSetup, showBackButton: true, type }, {
-            onBackClick: onMfaVerificationBackClick,
+        pushView('mfa-verification', {
+            deviceId: data === null || data === void 0 ? void 0 : data.id,
+            isInitialSetup,
+            showBackButton: true,
+            type,
         });
     };
     const onHelpClick = ({ secret, uri }) => {

package/src/lib/views/MfaSecureDeviceView/MfaSecureDeviceView.js

@@ -101,13 +101,11 @@ const MfaSecureDeviceView = ({ type, isInitialSetup = false, }) => {
     const { addDevice } = useMfa();
     const { data, isLoading } = usePromise(() => addDevice(type));
     const onContinue = () => {
-        // back button on mfa verification view should go back to this view
-        const onMfaVerificationBackClick = () => {
-            pushView('mfa-secure-device', { type });
-            return 'override';
-        };
-        pushView('mfa-verification', { deviceId: data === null || data === void 0 ? void 0 : data.id, isInitialSetup, showBackButton: true, type }, {
-            onBackClick: onMfaVerificationBackClick,
+        pushView('mfa-verification', {
+            deviceId: data === null || data === void 0 ? void 0 : data.id,
+            isInitialSetup,
+            showBackButton: true,
+            type,
         });
     };
     const onHelpClick = ({ secret, uri }) => {