@dynamic-labs/sdk-react-core 0.17.0-RC.16 → 0.17.0-RC.18

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

@@ -1,7 +1,49 @@
-import { useEffect } from 'react';
+import { useCallback, useEffect } from 'react';
 import { isSameAddress } from '@dynamic-labs/wallet-connector-core';
+import { isWalletLinked } from '../../../functions/isWalletLinked/isWalletLinked.js';
 
-const useSyncPrimaryWallet = ({ primaryWallet, setMultiWalletWidgetState, multiWalletWidgetState, }) => {
+const useSyncPrimaryWallet = ({ computeConnectedStateForWallets, handleLogOut, multiWalletWidgetState, primaryWallet, secondaryWallets, setMultiWalletWidgetState, setPrimaryWallet, setShowWidgetStatePopup, showWidgetStatePopup, }) => {
+    const handlePrimaryWalletNotActive = useCallback((connectedAddress) => {
+        if (!primaryWallet)
+            return;
+        const connectedWalletIsLinked = isWalletLinked(connectedAddress, [
+            primaryWallet,
+            ...secondaryWallets,
+        ]);
+        if (!connectedWalletIsLinked) {
+            const connectedSecondaryWallet = secondaryWallets.find((wallet) => wallet.connected);
+            if (!connectedSecondaryWallet) {
+                setMultiWalletWidgetState('awaiting_account_switch', 'primary_not_connected');
+                return;
+            }
+            setPrimaryWallet(connectedSecondaryWallet.id);
+            computeConnectedStateForWallets();
+            return;
+        }
+        if (showWidgetStatePopup) {
+            // user updates wallet address in the widget
+            setShowWidgetStatePopup(false);
+            setMultiWalletWidgetState('awaiting_account_switch', 'switching_primary');
+            return;
+        }
+        // !showWidgetStatePopup - user comes back to site with different wallet address
+        const connectedWallet = secondaryWallets.find((wallet) => wallet.connected &&
+            isSameAddress(wallet.address, connectedAddress, wallet.chain));
+        if (connectedWallet) {
+            setPrimaryWallet(connectedWallet.id);
+            computeConnectedStateForWallets();
+            return;
+        }
+        setMultiWalletWidgetState('awaiting_account_switch', 'primary_not_connected');
+    }, [
+        primaryWallet,
+        secondaryWallets,
+        showWidgetStatePopup,
+        setShowWidgetStatePopup,
+        setMultiWalletWidgetState,
+        setPrimaryWallet,
+        computeConnectedStateForWallets,
+    ]);
     useEffect(() => {
         if (!primaryWallet || multiWalletWidgetState !== 'idle')
             return;
@@ -11,17 +53,31 @@ const useSyncPrimaryWallet = ({ primaryWallet, setMultiWalletWidgetState, multiW
             return;
         primaryWallet.connector
             .getConnectedAccounts()
-            .then(([selectedAddress]) => {
-            if (!selectedAddress)
+            .then(([connectedAddress]) => {
+            if (isSameAddress(connectedAddress, primaryWallet.address, primaryWallet.chain)) {
                 return;
-            if (!isSameAddress(selectedAddress, primaryWallet.address, primaryWallet.chain)) {
-                setMultiWalletWidgetState('awaiting_account_switch', 'primary_not_connected');
             }
+            handlePrimaryWalletNotActive(connectedAddress);
         })
             .catch(() => {
-            setMultiWalletWidgetState('awaiting_account_switch', 'primary_not_connected');
+            const connectedSecondaryWallet = secondaryWallets.find((wallet) => wallet.connected);
+            if (connectedSecondaryWallet) {
+                setPrimaryWallet(connectedSecondaryWallet.id);
+                computeConnectedStateForWallets();
+                return;
+            }
+            handleLogOut();
         });
-    }, [primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.id, setMultiWalletWidgetState, multiWalletWidgetState]);
+    }, [
+        primaryWallet,
+        secondaryWallets,
+        multiWalletWidgetState,
+        setMultiWalletWidgetState,
+        computeConnectedStateForWallets,
+        handlePrimaryWalletNotActive,
+        handleLogOut,
+        setPrimaryWallet,
+    ]);
 };
 
 export { useSyncPrimaryWallet };

package/src/lib/utils/hooks/useConnectedAccountWallet/index.d.ts

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

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

@@ -0,0 +1,30 @@
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+var _tslib = require('../../../../../_virtual/_tslib.cjs');
+var React = require('react');
+
+const useConnectedAccountWallet = (connector, secondaryWallets) => {
+    const [wallet, setWallet] = React.useState();
+    React.useEffect(() => {
+        const getConnectedAccounts = () => _tslib.__awaiter(void 0, void 0, void 0, function* () {
+            var _a;
+            if (!connector) {
+                setWallet(undefined);
+                return;
+            }
+            const connectedAccounts = (_a = (yield connector.getConnectedAccounts())) !== null && _a !== void 0 ? _a : [];
+            const connectedWallet = secondaryWallets.find((secondaryWallet) => {
+                var _a;
+                return secondaryWallet.address.toLowerCase() ===
+                    ((_a = connectedAccounts[0]) === null || _a === void 0 ? void 0 : _a.toLowerCase());
+            });
+            setWallet(connectedWallet);
+        });
+        getConnectedAccounts();
+    }, [connector, secondaryWallets]);
+    return wallet;
+};
+
+exports.useConnectedAccountWallet = useConnectedAccountWallet;

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

@@ -0,0 +1,2 @@
+import { Wallet, WalletConnector } from '../../../..';
+export declare const useConnectedAccountWallet: (connector: WalletConnector | undefined, secondaryWallets: Wallet[]) => Wallet | undefined;

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

@@ -0,0 +1,26 @@
+import { __awaiter } from '../../../../../_virtual/_tslib.js';
+import { useState, useEffect } from 'react';
+
+const useConnectedAccountWallet = (connector, secondaryWallets) => {
+    const [wallet, setWallet] = useState();
+    useEffect(() => {
+        const getConnectedAccounts = () => __awaiter(void 0, void 0, void 0, function* () {
+            var _a;
+            if (!connector) {
+                setWallet(undefined);
+                return;
+            }
+            const connectedAccounts = (_a = (yield connector.getConnectedAccounts())) !== null && _a !== void 0 ? _a : [];
+            const connectedWallet = secondaryWallets.find((secondaryWallet) => {
+                var _a;
+                return secondaryWallet.address.toLowerCase() ===
+                    ((_a = connectedAccounts[0]) === null || _a === void 0 ? void 0 : _a.toLowerCase());
+            });
+            setWallet(connectedWallet);
+        });
+        getConnectedAccounts();
+    }, [connector, secondaryWallets]);
+    return wallet;
+};
+
+export { useConnectedAccountWallet };

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

@@ -23,11 +23,11 @@ var createUserProfile = require('../../functions/createUserProfile/createUserPro
 var isSupportedNetwork = require('../../functions/isSupportedNetwork/isSupportedNetwork.cjs');
 require('@dynamic-labs/sdk-api');
 var isProgrammableNetworkSwitchSupported = require('../../functions/isProgrammableNetworkSwitchSupported/isProgrammableNetworkSwitchSupported.cjs');
+require('../../../shared/consts/index.cjs');
 var useInternalDynamicContext = require('../../../context/DynamicContext/useInternalDynamicContext.cjs');
 var ErrorContext = require('../../../context/ErrorContext/ErrorContext.cjs');
 var getSiweStatement = require('../../functions/getSiweStatement/getSiweStatement.cjs');
 var getWalletProvider = require('../../functions/getWalletProvider/getWalletProvider.cjs');
-require('../../../shared/consts/index.cjs');
 
 // This logic is used to both verify or link a wallet
 // Since we are re-using the different screens to authenticate or link the wallet.

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

@@ -19,11 +19,11 @@ import { createUserProfile } from '../../functions/createUserProfile/createUserP
 import { isSupportedNetwork } from '../../functions/isSupportedNetwork/isSupportedNetwork.js';
 import '@dynamic-labs/sdk-api';
 import { isProgrammableNetworkSwitchSupported } from '../../functions/isProgrammableNetworkSwitchSupported/isProgrammableNetworkSwitchSupported.js';
+import '../../../shared/consts/index.js';
 import { useInternalDynamicContext } from '../../../context/DynamicContext/useInternalDynamicContext.js';
 import { useErrorContext } from '../../../context/ErrorContext/ErrorContext.js';
 import { getSiweStatement } from '../../functions/getSiweStatement/getSiweStatement.js';
 import { getWalletProvider } from '../../functions/getWalletProvider/getWalletProvider.js';
-import '../../../shared/consts/index.js';
 
 // This logic is used to both verify or link a wallet
 // Since we are re-using the different screens to authenticate or link the wallet.

package/src/lib/utils/hooks/useWalletConnectors/reconnectSocialWallet.d.ts

@@ -0,0 +1,8 @@
+import { Wallet } from '../../../shared';
+/**
+ * This function will use a referenced account to kick off the social wallet
+ * authentication. This is useful in the multiwallet scenario where the user
+ * wants to set their disconnected social wallet as their primary wallet, in
+ * which case the wallet needs to be reconnected
+ */
+export declare const reconnectSocialWallet: (jwt: string | undefined, wallet: Wallet) => Promise<void>;

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

@@ -97,9 +97,7 @@ const useWalletConnectors = ({ authToken, wallets: availableWallets, multiWallet
         const connectedAccounts = yield newWallet.connector.getConnectedAccounts();
         return { connectedAccounts, newWallet };
     }), [wallets]);
-    const checkIfAccountChangeIsRequired = React.useCallback((primaryWallet, newPrimaryWallet) => {
-        if (!primaryWallet)
-            return;
+    const checkIfAccountChangeIsRequired = React.useCallback((primaryWallet, newPrimaryWallet, connectedAccounts) => {
         /**
          * we need to check multiWalletWidgetState here because `setPrimaryWallet` currently gets
          * called twice: once when the user clicks "make active" and once when the user performs
@@ -107,8 +105,12 @@ const useWalletConnectors = ({ authToken, wallets: availableWallets, multiWallet
          * (https://github.com/dynamic-labs/DynamicAuth/pull/550) is merged, since setting the
          * primary wallet will be simpler, so we won't need to call `setPrimaryWallet` twice.
          */
-        return (multiWalletWidgetState === 'idle' &&
-            isSameWalletName.isSameWalletName(newPrimaryWallet.connector.name, primaryWallet.connector.name));
+        if (!primaryWallet || multiWalletWidgetState !== 'idle')
+            return;
+        const accountIsNotConnectedInSecondaryWallet = connectedAccounts &&
+            !connectedAccounts.find((connectedAccount) => connectedAccount.toLowerCase() ===
+                newPrimaryWallet.address.toLowerCase());
+        return (isSameWalletName.isSameWalletName(newPrimaryWallet.connector.name, primaryWallet.connector.name) || accountIsNotConnectedInSecondaryWallet);
     }, [multiWalletWidgetState]);
     const checkIfShowQrCodeModal = React.useCallback((wallet) => !wallet.connector.isInstalledOnBrowser() &&
         !wallet.connector.canConnectViaCustodialService, []);
@@ -123,7 +125,8 @@ const useWalletConnectors = ({ authToken, wallets: availableWallets, multiWallet
             return;
         const primaryWallet = getPrimaryWallet();
         if (checkIfAccountChangeIsRequired(primaryWallet, newPrimaryWallet)) {
-            setMultiWalletWidgetState('awaiting_account_switch', 'switching_primary');
+            yield newPrimaryWallet.connector.connect();
+            setPrimaryWalletId(walletId);
             return;
         }
         if (!connectedAccounts.length) {
@@ -146,6 +149,15 @@ const useWalletConnectors = ({ authToken, wallets: availableWallets, multiWallet
                 setQrcodeUri(uri);
             }),
         });
+        /**
+         * need to check for connected account again for wallets that disconnect on refresh
+         *  and only reconnect upon fetching public address above
+         */
+        const updatedConnectedAccounts = yield newPrimaryWallet.connector.getConnectedAccounts();
+        if (checkIfAccountChangeIsRequired(primaryWallet, newPrimaryWallet, updatedConnectedAccounts)) {
+            setMultiWalletWidgetState('awaiting_account_switch', 'switching_primary');
+            return;
+        }
         if (publicAddress) {
             setPrimaryWalletId(walletId);
             setMultiWalletWidgetState('idle');

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

@@ -93,9 +93,7 @@ const useWalletConnectors = ({ authToken, wallets: availableWallets, multiWallet
         const connectedAccounts = yield newWallet.connector.getConnectedAccounts();
         return { connectedAccounts, newWallet };
     }), [wallets]);
-    const checkIfAccountChangeIsRequired = useCallback((primaryWallet, newPrimaryWallet) => {
-        if (!primaryWallet)
-            return;
+    const checkIfAccountChangeIsRequired = useCallback((primaryWallet, newPrimaryWallet, connectedAccounts) => {
         /**
          * we need to check multiWalletWidgetState here because `setPrimaryWallet` currently gets
          * called twice: once when the user clicks "make active" and once when the user performs
@@ -103,8 +101,12 @@ const useWalletConnectors = ({ authToken, wallets: availableWallets, multiWallet
          * (https://github.com/dynamic-labs/DynamicAuth/pull/550) is merged, since setting the
          * primary wallet will be simpler, so we won't need to call `setPrimaryWallet` twice.
          */
-        return (multiWalletWidgetState === 'idle' &&
-            isSameWalletName(newPrimaryWallet.connector.name, primaryWallet.connector.name));
+        if (!primaryWallet || multiWalletWidgetState !== 'idle')
+            return;
+        const accountIsNotConnectedInSecondaryWallet = connectedAccounts &&
+            !connectedAccounts.find((connectedAccount) => connectedAccount.toLowerCase() ===
+                newPrimaryWallet.address.toLowerCase());
+        return (isSameWalletName(newPrimaryWallet.connector.name, primaryWallet.connector.name) || accountIsNotConnectedInSecondaryWallet);
     }, [multiWalletWidgetState]);
     const checkIfShowQrCodeModal = useCallback((wallet) => !wallet.connector.isInstalledOnBrowser() &&
         !wallet.connector.canConnectViaCustodialService, []);
@@ -119,7 +121,8 @@ const useWalletConnectors = ({ authToken, wallets: availableWallets, multiWallet
             return;
         const primaryWallet = getPrimaryWallet();
         if (checkIfAccountChangeIsRequired(primaryWallet, newPrimaryWallet)) {
-            setMultiWalletWidgetState('awaiting_account_switch', 'switching_primary');
+            yield newPrimaryWallet.connector.connect();
+            setPrimaryWalletId(walletId);
             return;
         }
         if (!connectedAccounts.length) {
@@ -142,6 +145,15 @@ const useWalletConnectors = ({ authToken, wallets: availableWallets, multiWallet
                 setQrcodeUri(uri);
             }),
         });
+        /**
+         * need to check for connected account again for wallets that disconnect on refresh
+         *  and only reconnect upon fetching public address above
+         */
+        const updatedConnectedAccounts = yield newPrimaryWallet.connector.getConnectedAccounts();
+        if (checkIfAccountChangeIsRequired(primaryWallet, newPrimaryWallet, updatedConnectedAccounts)) {
+            setMultiWalletWidgetState('awaiting_account_switch', 'switching_primary');
+            return;
+        }
         if (publicAddress) {
             setPrimaryWalletId(walletId);
             setMultiWalletWidgetState('idle');

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

@@ -91,26 +91,25 @@ const useWalletEventListeners = ({ computeConnectedStateForWallets, handleLogOut
         primaryWallet.connector.setupEventListeners({
             onAccountChange: (accounts) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
                 const [newAddress] = accounts;
-                yield computeConnectedStateForWallets();
+                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) {
                     yield handleLogOut();
+                    return;
                 }
                 else if (multiWalletWidgetState === 'awaiting_account_switch') {
                     handleAccountChangeWhenAwaitingAccountSwitch(true, newAddress);
-                    yield computeConnectedStateForWallets();
                 }
-                else if (multiWalletWidgetState === 'idle' &&
-                    secondaryWallets.some((wallet) => walletConnectorCore.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) => walletConnectorCore.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);
@@ -119,9 +118,9 @@ 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,
@@ -138,6 +137,7 @@ const useWalletEventListeners = ({ computeConnectedStateForWallets, handleLogOut
         secondaryWallets,
         setSelectedWalletConnector,
         handleAccountChangeWhenAwaitingAccountSwitch,
+        setPrimaryWalletId,
     ]);
     const addSecondaryWalletEventListeners = React.useCallback((seen) => {
         const secondaryListeners = {

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

@@ -87,26 +87,25 @@ const useWalletEventListeners = ({ computeConnectedStateForWallets, handleLogOut
         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') {
                     handleAccountChangeWhenAwaitingAccountSwitch(true, newAddress);
-                    yield computeConnectedStateForWallets();
                 }
-                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);
@@ -115,9 +114,9 @@ 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,
@@ -134,6 +133,7 @@ const useWalletEventListeners = ({ computeConnectedStateForWallets, handleLogOut
         secondaryWallets,
         setSelectedWalletConnector,
         handleAccountChangeWhenAwaitingAccountSwitch,
+        setPrimaryWalletId,
     ]);
     const addSecondaryWalletEventListeners = useCallback((seen) => {
         const secondaryListeners = {

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

@@ -18,14 +18,14 @@ 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');
 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();
@@ -108,6 +108,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

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

@@ -14,14 +14,14 @@ 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 { 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();
@@ -104,6 +104,7 @@ const useWalletItemActions = () => {
         if (walletConnector.connectedChain === 'FLOW') {
             yield walletConnector.endSession();
         }
+        setIsVerifying(false);
         if (isSelectedWalletAlreadyConnected(connectedWallets, walletConnector, user) &&
             walletConnector.connectedChain !== 'FLOW') {
             // wallet is already connected

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

@@ -8,40 +8,42 @@ var React = require('react');
 var SignMessageConfirmationModal = require('../../../modals/SignMessageConfirmationModal/SignMessageConfirmationModal.cjs');
 var TransactionConfirmationModal = require('../../../modals/TransactionConfirmationModal/TransactionConfirmationModal.cjs');
 var useConfirmationModal = require('../useConfirmationModal/useConfirmationModal.cjs');
-require('../../constants/colors.cjs');
-require('@dynamic-labs/multi-wallet');
-require('@dynamic-labs/utils');
-var getAuthToken = require('../../functions/getAuthToken/getAuthToken.cjs');
-require('@dynamic-labs/wallet-connector-core');
-require('@dynamic-labs/sdk-api');
 
 const useWalletUiUtils = ({ appLogoUrl, appName, getAppOrigin, }) => {
-    const fakeSignerRef = React.useRef('disabled');
+    const confirmationStateRef = React.useRef('enabled');
     const { modal: sendTransactionModal, open: openSendTransaction } = useConfirmationModal.useConfirmationModal({
         elementId: 'dynamic-send-transaction',
     });
     const { modal, open: openSignMessage } = useConfirmationModal.useConfirmationModal({
         elementId: 'dynamic-sign-message',
     });
+    const shouldConfirmAction = React.useCallback(() => {
+        if (confirmationStateRef.current === 'disabled') {
+            confirmationStateRef.current = 'enabled';
+            return false;
+        }
+        return true;
+    }, [confirmationStateRef]);
     const signMessage = React.useCallback(({ message, handler }) => {
-        const jwt = getAuthToken.getAuthToken();
-        if (!jwt && fakeSignerRef.current === 'enabled') {
-            fakeSignerRef.current = 'disabled';
+        if (!shouldConfirmAction()) {
             return handler(message);
         }
         return openSignMessage((resolve, reject) => (jsxRuntime.jsx(SignMessageConfirmationModal.SignMessageConfirmationModal, { appLogoUrl: appLogoUrl, appName: appName, appOrigin: getAppOrigin(), message: message, handler: handler, onSignMessage: resolve, onReject: reject })));
-    }, [appLogoUrl, appName, getAppOrigin, openSignMessage]);
+    }, [appLogoUrl, appName, getAppOrigin, openSignMessage, shouldConfirmAction]);
     const sendTransaction = React.useCallback(({ transaction, handler, provider }) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
-        return openSendTransaction((resolve, reject) => (jsxRuntime.jsx(TransactionConfirmationModal.TransactionConfirmationModal, { title: 'Send Transaction', appLogoUrl: appLogoUrl, appName: appName, appOrigin: getAppOrigin(), transaction: transaction, handler: handler, onTransactionResponseSuccess: resolve, onReject: reject, provider: provider })));
-    }), [appLogoUrl, appName, getAppOrigin, openSendTransaction]);
-    const enableInternalSign = React.useCallback(() => {
-        fakeSignerRef.current = 'enabled';
+        if (!shouldConfirmAction()) {
+            return handler(transaction);
+        }
+        return openSendTransaction((resolve, reject) => (jsxRuntime.jsx(TransactionConfirmationModal.TransactionConfirmationModal, { title: 'Send Transaction', transaction: transaction, handler: handler, onTransactionResponseSuccess: resolve, onReject: reject, provider: provider })));
+    }), [openSendTransaction, shouldConfirmAction]);
+    const disabledConfirmationOnce = React.useCallback(() => {
+        confirmationStateRef.current = 'disabled';
     }, []);
     const walletUiUtils = React.useMemo(() => ({
-        enableInternalSign,
+        disabledConfirmationOnce,
         sendTransaction,
         signMessage,
-    }), [signMessage, enableInternalSign, sendTransaction]);
+    }), [signMessage, disabledConfirmationOnce, sendTransaction]);
     return React.useMemo(() => [modal || sendTransactionModal, walletUiUtils], [modal, sendTransactionModal, walletUiUtils]);
 };
 

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

@@ -4,40 +4,42 @@ import { useRef, useCallback, useMemo } from 'react';
 import { SignMessageConfirmationModal } from '../../../modals/SignMessageConfirmationModal/SignMessageConfirmationModal.js';
 import { TransactionConfirmationModal } from '../../../modals/TransactionConfirmationModal/TransactionConfirmationModal.js';
 import { useConfirmationModal } from '../useConfirmationModal/useConfirmationModal.js';
-import '../../constants/colors.js';
-import '@dynamic-labs/multi-wallet';
-import '@dynamic-labs/utils';
-import { getAuthToken } from '../../functions/getAuthToken/getAuthToken.js';
-import '@dynamic-labs/wallet-connector-core';
-import '@dynamic-labs/sdk-api';
 
 const useWalletUiUtils = ({ appLogoUrl, appName, getAppOrigin, }) => {
-    const fakeSignerRef = useRef('disabled');
+    const confirmationStateRef = useRef('enabled');
     const { modal: sendTransactionModal, open: openSendTransaction } = useConfirmationModal({
         elementId: 'dynamic-send-transaction',
     });
     const { modal, open: openSignMessage } = useConfirmationModal({
         elementId: 'dynamic-sign-message',
     });
+    const shouldConfirmAction = useCallback(() => {
+        if (confirmationStateRef.current === 'disabled') {
+            confirmationStateRef.current = 'enabled';
+            return false;
+        }
+        return true;
+    }, [confirmationStateRef]);
     const signMessage = useCallback(({ message, handler }) => {
-        const jwt = getAuthToken();
-        if (!jwt && fakeSignerRef.current === 'enabled') {
-            fakeSignerRef.current = 'disabled';
+        if (!shouldConfirmAction()) {
             return handler(message);
         }
         return openSignMessage((resolve, reject) => (jsx(SignMessageConfirmationModal, { appLogoUrl: appLogoUrl, appName: appName, appOrigin: getAppOrigin(), message: message, handler: handler, onSignMessage: resolve, onReject: reject })));
-    }, [appLogoUrl, appName, getAppOrigin, openSignMessage]);
+    }, [appLogoUrl, appName, getAppOrigin, openSignMessage, shouldConfirmAction]);
     const sendTransaction = useCallback(({ transaction, handler, provider }) => __awaiter(void 0, void 0, void 0, function* () {
-        return openSendTransaction((resolve, reject) => (jsx(TransactionConfirmationModal, { title: 'Send Transaction', appLogoUrl: appLogoUrl, appName: appName, appOrigin: getAppOrigin(), transaction: transaction, handler: handler, onTransactionResponseSuccess: resolve, onReject: reject, provider: provider })));
-    }), [appLogoUrl, appName, getAppOrigin, openSendTransaction]);
-    const enableInternalSign = useCallback(() => {
-        fakeSignerRef.current = 'enabled';
+        if (!shouldConfirmAction()) {
+            return handler(transaction);
+        }
+        return openSendTransaction((resolve, reject) => (jsx(TransactionConfirmationModal, { title: 'Send Transaction', transaction: transaction, handler: handler, onTransactionResponseSuccess: resolve, onReject: reject, provider: provider })));
+    }), [openSendTransaction, shouldConfirmAction]);
+    const disabledConfirmationOnce = useCallback(() => {
+        confirmationStateRef.current = 'disabled';
     }, []);
     const walletUiUtils = useMemo(() => ({
-        enableInternalSign,
+        disabledConfirmationOnce,
         sendTransaction,
         signMessage,
-    }), [signMessage, enableInternalSign, sendTransaction]);
+    }), [signMessage, disabledConfirmationOnce, sendTransaction]);
     return useMemo(() => [modal || sendTransactionModal, walletUiUtils], [modal, sendTransactionModal, walletUiUtils]);
 };