@dynamic-labs/sdk-react-core 0.17.0-RC.2 → 0.17.0-RC.20

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

@@ -4,17 +4,19 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var _tslib = require('../../../../../_virtual/_tslib.cjs');
 var React = require('react');
-var multiWallet = require('@dynamic-labs/multi-wallet');
+var walletConnectorCore = require('@dynamic-labs/wallet-connector-core');
 require('@dynamic-labs/sdk-api');
 var logger = require('../../../shared/logger.cjs');
 require('@dynamic-labs/iconic');
 require('react/jsx-runtime');
 require('../../../context/ViewContext/ViewContext.cjs');
+require('@dynamic-labs/utils');
 require('../../constants/colors.cjs');
+require('ethers');
 require('../../../shared/consts/index.cjs');
 
 const orderedSecondaryWalletAddresses = (wallets) => wallets.map((wallet) => wallet.address).sort();
-const useWalletEventListeners = ({ computeConnectedStateForWallets, handleLogOut, multiWallet: multiWallet$1, multiWalletWidgetState, primaryWallet, secondaryWallets, selectedWalletConnector, setSelectedWalletConnector, setMultiWalletWidgetState, user, setPrimaryWalletId, connectWalletByAddressAndChain, }) => {
+const useWalletEventListeners = ({ computeConnectedStateForWallets, handleLogOut, multiWallet, multiWalletWidgetState, primaryWallet, secondaryWallets, selectedWalletConnector, selectedWalletWithAction, setSelectedWalletConnector, setSelectedWalletWithAction, setMultiWalletWidgetState, user, setPrimaryWalletId, connectWalletByAddressAndChain, }) => {
     const [loadingNetwork, setLoadingNetwork] = React.useState(true);
     const [network, setNetwork] = React.useState(undefined);
     React.useEffect(() => {
@@ -40,39 +42,74 @@ const useWalletEventListeners = ({ computeConnectedStateForWallets, handleLogOut
             return;
         }
         const seen = new Set();
+        addPrimaryWalletEventListeners(seen);
+        addSecondaryWalletEventListeners(seen);
+        return () => {
+            primaryWallet.connector.teardownEventListeners();
+            for (const wallet of secondaryWallets) {
+                wallet.connector.teardownEventListeners();
+            }
+        };
+        // justification: we don't want to setup event listeners more than needed
+        // eslint-disable-next-line react-hooks/exhaustive-deps
+    }, [
+        user,
+        primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.address,
+        primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.id,
+        multiWalletWidgetState,
+        // eslint-disable-next-line react-hooks/exhaustive-deps
+        orderedSecondaryWalletAddresses(secondaryWallets).join(),
+        selectedWalletConnector === null || selectedWalletConnector === void 0 ? void 0 : selectedWalletConnector.name,
+    ]);
+    const handleAccountChangeWhenAwaitingAccountSwitch = React.useCallback((isPrimaryWallet, newAddress) => {
+        const linkedSecondaryWallet = secondaryWallets.find((wallet) => walletConnectorCore.isSameAddress(wallet.address, newAddress, wallet.chain));
+        // this means the user is linking a new account, so we need proof of ownership...
+        if (!linkedSecondaryWallet) {
+            setMultiWalletWidgetState('awaiting_signature', undefined, 'linking_new_wallet');
+            if (isPrimaryWallet && primaryWallet) {
+                setSelectedWalletConnector(primaryWallet.connector);
+            }
+            return;
+        }
+        // ...otherwise, the user is switching primary accounts betweeen the same wallet
+        setSelectedWalletWithAction(null);
+        setPrimaryWalletId(linkedSecondaryWallet.id);
+        setMultiWalletWidgetState('idle');
+    }, [
+        setMultiWalletWidgetState,
+        primaryWallet,
+        secondaryWallets,
+        setSelectedWalletConnector,
+        setSelectedWalletWithAction,
+        setPrimaryWalletId,
+    ]);
+    const addPrimaryWalletEventListeners = React.useCallback((seen) => {
+        if (!primaryWallet) {
+            return;
+        }
         seen.add(primaryWallet.connector.name);
         primaryWallet.connector.setupEventListeners({
             onAccountChange: (accounts) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
                 const [newAddress] = accounts;
-                yield computeConnectedStateForWallets();
-                if (multiWallet.isSameAddress(newAddress, primaryWallet.address, primaryWallet.chain)) {
+                const newWallet = secondaryWallets.find((wallet) => walletConnectorCore.isSameAddress(wallet.address, newAddress, wallet.chain));
+                if (walletConnectorCore.isSameAddress(newAddress, primaryWallet.address, primaryWallet.chain)) {
                     setMultiWalletWidgetState('idle');
                 }
-                else if (!multiWallet$1) {
+                else if (!multiWallet) {
                     yield handleLogOut();
+                    return;
                 }
                 else if (multiWalletWidgetState === 'awaiting_account_switch') {
-                    const linkedSecondaryWallet = secondaryWallets.find((wallet) => multiWallet.isSameAddress(wallet.address, newAddress, wallet.chain));
-                    // this means the user is linking a new account, so we need proof of ownership...
-                    if (!linkedSecondaryWallet) {
-                        setMultiWalletWidgetState('awaiting_signature', undefined, 'linking_new_wallet');
-                        setSelectedWalletConnector(primaryWallet.connector);
-                        return;
-                    }
-                    // ...otherwise, the user is switching primary accounts betweeen the same wallet
-                    setPrimaryWalletId(linkedSecondaryWallet.id);
-                    setMultiWalletWidgetState('idle');
-                    yield computeConnectedStateForWallets();
+                    handleAccountChangeWhenAwaitingAccountSwitch(true, newAddress);
                 }
-                else if (multiWalletWidgetState === 'idle' &&
-                    secondaryWallets.some((wallet) => multiWallet.isSameAddress(wallet.address, newAddress, wallet.chain))) {
-                    setMultiWalletWidgetState('detected_known_secondary_wallet');
+                else if (multiWalletWidgetState === 'idle' && newWallet) {
+                    setPrimaryWalletId(newWallet.id);
                 }
-                else if (multiWalletWidgetState === 'idle' &&
-                    !secondaryWallets.some((wallet) => multiWallet.isSameAddress(wallet.address, newAddress, wallet.chain))) {
+                else if (multiWalletWidgetState === 'idle' && !newWallet) {
                     if (user) {
                         setMultiWalletWidgetState('detected_new_wallet');
                         setSelectedWalletConnector(primaryWallet.connector);
+                        yield computeConnectedStateForWallets();
                         return;
                     }
                     connectWalletByAddressAndChain(primaryWallet.connector.name, newAddress, primaryWallet.chain);
@@ -81,57 +118,57 @@ const useWalletEventListeners = ({ computeConnectedStateForWallets, handleLogOut
                     logger.logger.error(`Unexpected multiWalletWidgetState (${multiWalletWidgetState}) and onAccountChange combination. Resetting state to idle.`);
                     setMultiWalletWidgetState('idle');
                 }
+                yield computeConnectedStateForWallets();
             }),
             onChainChange: (chain) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
-                /* istanbul ignore next */
                 setNetwork(parseInt(chain));
             }),
             onDisconnect: handleLogOut,
         });
+    }, [
+        primaryWallet,
+        setMultiWalletWidgetState,
+        multiWallet,
+        user,
+        computeConnectedStateForWallets,
+        handleLogOut,
+        connectWalletByAddressAndChain,
+        multiWalletWidgetState,
+        secondaryWallets,
+        setSelectedWalletConnector,
+        handleAccountChangeWhenAwaitingAccountSwitch,
+        setPrimaryWalletId,
+    ]);
+    const addSecondaryWalletEventListeners = React.useCallback((seen) => {
+        const secondaryListeners = {
+            onAccountChange: () => _tslib.__awaiter(void 0, void 0, void 0, function* () {
+                if (multiWalletWidgetState === 'awaiting_account_switch') {
+                    handleAccountChangeWhenAwaitingAccountSwitch(false, (selectedWalletWithAction === null || selectedWalletWithAction === void 0 ? void 0 : selectedWalletWithAction.wallet.address) || '');
+                }
+                yield computeConnectedStateForWallets();
+            }),
+            onDisconnect: () => _tslib.__awaiter(void 0, void 0, void 0, function* () {
+                yield computeConnectedStateForWallets();
+            }),
+        };
         if (selectedWalletConnector && !seen.has(selectedWalletConnector.name)) {
             seen.add(selectedWalletConnector.name);
-            selectedWalletConnector.setupEventListeners({
-                onAccountChange: () => _tslib.__awaiter(void 0, void 0, void 0, function* () {
-                    if (multiWalletWidgetState === 'awaiting_account_switch') {
-                        setMultiWalletWidgetState('awaiting_signature', undefined, 'linking_new_wallet');
-                    }
-                    yield computeConnectedStateForWallets();
-                }),
-                onDisconnect: () => _tslib.__awaiter(void 0, void 0, void 0, function* () {
-                    yield computeConnectedStateForWallets();
-                }),
-            });
+            selectedWalletConnector.setupEventListeners(secondaryListeners);
         }
         for (const wallet of secondaryWallets) {
             if (seen.has(wallet.connector.name)) {
                 continue;
             }
             seen.add(wallet.connector.name);
-            wallet.connector.setupEventListeners({
-                onAccountChange: () => _tslib.__awaiter(void 0, void 0, void 0, function* () {
-                    yield computeConnectedStateForWallets();
-                }),
-                onDisconnect: () => _tslib.__awaiter(void 0, void 0, void 0, function* () {
-                    yield computeConnectedStateForWallets();
-                }),
-            });
+            wallet.connector.setupEventListeners(secondaryListeners);
         }
-        return () => {
-            primaryWallet.connector.teardownEventListeners();
-            for (const wallet of secondaryWallets) {
-                wallet.connector.teardownEventListeners();
-            }
-        };
-        // justification: we don't want to setup event listeners more than needed
-        // eslint-disable-next-line react-hooks/exhaustive-deps
     }, [
-        user,
-        primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.address,
-        primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.id,
+        computeConnectedStateForWallets,
+        selectedWalletConnector,
+        selectedWalletWithAction,
+        handleAccountChangeWhenAwaitingAccountSwitch,
         multiWalletWidgetState,
-        // eslint-disable-next-line react-hooks/exhaustive-deps
-        orderedSecondaryWalletAddresses(secondaryWallets).join(),
-        selectedWalletConnector === null || selectedWalletConnector === void 0 ? void 0 : selectedWalletConnector.name,
+        secondaryWallets,
     ]);
     return {
         loadingNetwork,

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

@@ -1,6 +1,6 @@
 /// <reference types="react" />
 import type { Chain, WalletConnector } from '@dynamic-labs/wallet-connector-core';
-import { MultiWalletWidgetState, UserProfile, Wallet } from '../../../shared';
+import { MultiWalletWidgetState, UserProfile, Wallet, WalletWithAction } from '../../../shared';
 import { MultiWalletWidgetStateSetter } from '../multiWallet';
 export type UseWalletEventListenersArgs = {
     computeConnectedStateForWallets(): Promise<void>;
@@ -11,13 +11,15 @@ export type UseWalletEventListenersArgs = {
     primaryWallet: Wallet | null;
     secondaryWallets: Wallet[];
     selectedWalletConnector: WalletConnector | null;
+    selectedWalletWithAction: WalletWithAction | null;
     setMultiWalletWidgetState: MultiWalletWidgetStateSetter;
     setPrimaryWalletId(walletId: string): void;
     setSelectedWalletConnector(connector: WalletConnector | null): void;
+    setSelectedWalletWithAction(walletWithAction: WalletWithAction | null): void;
     user: UserProfile | undefined;
 };
-export declare const useWalletEventListeners: ({ computeConnectedStateForWallets, handleLogOut, multiWallet, multiWalletWidgetState, primaryWallet, secondaryWallets, selectedWalletConnector, setSelectedWalletConnector, setMultiWalletWidgetState, user, setPrimaryWalletId, connectWalletByAddressAndChain, }: UseWalletEventListenersArgs) => {
+export declare const useWalletEventListeners: ({ computeConnectedStateForWallets, handleLogOut, multiWallet, multiWalletWidgetState, primaryWallet, secondaryWallets, selectedWalletConnector, selectedWalletWithAction, setSelectedWalletConnector, setSelectedWalletWithAction, setMultiWalletWidgetState, user, setPrimaryWalletId, connectWalletByAddressAndChain, }: UseWalletEventListenersArgs) => {
     loadingNetwork: boolean;
-    network: number | undefined;
-    setNetwork: import("react").Dispatch<import("react").SetStateAction<number | undefined>>;
+    network: string | number | undefined;
+    setNetwork: import("react").Dispatch<import("react").SetStateAction<string | number | undefined>>;
 };

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

@@ -1,16 +1,18 @@
 import { __awaiter } from '../../../../../_virtual/_tslib.js';
-import { useState, useEffect } from 'react';
-import { isSameAddress } from '@dynamic-labs/multi-wallet';
+import { useState, useEffect, useCallback } from 'react';
+import { isSameAddress } from '@dynamic-labs/wallet-connector-core';
 import '@dynamic-labs/sdk-api';
 import { logger } from '../../../shared/logger.js';
 import '@dynamic-labs/iconic';
 import 'react/jsx-runtime';
 import '../../../context/ViewContext/ViewContext.js';
+import '@dynamic-labs/utils';
 import '../../constants/colors.js';
+import 'ethers';
 import '../../../shared/consts/index.js';
 
 const orderedSecondaryWalletAddresses = (wallets) => wallets.map((wallet) => wallet.address).sort();
-const useWalletEventListeners = ({ computeConnectedStateForWallets, handleLogOut, multiWallet, multiWalletWidgetState, primaryWallet, secondaryWallets, selectedWalletConnector, setSelectedWalletConnector, setMultiWalletWidgetState, user, setPrimaryWalletId, connectWalletByAddressAndChain, }) => {
+const useWalletEventListeners = ({ computeConnectedStateForWallets, handleLogOut, multiWallet, multiWalletWidgetState, primaryWallet, secondaryWallets, selectedWalletConnector, selectedWalletWithAction, setSelectedWalletConnector, setSelectedWalletWithAction, setMultiWalletWidgetState, user, setPrimaryWalletId, connectWalletByAddressAndChain, }) => {
     const [loadingNetwork, setLoadingNetwork] = useState(true);
     const [network, setNetwork] = useState(undefined);
     useEffect(() => {
@@ -36,39 +38,74 @@ const useWalletEventListeners = ({ computeConnectedStateForWallets, handleLogOut
             return;
         }
         const seen = new Set();
+        addPrimaryWalletEventListeners(seen);
+        addSecondaryWalletEventListeners(seen);
+        return () => {
+            primaryWallet.connector.teardownEventListeners();
+            for (const wallet of secondaryWallets) {
+                wallet.connector.teardownEventListeners();
+            }
+        };
+        // justification: we don't want to setup event listeners more than needed
+        // eslint-disable-next-line react-hooks/exhaustive-deps
+    }, [
+        user,
+        primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.address,
+        primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.id,
+        multiWalletWidgetState,
+        // eslint-disable-next-line react-hooks/exhaustive-deps
+        orderedSecondaryWalletAddresses(secondaryWallets).join(),
+        selectedWalletConnector === null || selectedWalletConnector === void 0 ? void 0 : selectedWalletConnector.name,
+    ]);
+    const handleAccountChangeWhenAwaitingAccountSwitch = useCallback((isPrimaryWallet, newAddress) => {
+        const linkedSecondaryWallet = secondaryWallets.find((wallet) => isSameAddress(wallet.address, newAddress, wallet.chain));
+        // this means the user is linking a new account, so we need proof of ownership...
+        if (!linkedSecondaryWallet) {
+            setMultiWalletWidgetState('awaiting_signature', undefined, 'linking_new_wallet');
+            if (isPrimaryWallet && primaryWallet) {
+                setSelectedWalletConnector(primaryWallet.connector);
+            }
+            return;
+        }
+        // ...otherwise, the user is switching primary accounts betweeen the same wallet
+        setSelectedWalletWithAction(null);
+        setPrimaryWalletId(linkedSecondaryWallet.id);
+        setMultiWalletWidgetState('idle');
+    }, [
+        setMultiWalletWidgetState,
+        primaryWallet,
+        secondaryWallets,
+        setSelectedWalletConnector,
+        setSelectedWalletWithAction,
+        setPrimaryWalletId,
+    ]);
+    const addPrimaryWalletEventListeners = useCallback((seen) => {
+        if (!primaryWallet) {
+            return;
+        }
         seen.add(primaryWallet.connector.name);
         primaryWallet.connector.setupEventListeners({
             onAccountChange: (accounts) => __awaiter(void 0, void 0, void 0, function* () {
                 const [newAddress] = accounts;
-                yield computeConnectedStateForWallets();
+                const newWallet = secondaryWallets.find((wallet) => isSameAddress(wallet.address, newAddress, wallet.chain));
                 if (isSameAddress(newAddress, primaryWallet.address, primaryWallet.chain)) {
                     setMultiWalletWidgetState('idle');
                 }
                 else if (!multiWallet) {
                     yield handleLogOut();
+                    return;
                 }
                 else if (multiWalletWidgetState === 'awaiting_account_switch') {
-                    const linkedSecondaryWallet = secondaryWallets.find((wallet) => isSameAddress(wallet.address, newAddress, wallet.chain));
-                    // this means the user is linking a new account, so we need proof of ownership...
-                    if (!linkedSecondaryWallet) {
-                        setMultiWalletWidgetState('awaiting_signature', undefined, 'linking_new_wallet');
-                        setSelectedWalletConnector(primaryWallet.connector);
-                        return;
-                    }
-                    // ...otherwise, the user is switching primary accounts betweeen the same wallet
-                    setPrimaryWalletId(linkedSecondaryWallet.id);
-                    setMultiWalletWidgetState('idle');
-                    yield computeConnectedStateForWallets();
+                    handleAccountChangeWhenAwaitingAccountSwitch(true, newAddress);
                 }
-                else if (multiWalletWidgetState === 'idle' &&
-                    secondaryWallets.some((wallet) => isSameAddress(wallet.address, newAddress, wallet.chain))) {
-                    setMultiWalletWidgetState('detected_known_secondary_wallet');
+                else if (multiWalletWidgetState === 'idle' && newWallet) {
+                    setPrimaryWalletId(newWallet.id);
                 }
-                else if (multiWalletWidgetState === 'idle' &&
-                    !secondaryWallets.some((wallet) => isSameAddress(wallet.address, newAddress, wallet.chain))) {
+                else if (multiWalletWidgetState === 'idle' && !newWallet) {
                     if (user) {
                         setMultiWalletWidgetState('detected_new_wallet');
                         setSelectedWalletConnector(primaryWallet.connector);
+                        yield computeConnectedStateForWallets();
                         return;
                     }
                     connectWalletByAddressAndChain(primaryWallet.connector.name, newAddress, primaryWallet.chain);
@@ -77,57 +114,57 @@ const useWalletEventListeners = ({ computeConnectedStateForWallets, handleLogOut
                     logger.error(`Unexpected multiWalletWidgetState (${multiWalletWidgetState}) and onAccountChange combination. Resetting state to idle.`);
                     setMultiWalletWidgetState('idle');
                 }
+                yield computeConnectedStateForWallets();
             }),
             onChainChange: (chain) => __awaiter(void 0, void 0, void 0, function* () {
-                /* istanbul ignore next */
                 setNetwork(parseInt(chain));
             }),
             onDisconnect: handleLogOut,
         });
+    }, [
+        primaryWallet,
+        setMultiWalletWidgetState,
+        multiWallet,
+        user,
+        computeConnectedStateForWallets,
+        handleLogOut,
+        connectWalletByAddressAndChain,
+        multiWalletWidgetState,
+        secondaryWallets,
+        setSelectedWalletConnector,
+        handleAccountChangeWhenAwaitingAccountSwitch,
+        setPrimaryWalletId,
+    ]);
+    const addSecondaryWalletEventListeners = useCallback((seen) => {
+        const secondaryListeners = {
+            onAccountChange: () => __awaiter(void 0, void 0, void 0, function* () {
+                if (multiWalletWidgetState === 'awaiting_account_switch') {
+                    handleAccountChangeWhenAwaitingAccountSwitch(false, (selectedWalletWithAction === null || selectedWalletWithAction === void 0 ? void 0 : selectedWalletWithAction.wallet.address) || '');
+                }
+                yield computeConnectedStateForWallets();
+            }),
+            onDisconnect: () => __awaiter(void 0, void 0, void 0, function* () {
+                yield computeConnectedStateForWallets();
+            }),
+        };
         if (selectedWalletConnector && !seen.has(selectedWalletConnector.name)) {
             seen.add(selectedWalletConnector.name);
-            selectedWalletConnector.setupEventListeners({
-                onAccountChange: () => __awaiter(void 0, void 0, void 0, function* () {
-                    if (multiWalletWidgetState === 'awaiting_account_switch') {
-                        setMultiWalletWidgetState('awaiting_signature', undefined, 'linking_new_wallet');
-                    }
-                    yield computeConnectedStateForWallets();
-                }),
-                onDisconnect: () => __awaiter(void 0, void 0, void 0, function* () {
-                    yield computeConnectedStateForWallets();
-                }),
-            });
+            selectedWalletConnector.setupEventListeners(secondaryListeners);
         }
         for (const wallet of secondaryWallets) {
             if (seen.has(wallet.connector.name)) {
                 continue;
             }
             seen.add(wallet.connector.name);
-            wallet.connector.setupEventListeners({
-                onAccountChange: () => __awaiter(void 0, void 0, void 0, function* () {
-                    yield computeConnectedStateForWallets();
-                }),
-                onDisconnect: () => __awaiter(void 0, void 0, void 0, function* () {
-                    yield computeConnectedStateForWallets();
-                }),
-            });
+            wallet.connector.setupEventListeners(secondaryListeners);
         }
-        return () => {
-            primaryWallet.connector.teardownEventListeners();
-            for (const wallet of secondaryWallets) {
-                wallet.connector.teardownEventListeners();
-            }
-        };
-        // justification: we don't want to setup event listeners more than needed
-        // eslint-disable-next-line react-hooks/exhaustive-deps
     }, [
-        user,
-        primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.address,
-        primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.id,
+        computeConnectedStateForWallets,
+        selectedWalletConnector,
+        selectedWalletWithAction,
+        handleAccountChangeWhenAwaitingAccountSwitch,
         multiWalletWidgetState,
-        // eslint-disable-next-line react-hooks/exhaustive-deps
-        orderedSecondaryWalletAddresses(secondaryWallets).join(),
-        selectedWalletConnector === null || selectedWalletConnector === void 0 ? void 0 : selectedWalletConnector.name,
+        secondaryWallets,
     ]);
     return {
         loadingNetwork,

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

@@ -3,58 +3,59 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 var _tslib = require('../../../../../_virtual/_tslib.cjs');
-var React = require('react');
-var multiWallet = require('@dynamic-labs/multi-wallet');
+var utils = require('@dynamic-labs/utils');
 var MockContext = require('../../../context/MockContext/MockContext.cjs');
 var useInternalDynamicContext = require('../../../context/DynamicContext/useInternalDynamicContext.cjs');
 var ErrorContext = require('../../../context/ErrorContext/ErrorContext.cjs');
 var ViewContext = require('../../../context/ViewContext/ViewContext.cjs');
 require('../../constants/colors.cjs');
+require('@dynamic-labs/multi-wallet');
 require('@dynamic-labs/sdk-api');
 require('../../../shared/logger.cjs');
 require('@dynamic-labs/iconic');
+require('@dynamic-labs/wallet-connector-core');
 require('react/jsx-runtime');
+require('react');
+require('ethers');
 var requiresTwoStepAuthentication = require('../../functions/requiresTwoStepAuthentication/requiresTwoStepAuthentication.cjs');
+require('../../../shared/consts/index.cjs');
 var useConnectAndSign = require('../authenticationHooks/useConnectAndSign/useConnectAndSign.cjs');
 require('../../../config/ApiEndpoint.cjs');
-require('../../../shared/consts/index.cjs');
+require('../../../context/AccessDeniedContext/AccessDeniedContext.cjs');
 var useConnectAndSignSplitSteps = require('../authenticationHooks/useConnectAndSignSplitSteps/useConnectAndSignSplitSteps.cjs');
 var isSelectedWalletAlreadyConnected = require('../../functions/isSelectedWalletAlreadyConnected/isSelectedWalletAlreadyConnected.cjs');
 
 const useWalletItemActions = () => {
-    const { setMultiWalletWidgetState, setShowAuthFlow, setSelectedWalletConnector, wallets, setQrcodeUri, setDesktopUri, user, connectedWallets, } = useInternalDynamicContext.useInternalDynamicContext();
+    const { setMultiWalletWidgetState, setShowAuthFlow, setSelectedWalletConnector, wallets, setQrcodeUri, setDesktopUri, user, connectedWallets, setIsVerifying, } = useInternalDynamicContext.useInternalDynamicContext();
     const { mockedSDK } = MockContext.useMockContext();
     const { setError } = ErrorContext.useErrorContext();
     const { setView } = ViewContext.useViewContext();
     const { onlyConnectUser } = useConnectAndSignSplitSteps.useConnectAndSignSplitSteps();
     const connectAndSignWallet = useConnectAndSign.useConnectAndSign();
-    const setWalletConnectorAndWalletColor = React.useCallback((walletConnector) => {
-        setSelectedWalletConnector(walletConnector);
-    }, [setSelectedWalletConnector]);
     const handleCustodialWalletClick = (walletConnector) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
         const twoStepAuthentication = requiresTwoStepAuthentication.requiresTwoStepAuthentication(walletConnector);
         if (twoStepAuthentication) {
-            setWalletConnectorAndWalletColor(walletConnector);
+            setSelectedWalletConnector(walletConnector);
             yield onlyConnectUser({
                 walletConnector,
             });
         }
         else {
-            setWalletConnectorAndWalletColor(walletConnector);
+            setSelectedWalletConnector(walletConnector);
             setMultiWalletWidgetState('awaiting_signature', undefined, 'linking_new_wallet');
         }
         setView('pending-signature');
     });
     const handleMobileWalletClick = (walletConnector) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
-        setWalletConnectorAndWalletColor(walletConnector);
+        setSelectedWalletConnector(walletConnector);
         onlyConnectUser({ walletConnector });
     });
     const handleInstalledExtensionClick = (walletConnector) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
-        setWalletConnectorAndWalletColor(walletConnector);
+        setSelectedWalletConnector(walletConnector);
         setMultiWalletWidgetState('awaiting_signature', undefined, 'linking_new_wallet');
     });
     const handleUninstalledClick = (walletConnector) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
-        setWalletConnectorAndWalletColor(walletConnector);
+        setSelectedWalletConnector(walletConnector);
         if (!walletConnector.canConnectViaQrCode) {
             setView('no-qr-not-installed');
         }
@@ -84,14 +85,14 @@ const useWalletItemActions = () => {
             setMultiWalletWidgetState('awaiting_signature', undefined, 'linking_new_wallet');
         }
         setShowAuthFlow(false);
-        setWalletConnectorAndWalletColor(walletConnector);
+        setSelectedWalletConnector(walletConnector);
     });
     const openWallet = (walletKey, handlers) => {
         const { openMobileWallet = handleMobileWalletClick, openCustodialWallet = handleCustodialWalletClick, openExtensionWallet = handleInstalledExtensionClick, } = handlers || {};
         const wallet = wallets.find((wallet) => wallet.key === walletKey);
         if (!wallet)
             return;
-        if (multiWallet.isMobile()) {
+        if (utils.isMobile()) {
             openMobileWallet(wallet.walletConnector);
         }
         else if (wallet.walletConnector.canConnectViaCustodialService) {
@@ -108,6 +109,7 @@ const useWalletItemActions = () => {
         if (walletConnector.connectedChain === 'FLOW') {
             yield walletConnector.endSession();
         }
+        setIsVerifying(false);
         if (isSelectedWalletAlreadyConnected.isSelectedWalletAlreadyConnected(connectedWallets, walletConnector, user) &&
             walletConnector.connectedChain !== 'FLOW') {
             // wallet is already connected
@@ -117,7 +119,7 @@ const useWalletItemActions = () => {
             // providers like blocto and dapper
             handleCustodialWalletClick(walletConnector);
         }
-        else if (multiWallet.isMobile()) {
+        else if (utils.isMobile()) {
             // mobile wallets
             if (walletConnector.name === 'WalletConnect') {
                 setView('wallet-connect-mobile-wallets-list');

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

@@ -1,56 +1,57 @@
 import { __awaiter } from '../../../../../_virtual/_tslib.js';
-import { useCallback } from 'react';
-import { isMobile } from '@dynamic-labs/multi-wallet';
+import { isMobile } from '@dynamic-labs/utils';
 import { useMockContext } from '../../../context/MockContext/MockContext.js';
 import { useInternalDynamicContext } from '../../../context/DynamicContext/useInternalDynamicContext.js';
 import { useErrorContext } from '../../../context/ErrorContext/ErrorContext.js';
 import { useViewContext } from '../../../context/ViewContext/ViewContext.js';
 import '../../constants/colors.js';
+import '@dynamic-labs/multi-wallet';
 import '@dynamic-labs/sdk-api';
 import '../../../shared/logger.js';
 import '@dynamic-labs/iconic';
+import '@dynamic-labs/wallet-connector-core';
 import 'react/jsx-runtime';
+import 'react';
+import 'ethers';
 import { requiresTwoStepAuthentication } from '../../functions/requiresTwoStepAuthentication/requiresTwoStepAuthentication.js';
+import '../../../shared/consts/index.js';
 import { useConnectAndSign } from '../authenticationHooks/useConnectAndSign/useConnectAndSign.js';
 import '../../../config/ApiEndpoint.js';
-import '../../../shared/consts/index.js';
+import '../../../context/AccessDeniedContext/AccessDeniedContext.js';
 import { useConnectAndSignSplitSteps } from '../authenticationHooks/useConnectAndSignSplitSteps/useConnectAndSignSplitSteps.js';
 import { isSelectedWalletAlreadyConnected } from '../../functions/isSelectedWalletAlreadyConnected/isSelectedWalletAlreadyConnected.js';
 
 const useWalletItemActions = () => {
-    const { setMultiWalletWidgetState, setShowAuthFlow, setSelectedWalletConnector, wallets, setQrcodeUri, setDesktopUri, user, connectedWallets, } = useInternalDynamicContext();
+    const { setMultiWalletWidgetState, setShowAuthFlow, setSelectedWalletConnector, wallets, setQrcodeUri, setDesktopUri, user, connectedWallets, setIsVerifying, } = useInternalDynamicContext();
     const { mockedSDK } = useMockContext();
     const { setError } = useErrorContext();
     const { setView } = useViewContext();
     const { onlyConnectUser } = useConnectAndSignSplitSteps();
     const connectAndSignWallet = useConnectAndSign();
-    const setWalletConnectorAndWalletColor = useCallback((walletConnector) => {
-        setSelectedWalletConnector(walletConnector);
-    }, [setSelectedWalletConnector]);
     const handleCustodialWalletClick = (walletConnector) => __awaiter(void 0, void 0, void 0, function* () {
         const twoStepAuthentication = requiresTwoStepAuthentication(walletConnector);
         if (twoStepAuthentication) {
-            setWalletConnectorAndWalletColor(walletConnector);
+            setSelectedWalletConnector(walletConnector);
             yield onlyConnectUser({
                 walletConnector,
             });
         }
         else {
-            setWalletConnectorAndWalletColor(walletConnector);
+            setSelectedWalletConnector(walletConnector);
             setMultiWalletWidgetState('awaiting_signature', undefined, 'linking_new_wallet');
         }
         setView('pending-signature');
     });
     const handleMobileWalletClick = (walletConnector) => __awaiter(void 0, void 0, void 0, function* () {
-        setWalletConnectorAndWalletColor(walletConnector);
+        setSelectedWalletConnector(walletConnector);
         onlyConnectUser({ walletConnector });
     });
     const handleInstalledExtensionClick = (walletConnector) => __awaiter(void 0, void 0, void 0, function* () {
-        setWalletConnectorAndWalletColor(walletConnector);
+        setSelectedWalletConnector(walletConnector);
         setMultiWalletWidgetState('awaiting_signature', undefined, 'linking_new_wallet');
     });
     const handleUninstalledClick = (walletConnector) => __awaiter(void 0, void 0, void 0, function* () {
-        setWalletConnectorAndWalletColor(walletConnector);
+        setSelectedWalletConnector(walletConnector);
         if (!walletConnector.canConnectViaQrCode) {
             setView('no-qr-not-installed');
         }
@@ -80,7 +81,7 @@ const useWalletItemActions = () => {
             setMultiWalletWidgetState('awaiting_signature', undefined, 'linking_new_wallet');
         }
         setShowAuthFlow(false);
-        setWalletConnectorAndWalletColor(walletConnector);
+        setSelectedWalletConnector(walletConnector);
     });
     const openWallet = (walletKey, handlers) => {
         const { openMobileWallet = handleMobileWalletClick, openCustodialWallet = handleCustodialWalletClick, openExtensionWallet = handleInstalledExtensionClick, } = handlers || {};
@@ -104,6 +105,7 @@ const useWalletItemActions = () => {
         if (walletConnector.connectedChain === 'FLOW') {
             yield walletConnector.endSession();
         }
+        setIsVerifying(false);
         if (isSelectedWalletAlreadyConnected(connectedWallets, walletConnector, user) &&
             walletConnector.connectedChain !== 'FLOW') {
             // wallet is already connected