@dynamic-labs/sdk-react-core 0.18.0-RC.7 → 0.18.0-RC.9

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.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/useValidateSession/index.d.ts

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

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

@@ -0,0 +1,79 @@
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+var _tslib = require('../../../../../_virtual/_tslib.cjs');
+var React = require('react');
+require('@dynamic-labs/sdk-api');
+var logger = require('../../../shared/logger.cjs');
+require('@dynamic-labs/iconic');
+require('@dynamic-labs/wallet-connector-core');
+require('react/jsx-runtime');
+require('../../../context/ViewContext/ViewContext.cjs');
+require('@dynamic-labs/wallet-book');
+require('@dynamic-labs/utils');
+require('../../constants/colors.cjs');
+var localStorage = require('../../../shared/utils/classes/storage/localStorage.cjs');
+require('ethers');
+require('../../../shared/consts/index.cjs');
+
+const useValidateSession = ({ handleLogOut, user, authToken, walletConnectV1Bridge, walletConnectors, wcVersion, }) => {
+    const [hasLoggedOut, setHasLoggedOut] = React.useState(false);
+    if (hasLoggedOut) {
+        return;
+    }
+    const logout = (reason, params) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
+        setHasLoggedOut(true);
+        logger.logger.debug(`Logging out - Reason: ${reason}`, Object.assign({}, params));
+        yield handleLogOut();
+    });
+    const handleUserDataOutOfSync = () => _tslib.__awaiter(void 0, void 0, void 0, function* () {
+        if (authToken || !user) {
+            return;
+        }
+        yield logout('user data out of sync', {
+            authToken,
+            user,
+        });
+    });
+    const handleConnectorBridgeOutOfSync = () => _tslib.__awaiter(void 0, void 0, void 0, function* () {
+        let currentWalletConnectV1Bridge;
+        if (walletConnectors) {
+            for (const connector of walletConnectors) {
+                const session = yield connector.getSession();
+                const bridge = session && (session === null || session === void 0 ? void 0 : session.bridge);
+                if (bridge) {
+                    currentWalletConnectV1Bridge = bridge;
+                    break;
+                }
+            }
+        }
+        if (!walletConnectV1Bridge ||
+            !currentWalletConnectV1Bridge ||
+            walletConnectV1Bridge === currentWalletConnectV1Bridge) {
+            return;
+        }
+        yield logout('connector bridge out of sync', {
+            newBridge: walletConnectV1Bridge,
+            oldBridge: currentWalletConnectV1Bridge,
+        });
+    });
+    const hasWCV1Data = localStorage.LocalStorage.getKeys().some((key) => key.startsWith('walletconnect') || key.startsWith('walletlink'));
+    const hasWCV2Data = localStorage.LocalStorage.getKeys().some((key) => key.startsWith('wc@2'));
+    const handleConnectorVersionOutOfSync = () => _tslib.__awaiter(void 0, void 0, void 0, function* () {
+        if (!wcVersion ||
+            (wcVersion === 2 && !hasWCV1Data) ||
+            (wcVersion === 1 && !hasWCV2Data)) {
+            return;
+        }
+        yield logout('connector version out of sync', {
+            newVersion: wcVersion,
+            oldVersion: hasWCV1Data ? 1 : 2,
+        });
+    });
+    handleUserDataOutOfSync();
+    handleConnectorBridgeOutOfSync();
+    handleConnectorVersionOutOfSync();
+};
+
+exports.useValidateSession = useValidateSession;

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

@@ -0,0 +1,12 @@
+import { UserProfile } from '../../../shared';
+import { WalletConnector } from '../../../..';
+type Props = {
+    handleLogOut: () => Promise<void>;
+    user: UserProfile | undefined;
+    authToken: string | undefined;
+    walletConnectV1Bridge: string | undefined;
+    walletConnectors: WalletConnector[] | undefined;
+    wcVersion: number | undefined;
+};
+export declare const useValidateSession: ({ handleLogOut, user, authToken, walletConnectV1Bridge, walletConnectors, wcVersion, }: Props) => void;
+export {};

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

