@dynamic-labs/sdk-react-core 0.18.0-RC.6 → 0.18.0-RC.8

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

@@ -0,0 +1,35 @@
+import { useState, useRef, useEffect } from 'react';
+
+const useCountdown = ({ callback, seconds }) => {
+    const [remainingSeconds, setRemainingSeconds] = useState(seconds);
+    const timeoutRef = useRef();
+    const startCountdown = () => {
+        if (timeoutRef.current) {
+            return setRemainingSeconds(seconds);
+        }
+        runCountdown();
+    };
+    const stopCountdown = () => {
+        clearTimeout(timeoutRef.current);
+        timeoutRef.current = undefined;
+    };
+    const runCountdown = () => {
+        timeoutRef.current = setTimeout(() => {
+            setRemainingSeconds((prevSeconds) => prevSeconds - 1);
+        }, 1000);
+    };
+    useEffect(() => {
+        if (!timeoutRef.current)
+            return;
+        if (remainingSeconds <= 0) {
+            if (callback)
+                callback();
+            return;
+        }
+        runCountdown();
+        return () => clearTimeout(timeoutRef.current);
+    }, [remainingSeconds, callback]);
+    return { remainingSeconds, startCountdown, stopCountdown };
+};
+
+export { useCountdown };

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

@@ -0,0 +1 @@
+export declare const useInterval: (callback: () => void, delay: number | null) => void;

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

@@ -0,0 +1,10 @@
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+var React = require('react');
+
+// https://usehooks-ts.com/react-hook/use-isomorphic-layout-effect
+const useIsomorphicLayoutEffect = typeof window !== 'undefined' ? React.useLayoutEffect : React.useEffect;
+
+exports.useIsomorphicLayoutEffect = useIsomorphicLayoutEffect;

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

@@ -0,0 +1,2 @@
+import { useLayoutEffect } from 'react';
+export declare const useIsomorphicLayoutEffect: typeof useLayoutEffect;

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

@@ -0,0 +1,6 @@
+import { useLayoutEffect, useEffect } from 'react';
+
+// https://usehooks-ts.com/react-hook/use-isomorphic-layout-effect
+const useIsomorphicLayoutEffect = typeof window !== 'undefined' ? useLayoutEffect : useEffect;
+
+export { useIsomorphicLayoutEffect };

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

@@ -5,19 +5,17 @@ Object.defineProperty(exports, '__esModule', { value: true });
 var React = require('react');
 
 const useKeyboardEventListener = ({ disabled, inputKey, onKeyPressed, }) => {
-    const handleKeydown = React.useCallback((evt) => {
-        if (disabled)
-            return;
-        if (evt.key === inputKey) {
-            onKeyPressed();
-        }
-    }, [disabled, inputKey, onKeyPressed]);
     React.useEffect(() => {
+        const handleKeydown = (evt) => {
+            if (disabled || evt.key !== inputKey)
+                return;
+            onKeyPressed();
+        };
         document.addEventListener('keydown', handleKeydown);
         return () => {
             document.removeEventListener('keydown', handleKeydown);
         };
-    }, [handleKeydown]);
+    }, [disabled, inputKey, onKeyPressed]);
 };
 
 exports.useKeyboardEventListener = useKeyboardEventListener;

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

@@ -1,19 +1,17 @@
-import { useCallback, useEffect } from 'react';
+import { useEffect } from 'react';
 
 const useKeyboardEventListener = ({ disabled, inputKey, onKeyPressed, }) => {
-    const handleKeydown = useCallback((evt) => {
-        if (disabled)
-            return;
-        if (evt.key === inputKey) {
-            onKeyPressed();
-        }
-    }, [disabled, inputKey, onKeyPressed]);
     useEffect(() => {
+        const handleKeydown = (evt) => {
+            if (disabled || evt.key !== inputKey)
+                return;
+            onKeyPressed();
+        };
         document.addEventListener('keydown', handleKeydown);
         return () => {
             document.removeEventListener('keydown', handleKeydown);
         };
-    }, [handleKeydown]);
+    }, [disabled, inputKey, onKeyPressed]);
 };
 
 export { useKeyboardEventListener };

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