@@ -0,0 +1,75 @@
+import { __awaiter } from '../../../../../_virtual/_tslib.js';
+import { useState } from 'react';
+import '@dynamic-labs/sdk-api';
+import { logger } from '../../../shared/logger.js';
+import '@dynamic-labs/iconic';
+import '@dynamic-labs/wallet-connector-core';
+import 'react/jsx-runtime';
+import '../../../context/ViewContext/ViewContext.js';
+import '@dynamic-labs/wallet-book';
+import '@dynamic-labs/utils';
+import '../../constants/colors.js';
+import { LocalStorage } from '../../../shared/utils/classes/storage/localStorage.js';
+import 'ethers';
+import '../../../shared/consts/index.js';
+
+const useValidateSession = ({ handleLogOut, user, authToken, walletConnectV1Bridge, walletConnectors, wcVersion, }) => {
+    const [hasLoggedOut, setHasLoggedOut] = useState(false);
+    if (hasLoggedOut) {
+        return;
+    }
+    const logout = (reason, params) => __awaiter(void 0, void 0, void 0, function* () {
+        setHasLoggedOut(true);
+        logger.debug(`Logging out - Reason: ${reason}`, Object.assign({}, params));
+        yield handleLogOut();
+    });
+    const handleUserDataOutOfSync = () => __awaiter(void 0, void 0, void 0, function* () {
+        if (authToken || !user) {
+            return;
+        }
+        yield logout('user data out of sync', {
+            authToken,
+            user,
+        });
+    });
+    const handleConnectorBridgeOutOfSync = () => __awaiter(void 0, void 0, void 0, function* () {
+        let currentWalletConnectV1Bridge;
+        if (walletConnectors) {
+            for (const connector of walletConnectors) {
+                const session = yield connector.getSession();
+                const bridge = session && (session === null || session === void 0 ? void 0 : session.bridge);
+                if (bridge) {
+                    currentWalletConnectV1Bridge = bridge;
+                    break;
+                }
+            }
+        }
+        if (!walletConnectV1Bridge ||
+            !currentWalletConnectV1Bridge ||
+            walletConnectV1Bridge === currentWalletConnectV1Bridge) {
+            return;
+        }
+        yield logout('connector bridge out of sync', {
+            newBridge: walletConnectV1Bridge,
+            oldBridge: currentWalletConnectV1Bridge,
+        });
+    });
+    const hasWCV1Data = LocalStorage.getKeys().some((key) => key.startsWith('walletconnect') || key.startsWith('walletlink'));
+    const hasWCV2Data = LocalStorage.getKeys().some((key) => key.startsWith('wc@2'));
+    const handleConnectorVersionOutOfSync = () => __awaiter(void 0, void 0, void 0, function* () {
+        if (!wcVersion ||
+            (wcVersion === 2 && !hasWCV1Data) ||
+            (wcVersion === 1 && !hasWCV2Data)) {
+            return;
+        }
+        yield logout('connector version out of sync', {
+            newVersion: wcVersion,
+            oldVersion: hasWCV1Data ? 1 : 2,
+        });
+    });
+    handleUserDataOutOfSync();
+    handleConnectorBridgeOutOfSync();
+    handleConnectorVersionOutOfSync();
+};
+
+export { useValidateSession };

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

@@ -22,9 +22,7 @@ require('ethers');
 require('../../../shared/consts/index.cjs');
 var getVerifyArgs = require('../../functions/getVerifyArgs/getVerifyArgs.cjs');
 var createUserProfile = require('../../functions/createUserProfile/createUserProfile.cjs');
-var isSupportedNetwork = require('../../functions/isSupportedNetwork/isSupportedNetwork.cjs');
 require('@dynamic-labs/sdk-api');