@@ -18,45 +18,23 @@ require('ethers');
 require('../../../shared/consts/index.cjs');
 
 const useRpcProviders = ({ networkConfigurations, }) => {
-    const [providers, setProviders] = React.useState();
-    const [evmDefaultProvider, setEvmDefaultProvider] = React.useState();
-    const [solanaDefaultProvider, setSolanaDefaultProvider] = React.useState();
-    React.useEffect(() => {
+    let providers, evmDefaultProvider, solanaDefaultProvider;
+    if (networkConfigurations) {
         try {
-            if (networkConfigurations) {
-                setProviders(rpcProviders.ChainRpcProviders.getProviders(networkConfigurations));
-            }
+            providers = rpcProviders.ChainRpcProviders.getProviders(networkConfigurations);
+            evmDefaultProvider = rpcProviders.ChainRpcProviders.getEvmProviderByChainId(networkConfigurations, 1);
+            solanaDefaultProvider = rpcProviders.ChainRpcProviders.getSolanaRpcProviderByChainId(networkConfigurations, '101');
         }
         catch (error) {
             logger.logger.error(error);
         }
-    }, [networkConfigurations]);
+    }
     const getEvmRpcProviderByChainId = React.useCallback((chainId) => {
         if (!networkConfigurations) {
             return undefined;
         }
         return rpcProviders.ChainRpcProviders.getEvmProviderByChainId(networkConfigurations, chainId);
     }, [networkConfigurations]);
-    React.useEffect(() => {
-        try {
-            if (networkConfigurations) {
-                setEvmDefaultProvider(rpcProviders.ChainRpcProviders.getEvmProviderByChainId(networkConfigurations, 1));
-            }
-        }
-        catch (error) {
-            logger.logger.error(error);
-        }
-    }, [networkConfigurations]);
-    React.useEffect(() => {
-        try {
-            if (networkConfigurations) {
-                setSolanaDefaultProvider(rpcProviders.ChainRpcProviders.getSolanaRpcProviderByChainId(networkConfigurations, '101'));
-            }
-        }
-        catch (error) {
-            logger.logger.error(error);
-        }
-    }, [networkConfigurations]);
     return {
         evmDefaultProvider,
         evmProviders: providers === null || providers === void 0 ? void 0 : providers.evm,

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

@@ -2,7 +2,6 @@ import { NetworkConfigurationMap } from '@dynamic-labs/types';
 import { DynamicRPCProviders } from '../../../shared';
 type Props = {
     networkConfigurations: NetworkConfigurationMap | undefined;
-    networkId: string | number | undefined;
 };
 export declare const useRpcProviders: ({ networkConfigurations, }: Props) => DynamicRPCProviders;
 export {};

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

@@ -1,4 +1,4 @@
-import { useState, useEffect, useCallback } from 'react';
+import { useCallback } from 'react';
 import { ChainRpcProviders } from '@dynamic-labs/rpc-providers';
 import '@dynamic-labs/sdk-api';
 import { logger } from '../../../shared/logger.js';
@@ -14,45 +14,23 @@ import 'ethers';
 import '../../../shared/consts/index.js';
 
 const useRpcProviders = ({ networkConfigurations, }) => {
-    const [providers, setProviders] = useState();
-    const [evmDefaultProvider, setEvmDefaultProvider] = useState();
-    const [solanaDefaultProvider, setSolanaDefaultProvider] = useState();
-    useEffect(() => {
+    let providers, evmDefaultProvider, solanaDefaultProvider;
+    if (networkConfigurations) {
         try {
-            if (networkConfigurations) {
-                setProviders(ChainRpcProviders.getProviders(networkConfigurations));
-            }
+            providers = ChainRpcProviders.getProviders(networkConfigurations);
+            evmDefaultProvider = ChainRpcProviders.getEvmProviderByChainId(networkConfigurations, 1);
+            solanaDefaultProvider = ChainRpcProviders.getSolanaRpcProviderByChainId(networkConfigurations, '101');
         }
         catch (error) {
             logger.error(error);
         }
-    }, [networkConfigurations]);
+    }
     const getEvmRpcProviderByChainId = useCallback((chainId) => {
         if (!networkConfigurations) {
             return undefined;
         }
         return ChainRpcProviders.getEvmProviderByChainId(networkConfigurations, chainId);
     }, [networkConfigurations]);
-    useEffect(() => {
-        try {
-            if (networkConfigurations) {
-                setEvmDefaultProvider(ChainRpcProviders.getEvmProviderByChainId(networkConfigurations, 1));
-            }
-        }
-        catch (error) {
-            logger.error(error);
-        }
-    }, [networkConfigurations]);
-    useEffect(() => {
-        try {
-            if (networkConfigurations) {
-                setSolanaDefaultProvider(ChainRpcProviders.getSolanaRpcProviderByChainId(networkConfigurations, '101'));
-            }
-        }
-        catch (error) {
-            logger.error(error);
-        }
-    }, [networkConfigurations]);
     return {
         evmDefaultProvider,
         evmProviders: providers === null || providers === void 0 ? void 0 : providers.evm,

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

@@ -0,0 +1,27 @@
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+var React = require('react');
+var useIsomorphicLayoutEffect = require('../useIsomorphicLayoutEffect/useIsomorphicLayoutEffect.cjs');
+
+// https://usehooks-ts.com/react-hook/use-timeout
+const useTimeout = (callback, delay) => {
+    const savedCallback = React.useRef(callback);
+    // Remember the latest callback if it changes.
+    useIsomorphicLayoutEffect.useIsomorphicLayoutEffect(() => {
+        savedCallback.current = callback;
+    }, [callback]);
+    // Set up the timeout.
+    React.useEffect(() => {
+        // Don't schedule if no delay is specified.
+        // Note: 0 is a valid value for delay.
+        if (!delay && delay !== 0) {
+            return;
+        }
+        const id = setTimeout(() => savedCallback.current(), delay);
+        return () => clearTimeout(id);
+    }, [delay]);
+};
+
+exports.useTimeout = useTimeout;

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

@@ -0,0 +1 @@
+export declare const useTimeout: (callback: () => void, delay: number | null) => void;

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

@@ -0,0 +1,23 @@
+import { useRef, useEffect } from 'react';
+import { useIsomorphicLayoutEffect } from '../useIsomorphicLayoutEffect/useIsomorphicLayoutEffect.js';
+
+// https://usehooks-ts.com/react-hook/use-timeout
+const useTimeout = (callback, delay) => {
+    const savedCallback = useRef(callback);
+    // Remember the latest callback if it changes.
+    useIsomorphicLayoutEffect(() => {
+        savedCallback.current = callback;
+    }, [callback]);
+    // Set up the timeout.
+    useEffect(() => {
+        // Don't schedule if no delay is specified.
+        // Note: 0 is a valid value for delay.
+        if (!delay && delay !== 0) {
+            return;
+        }
+        const id = setTimeout(() => savedCallback.current(), delay);
+        return () => clearTimeout(id);
+    }, [delay]);
+};
+
+export { useTimeout };

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

@@ -10,22 +10,22 @@ var useTransitionEvents = require('../useTransitionEvents/useTransitionEvents.cj
 const DEFAULT_DURATION = 100;
 // The hook inspired by https://github.com/reactjs/react-transition-group/blob/master/src/Transition.js
 const useTransition = (_a) => {
-    var { isShown, inDuration, outDuration, duration = DEFAULT_DURATION, timeout, inTimeout, outTimeout, animateOnMount = true } = _a, events = _tslib.__rest(_a, ["isShown", "inDuration", "outDuration", "duration", "timeout", "inTimeout", "outTimeout", "animateOnMount"]);
-    const initialState = animateOnMount ? 'UNMOUNT' : 'ENTERED';
+    var { isShown, inDuration, outDuration, duration = DEFAULT_DURATION, delay, inDelay, outDelay, animateOnMount = true } = _a, events = _tslib.__rest(_a, ["isShown", "inDuration", "outDuration", "duration", "delay", "inDelay", "outDelay", "animateOnMount"]);
+    const initialStage = animateOnMount ? 'UNMOUNT' : 'ENTERED';
     const animationFrameTimeoutIdRef = React.useRef({ id: -1 });
     const timeoutIdRef = React.useRef({ id: -1 });
-    const [stage, setStage] = React.useState(initialState);
+    const [stage, setStage] = React.useState(initialStage);
     const [mount, setMount] = React.useState(!animateOnMount);
     const [currentDuration, setCurrentDuration] = React.useState(duration);
-    const conditionTimeout = (callback, timeout) => {
-        if (timeout) {
-            timeoutIdRef.current = animationFrameTimeout.animationFrameTimeout(callback, timeout);
+    const performTransition = (runTransition, transitionDelay) => {
+        if (transitionDelay) {
+            timeoutIdRef.current = animationFrameTimeout.animationFrameTimeout(runTransition, transitionDelay);
         }
         else {
-            callback();
+            runTransition();
         }
     };
-    const performEnter = React.useCallback(() => _tslib.__awaiter(void 0, void 0, void 0, function* () {
+    const performEnter = React.useCallback(() => {
         const animationDuration = inDuration || duration;
         setCurrentDuration(animationDuration);
         setMount(true);
@@ -33,8 +33,8 @@ const useTransition = (_a) => {
         animationFrameTimeoutIdRef.current = animationFrameTimeout.animationFrameTimeout(() => {
             setStage('ENTERED');
         }, animationDuration);
-    }), [duration, inDuration]);
-    const performExit = React.useCallback(() => _tslib.__awaiter(void 0, void 0, void 0, function* () {
+    }, [duration, inDuration]);
+    const performExit = React.useCallback(() => {
         const animationDuration = outDuration || duration;
         setCurrentDuration(animationDuration);
         setStage('EXITING');
@@ -42,29 +42,21 @@ const useTransition = (_a) => {
             setMount(false);
             setStage('UNMOUNT');
         }, animationDuration);
-    }), [duration, outDuration]);
+    }, [duration, outDuration]);
     React.useEffect(() => {
         if (isShown && stage !== 'ENTERED') {
-            const enterTimeout = timeout || inTimeout;
-            conditionTimeout(performEnter, enterTimeout);
+            const enterDelay = inDelay || delay;
+            performTransition(performEnter, enterDelay);
         }
         else if (!isShown && stage !== 'UNMOUNT') {
-            const exitTimeout = timeout || outTimeout;
-            conditionTimeout(performExit, exitTimeout);
+            const exitDelay = outDelay || delay;
+            performTransition(performExit, exitDelay);
         }
         return () => {
             animationFrameTimeout.clearAnimationFrameTimeout(animationFrameTimeoutIdRef.current);
             animationFrameTimeout.clearAnimationFrameTimeout(timeoutIdRef.current);
         };
-    }, [
-        inTimeout,
-        outTimeout,
-        performEnter,
-        performExit,
-        isShown,
-        timeout,
-        stage,
-    ]);
+    }, [inDelay, outDelay, performEnter, performExit, isShown, delay, stage]);
     useTransitionEvents.useTransitionEvents(stage, events);
     return { currentDuration, mount, stage };
 };

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

@@ -8,11 +8,11 @@ export type UseTransitionProps = {
     animateOnMount?: boolean;
     duration?: number;
     inDuration?: number;
-    inTimeout?: number;
+    inDelay?: number;
     isShown?: boolean;
     outDuration?: number;
-    outTimeout?: number;
-    timeout?: number;
+    outDelay?: number;
+    delay?: number;
 };
 export type Props = UseTransitionProps & UseTransitionEvents;
 export type TransitionStage = 'ENTERED' | 'ENTERING' | 'EXITING' | 'UNMOUNT';

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

@@ -1,4 +1,4 @@
-import { __rest, __awaiter } from '../../../../../_virtual/_tslib.js';
+import { __rest } from '../../../../../_virtual/_tslib.js';
 import { useRef, useState, useCallback, useEffect } from 'react';
 import { animationFrameTimeout, clearAnimationFrameTimeout } from '../../functions/animationFrameTimeout/animationFrameTimeout.js';
 import { useTransitionEvents } from '../useTransitionEvents/useTransitionEvents.js';
@@ -6,22 +6,22 @@ import { useTransitionEvents } from '../useTransitionEvents/useTransitionEvents.
 const DEFAULT_DURATION = 100;
 // The hook inspired by https://github.com/reactjs/react-transition-group/blob/master/src/Transition.js
 const useTransition = (_a) => {
-    var { isShown, inDuration, outDuration, duration = DEFAULT_DURATION, timeout, inTimeout, outTimeout, animateOnMount = true } = _a, events = __rest(_a, ["isShown", "inDuration", "outDuration", "duration", "timeout", "inTimeout", "outTimeout", "animateOnMount"]);
-    const initialState = animateOnMount ? 'UNMOUNT' : 'ENTERED';
+    var { isShown, inDuration, outDuration, duration = DEFAULT_DURATION, delay, inDelay, outDelay, animateOnMount = true } = _a, events = __rest(_a, ["isShown", "inDuration", "outDuration", "duration", "delay", "inDelay", "outDelay", "animateOnMount"]);
+    const initialStage = animateOnMount ? 'UNMOUNT' : 'ENTERED';
     const animationFrameTimeoutIdRef = useRef({ id: -1 });
     const timeoutIdRef = useRef({ id: -1 });
-    const [stage, setStage] = useState(initialState);
+    const [stage, setStage] = useState(initialStage);
     const [mount, setMount] = useState(!animateOnMount);
     const [currentDuration, setCurrentDuration] = useState(duration);
-    const conditionTimeout = (callback, timeout) => {
-        if (timeout) {
-            timeoutIdRef.current = animationFrameTimeout(callback, timeout);
+    const performTransition = (runTransition, transitionDelay) => {
+        if (transitionDelay) {
+            timeoutIdRef.current = animationFrameTimeout(runTransition, transitionDelay);
         }
         else {
-            callback();
+            runTransition();
         }
     };
-    const performEnter = useCallback(() => __awaiter(void 0, void 0, void 0, function* () {
+    const performEnter = useCallback(() => {
         const animationDuration = inDuration || duration;
         setCurrentDuration(animationDuration);
         setMount(true);
@@ -29,8 +29,8 @@ const useTransition = (_a) => {
         animationFrameTimeoutIdRef.current = animationFrameTimeout(() => {
             setStage('ENTERED');
         }, animationDuration);
-    }), [duration, inDuration]);
-    const performExit = useCallback(() => __awaiter(void 0, void 0, void 0, function* () {
+    }, [duration, inDuration]);
+    const performExit = useCallback(() => {
         const animationDuration = outDuration || duration;
         setCurrentDuration(animationDuration);
         setStage('EXITING');
@@ -38,29 +38,21 @@ const useTransition = (_a) => {
             setMount(false);
             setStage('UNMOUNT');
         }, animationDuration);
-    }), [duration, outDuration]);
+    }, [duration, outDuration]);
     useEffect(() => {
         if (isShown && stage !== 'ENTERED') {
-            const enterTimeout = timeout || inTimeout;
-            conditionTimeout(performEnter, enterTimeout);
+            const enterDelay = inDelay || delay;
+            performTransition(performEnter, enterDelay);
         }
         else if (!isShown && stage !== 'UNMOUNT') {
-            const exitTimeout = timeout || outTimeout;
-            conditionTimeout(performExit, exitTimeout);
+            const exitDelay = outDelay || delay;
+            performTransition(performExit, exitDelay);
         }
         return () => {
             clearAnimationFrameTimeout(animationFrameTimeoutIdRef.current);
             clearAnimationFrameTimeout(timeoutIdRef.current);
         };
-    }, [
-        inTimeout,
-        outTimeout,
-        performEnter,
-        performExit,
-        isShown,
-        timeout,
-        stage,
-    ]);
+    }, [inDelay, outDelay, performEnter, performExit, isShown, delay, stage]);
     useTransitionEvents(stage, events);
     return { currentDuration, mount, stage };
 };

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

@@ -4,21 +4,23 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var useUpdateEffect = require('../useUpdateEffect/useUpdateEffect.cjs');
 
-const useTransitionEvents = (stage, events) => useUpdateEffect.useUpdateEffect(() => {
-    var _a;
+const useTransitionEvents = (stage, events) => {
     const mapCallbackToStage = {
         ENTERED: events === null || events === void 0 ? void 0 : events.onEntered,
         ENTERING: events === null || events === void 0 ? void 0 : events.onEntering,
         EXITING: events === null || events === void 0 ? void 0 : events.onExiting,
         UNMOUNT: events === null || events === void 0 ? void 0 : events.onUnmount,
     };
-    (_a = mapCallbackToStage[stage]) === null || _a === void 0 ? void 0 : _a.call(mapCallbackToStage);
-    return () => {
+    return useUpdateEffect.useUpdateEffect(() => {
         var _a;
-        if (stage === 'EXITING') {
-            (_a = mapCallbackToStage.UNMOUNT) === null || _a === void 0 ? void 0 : _a.call(mapCallbackToStage);
-        }
-    };
-}, [stage]);
+        (_a = mapCallbackToStage[stage]) === null || _a === void 0 ? void 0 : _a.call(mapCallbackToStage);
+        return () => {
+            var _a;
+            if (stage === 'EXITING') {
+                (_a = mapCallbackToStage.UNMOUNT) === null || _a === void 0 ? void 0 : _a.call(mapCallbackToStage);
+            }
+        };
+    }, [stage]);
+};
 
 exports.useTransitionEvents = useTransitionEvents;

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

@@ -1,20 +1,22 @@
 import { useUpdateEffect } from '../useUpdateEffect/useUpdateEffect.js';
 
-const useTransitionEvents = (stage, events) => useUpdateEffect(() => {
-    var _a;
+const useTransitionEvents = (stage, events) => {
     const mapCallbackToStage = {
         ENTERED: events === null || events === void 0 ? void 0 : events.onEntered,
         ENTERING: events === null || events === void 0 ? void 0 : events.onEntering,
         EXITING: events === null || events === void 0 ? void 0 : events.onExiting,
         UNMOUNT: events === null || events === void 0 ? void 0 : events.onUnmount,
     };
-    (_a = mapCallbackToStage[stage]) === null || _a === void 0 ? void 0 : _a.call(mapCallbackToStage);
-    return () => {
+    return useUpdateEffect(() => {
         var _a;
-        if (stage === 'EXITING') {
-            (_a = mapCallbackToStage.UNMOUNT) === null || _a === void 0 ? void 0 : _a.call(mapCallbackToStage);
-        }
-    };
-}, [stage]);
+        (_a = mapCallbackToStage[stage]) === null || _a === void 0 ? void 0 : _a.call(mapCallbackToStage);
+        return () => {
+            var _a;
+            if (stage === 'EXITING') {
+                (_a = mapCallbackToStage.UNMOUNT) === null || _a === void 0 ? void 0 : _a.call(mapCallbackToStage);
+            }
+        };
+    }, [stage]);
+};
 
 export { useTransitionEvents };

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

@@ -38,7 +38,7 @@ const useVerifyWallet = ({ consumeNonce, displayTermsOfService, environmentId, p
     const { setDeniedAddress, setDeniedOauthProvider } = AccessDeniedContext.useAccessDeniedContext();
     const { setView, goToInitialView } = ViewContext.useViewContext();
     const { setErrorMessage, setError } = ErrorContext.useErrorContext();
-    const { setUser, multiWalletWidgetState, debugError, multiWallet: multiWalletEnabled, appName, primaryWalletId, setCallback, setShowAuthFlow, setPrimaryWalletId, siweStatement, connectedWallet, authMode, setOnboardingOnlyJwt, authToken, } = useInternalDynamicContext.useInternalDynamicContext();
+    const { setUser, multiWalletWidgetState, debugError, multiWallet: multiWalletEnabled, appName, primaryWalletId, setCallback, setShowAuthFlow, setPrimaryWalletId, siweStatement, connectedWallet, authMode, setOnboardingOnlyJwt, authToken, setAuthMode, removeConnectedWalletsInfo, setConnectedWallets, } = useInternalDynamicContext.useInternalDynamicContext();
     // If the user is not already logged it means that we only need to verify
     // We need this boolean for the part of the logic where we already persisted a new authToken,
     // and need to distinguish between logic for verify or linking.
@@ -91,6 +91,8 @@ const useVerifyWallet = ({ consumeNonce, displayTermsOfService, environmentId, p
         }
     };
     const handleError = (e, walletConnector, address, oauth) => {
+        removeConnectedWalletsInfo();
+        setConnectedWallets([]);
         // This is a special case where the user is trying to link a wallet
         // and the wallet is already linked and we don't want to kill the session.
         if (e instanceof utils.WalletUsedError) {
@@ -144,6 +146,7 @@ const useVerifyWallet = ({ consumeNonce, displayTermsOfService, environmentId, p
             const isKycRequired = decodedJwt.missingFields.length;
             setOnboardingOnlyJwt(Jwt);
             localStorage.LocalStorage.setToLS(localStorage$1.LAST_USED_WALLET, walletConnector.name);
+            setAuthMode('connect-and-sign');
             updatePrimaryWalletId(walletConnector, user);
             // Routes user to "Not Supported Network" screen if the user is not on the supported network
             if (projectSettings &&

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

@@ -34,7 +34,7 @@ const useVerifyWallet = ({ consumeNonce, displayTermsOfService, environmentId, p
     const { setDeniedAddress, setDeniedOauthProvider } = useAccessDeniedContext();
     const { setView, goToInitialView } = useViewContext();
     const { setErrorMessage, setError } = useErrorContext();
-    const { setUser, multiWalletWidgetState, debugError, multiWallet: multiWalletEnabled, appName, primaryWalletId, setCallback, setShowAuthFlow, setPrimaryWalletId, siweStatement, connectedWallet, authMode, setOnboardingOnlyJwt, authToken, } = useInternalDynamicContext();
+    const { setUser, multiWalletWidgetState, debugError, multiWallet: multiWalletEnabled, appName, primaryWalletId, setCallback, setShowAuthFlow, setPrimaryWalletId, siweStatement, connectedWallet, authMode, setOnboardingOnlyJwt, authToken, setAuthMode, removeConnectedWalletsInfo, setConnectedWallets, } = useInternalDynamicContext();
     // If the user is not already logged it means that we only need to verify
     // We need this boolean for the part of the logic where we already persisted a new authToken,
     // and need to distinguish between logic for verify or linking.
@@ -87,6 +87,8 @@ const useVerifyWallet = ({ consumeNonce, displayTermsOfService, environmentId, p
         }
     };
     const handleError = (e, walletConnector, address, oauth) => {
+        removeConnectedWalletsInfo();
+        setConnectedWallets([]);
         // This is a special case where the user is trying to link a wallet
         // and the wallet is already linked and we don't want to kill the session.
         if (e instanceof WalletUsedError) {
@@ -140,6 +142,7 @@ const useVerifyWallet = ({ consumeNonce, displayTermsOfService, environmentId, p
             const isKycRequired = decodedJwt.missingFields.length;
             setOnboardingOnlyJwt(Jwt);
             LocalStorage.setToLS(LAST_USED_WALLET, walletConnector.name);
+            setAuthMode('connect-and-sign');
             updatePrimaryWalletId(walletConnector, user);
             // Routes user to "Not Supported Network" screen if the user is not on the supported network
             if (projectSettings &&

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

@@ -62,6 +62,7 @@ const useWalletEventListeners = ({ computeConnectedStateForWallets, handleLogOut
         // eslint-disable-next-line react-hooks/exhaustive-deps
         orderedSecondaryWalletAddresses(secondaryWallets).join(),
         selectedWalletConnector === null || selectedWalletConnector === void 0 ? void 0 : selectedWalletConnector.name,
+        primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.connector.isInitialized,
     ]);
     const handleAccountChangeWhenAwaitingAccountSwitch = React.useCallback((isPrimaryWallet, newAddress) => {
         const linkedSecondaryWallet = secondaryWallets.find((wallet) => walletConnectorCore.isSameAddress(wallet.address, newAddress, wallet.chain));

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

@@ -58,6 +58,7 @@ const useWalletEventListeners = ({ computeConnectedStateForWallets, handleLogOut
         // eslint-disable-next-line react-hooks/exhaustive-deps
         orderedSecondaryWalletAddresses(secondaryWallets).join(),
         selectedWalletConnector === null || selectedWalletConnector === void 0 ? void 0 : selectedWalletConnector.name,
+        primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.connector.isInitialized,
     ]);
     const handleAccountChangeWhenAwaitingAccountSwitch = useCallback((isPrimaryWallet, newAddress) => {
         const linkedSecondaryWallet = secondaryWallets.find((wallet) => isSameAddress(wallet.address, newAddress, wallet.chain));

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

@@ -5,7 +5,7 @@ Object.defineProperty(exports, '__esModule', { value: true });
 var React = require('react');
 var data = require('../../../views/WalletList/data.cjs');
 
-const useWallets = ({ projectSettings, appLogoUrl, appName, flowNetwork, networkConfigurations, walletBook, walletUiUtils, walletConnectorsProp, }) => {
+const useWallets = ({ projectSettings, appLogoUrl, appName, flowNetwork, networkConfigurations, walletBook, walletConnectV1Bridge, walletUiUtils, walletConnectorsProp, }) => {
     const wallets = React.useMemo(() => {
         if (!projectSettings || !Object.keys(walletBook !== null && walletBook !== void 0 ? walletBook : {}).length)
             return [];
@@ -17,6 +17,7 @@ const useWallets = ({ projectSettings, appLogoUrl, appName, flowNetwork, network
             networkConfigurations,
             skipMemo: true,
             walletBook,
+            walletConnectV1Bridge,
             walletConnectorsProp: walletConnectorsProp !== null && walletConnectorsProp !== void 0 ? walletConnectorsProp : [],
             walletUiUtils,
         });
@@ -28,6 +29,7 @@ const useWallets = ({ projectSettings, appLogoUrl, appName, flowNetwork, network
             networkConfigurations,
             skipMemo: true,
             walletBook,
+            walletConnectV1Bridge,
             walletConnectorsProp: walletConnectorsProp !== null && walletConnectorsProp !== void 0 ? walletConnectorsProp : [],
             walletUiUtils,
         });
@@ -39,6 +41,7 @@ const useWallets = ({ projectSettings, appLogoUrl, appName, flowNetwork, network
         networkConfigurations,
         projectSettings,
         walletConnectorsProp,
+        walletConnectV1Bridge,
         flowNetwork,
         Object.keys(walletBook !== null && walletBook !== void 0 ? walletBook : {}).length,
     ]);