-var isProgrammableNetworkSwitchSupported = require('../../functions/isProgrammableNetworkSwitchSupported/isProgrammableNetworkSwitchSupported.cjs');
 var useInternalDynamicContext = require('../../../context/DynamicContext/useInternalDynamicContext.cjs');
 var ErrorContext = require('../../../context/ErrorContext/ErrorContext.cjs');
 var getSiweStatement = require('../../functions/getSiweStatement/getSiweStatement.cjs');
@@ -38,7 +36,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, setAuthMode, } = useInternalDynamicContext.useInternalDynamicContext();
+    const { setUser, multiWalletWidgetState, debugError, multiWallet: multiWalletEnabled, appName, primaryWalletId, setCallback, setShowAuthFlow, setPrimaryWalletId, siweStatement, connectedWallet, authMode, setOnboardingOnlyJwt, authToken, setAuthMode, removeConnectedWalletsInfo, } = 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 +89,7 @@ const useVerifyWallet = ({ consumeNonce, displayTermsOfService, environmentId, p
         }
     };
     const handleError = (e, walletConnector, address, oauth) => {
+        removeConnectedWalletsInfo();
         // 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) {
@@ -130,11 +129,6 @@ const useVerifyWallet = ({ consumeNonce, displayTermsOfService, environmentId, p
     };
     return ({ walletConnector, fetchPublicAddressOpts, publicWalletAddress, captchaToken, oauth, }) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
         const walletProvider = getWalletProvider.getWalletProvider(walletConnector);
-        const network = yield walletConnector.getNetwork();
-        const _isSupportedNetwork = isSupportedNetwork.isSupportedNetwork({
-            network,
-            walletConnector,
-        });
         try {
             const Jwt = yield generateJWT(walletConnector, walletProvider, fetchPublicAddressOpts, publicWalletAddress, captchaToken, oauth);
             const decodedJwt = decodeJwt.decodeJwt(Jwt);
@@ -146,16 +140,6 @@ const useVerifyWallet = ({ consumeNonce, displayTermsOfService, environmentId, p
             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 &&
-                verifyOnly &&
-                !_isSupportedNetwork &&
-                !isKycRequired) {
-                if (isProgrammableNetworkSwitchSupported.isProgrammableNetworkSwitchSupported(walletConnector)) {
-                    return setView('network-not-supported');
-                }
-                return setView('network-not-supported-manual');
-            }
             // TODO: how can projectSettings be undefined?
             if (verifyOnly && projectSettings && isKycRequired) {
                 setShowAuthFlow(true);

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

@@ -18,9 +18,7 @@ import 'ethers';
 import '../../../shared/consts/index.js';
 import { getVerifyArgs } from '../../functions/getVerifyArgs/getVerifyArgs.js';
 import { createUserProfile } from '../../functions/createUserProfile/createUserProfile.js';
-import { isSupportedNetwork } from '../../functions/isSupportedNetwork/isSupportedNetwork.js';
 import '@dynamic-labs/sdk-api';
-import { isProgrammableNetworkSwitchSupported } from '../../functions/isProgrammableNetworkSwitchSupported/isProgrammableNetworkSwitchSupported.js';
 import { useInternalDynamicContext } from '../../../context/DynamicContext/useInternalDynamicContext.js';
 import { useErrorContext } from '../../../context/ErrorContext/ErrorContext.js';
 import { getSiweStatement } from '../../functions/getSiweStatement/getSiweStatement.js';
@@ -34,7 +32,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, setAuthMode, } = useInternalDynamicContext();
+    const { setUser, multiWalletWidgetState, debugError, multiWallet: multiWalletEnabled, appName, primaryWalletId, setCallback, setShowAuthFlow, setPrimaryWalletId, siweStatement, connectedWallet, authMode, setOnboardingOnlyJwt, authToken, setAuthMode, removeConnectedWalletsInfo, } = 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 +85,7 @@ const useVerifyWallet = ({ consumeNonce, displayTermsOfService, environmentId, p
         }
     };
     const handleError = (e, walletConnector, address, oauth) => {
+        removeConnectedWalletsInfo();
         // 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) {
@@ -126,11 +125,6 @@ const useVerifyWallet = ({ consumeNonce, displayTermsOfService, environmentId, p
     };
     return ({ walletConnector, fetchPublicAddressOpts, publicWalletAddress, captchaToken, oauth, }) => __awaiter(void 0, void 0, void 0, function* () {
         const walletProvider = getWalletProvider(walletConnector);
-        const network = yield walletConnector.getNetwork();
-        const _isSupportedNetwork = isSupportedNetwork({
-            network,
-            walletConnector,
-        });
         try {
             const Jwt = yield generateJWT(walletConnector, walletProvider, fetchPublicAddressOpts, publicWalletAddress, captchaToken, oauth);
             const decodedJwt = decodeJwt(Jwt);
@@ -142,16 +136,6 @@ const useVerifyWallet = ({ consumeNonce, displayTermsOfService, environmentId, p
             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 &&
-                verifyOnly &&
-                !_isSupportedNetwork &&
-                !isKycRequired) {
-                if (isProgrammableNetworkSwitchSupported(walletConnector)) {
-                    return setView('network-not-supported');
-                }
-                return setView('network-not-supported-manual');
-            }
             // TODO: how can projectSettings be undefined?
             if (verifyOnly && projectSettings && isKycRequired) {
                 setShowAuthFlow(true);

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/useWalletUiUtils/useWalletUiUtils.cjs

@@ -29,6 +29,7 @@ require('../../../components/Transition/SlideInUpTransition/SlideInUpTransition.
 require('../../../components/Transition/OpacityTransition/OpacityTransition.cjs');
 require('../../../config/ApiEndpoint.cjs');
 require('@dynamic-labs/rpc-providers');
+require('../useWallets/utils/verifyMagicIsSetup/verifyMagicIsSetup.cjs');
 require('../../../context/ErrorContext/ErrorContext.cjs');
 require('../../../context/AccessDeniedContext/AccessDeniedContext.cjs');
 var useConfirmationModal = require('../useConfirmationModal/useConfirmationModal.cjs');
@@ -41,8 +42,6 @@ require('../../../components/Popper/Popper/Popper.cjs');
 require('../../../components/Popper/PopperContext/PopperContext.cjs');
 require('formik');
 require('yup');
-require('../../../context/WalletGroupContext/WalletGroupContext.cjs');
-require('../../../widgets/DynamicBridgeWidget/views/WalletsView/components/SecondaryWallets/SecondaryWallets.cjs');
 
 const useWalletUiUtils = ({ appLogoUrl, appName, getAppOrigin, }) => {
     const confirmationStateRef = React.useRef('enabled');

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

@@ -25,6 +25,7 @@ import '../../../components/Transition/SlideInUpTransition/SlideInUpTransition.j
 import '../../../components/Transition/OpacityTransition/OpacityTransition.js';
 import '../../../config/ApiEndpoint.js';
 import '@dynamic-labs/rpc-providers';
+import '../useWallets/utils/verifyMagicIsSetup/verifyMagicIsSetup.js';
 import '../../../context/ErrorContext/ErrorContext.js';
 import '../../../context/AccessDeniedContext/AccessDeniedContext.js';
 import { useConfirmationModal } from '../useConfirmationModal/useConfirmationModal.js';
@@ -37,8 +38,6 @@ import '../../../components/Popper/Popper/Popper.js';
 import '../../../components/Popper/PopperContext/PopperContext.js';
 import 'formik';
 import 'yup';
-import '../../../context/WalletGroupContext/WalletGroupContext.js';
-import '../../../widgets/DynamicBridgeWidget/views/WalletsView/components/SecondaryWallets/SecondaryWallets.js';
 
 const useWalletUiUtils = ({ appLogoUrl, appName, getAppOrigin, }) => {
     const confirmationStateRef = useRef('enabled');