@dynamic-labs/sdk-react-core 0.17.0-RC.0 → 0.17.0-RC.10

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

@@ -3,15 +3,25 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 var useInternalDynamicContext = require('../../../context/DynamicContext/useInternalDynamicContext.cjs');
-var index = require('../../functions/getEnabledKYC/index.cjs');
 var useOnlyConnectedMode = require('../useOnlyConnectedMode/useOnlyConnectedMode.cjs');
+var getEnabledUserProfileFields = require('../../functions/getEnabledUserProfileFields/getEnabledUserProfileFields.cjs');
 
+/* eslint-disable max-len */
+/**
+ * A custom React hook that checks if KYC fields are enabled in the project settings or defined in the user profile.
+ *
+ * @returns {boolean} - A boolean value indicating whether the KYC fields are enabled in the project settings or defined in the user profile.
+ */
 const useKYCFlag = () => {
-    var _a;
-    const isOnlyConnected = useOnlyConnectedMode.useOnlyConnectedMode();
-    const { projectSettings } = useInternalDynamicContext.useInternalDynamicContext();
-    const hasKYCSettings = (_a = index.getEnabledKYC(projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.kyc)) === null || _a === void 0 ? void 0 : _a.length;
-    return !isOnlyConnected && Boolean(hasKYCSettings);
+    const isOnlyConnectedMode = useOnlyConnectedMode.useOnlyConnectedMode();
+    const { projectSettings, user } = useInternalDynamicContext.useInternalDynamicContext();
+    if (isOnlyConnectedMode)
+        return false;
+    const hasAnyKYCFields = getEnabledUserProfileFields.getUserProfileFields({
+        projectSettingsKyc: projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.kyc,
+        user,
+    });
+    return hasAnyKYCFields.length > 0;
 };
 
 exports.useKYCFlag = useKYCFlag;

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

@@ -1 +1,6 @@
+/**
+ * A custom React hook that checks if KYC fields are enabled in the project settings or defined in the user profile.
+ *
+ * @returns {boolean} - A boolean value indicating whether the KYC fields are enabled in the project settings or defined in the user profile.
+ */
 export declare const useKYCFlag: () => boolean;

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

@@ -1,13 +1,23 @@
 import { useInternalDynamicContext } from '../../../context/DynamicContext/useInternalDynamicContext.js';
-import { getEnabledKYC } from '../../functions/getEnabledKYC/index.js';
 import { useOnlyConnectedMode } from '../useOnlyConnectedMode/useOnlyConnectedMode.js';
+import { getUserProfileFields } from '../../functions/getEnabledUserProfileFields/getEnabledUserProfileFields.js';
 
+/* eslint-disable max-len */
+/**
+ * A custom React hook that checks if KYC fields are enabled in the project settings or defined in the user profile.
+ *
+ * @returns {boolean} - A boolean value indicating whether the KYC fields are enabled in the project settings or defined in the user profile.
+ */
 const useKYCFlag = () => {
-    var _a;
-    const isOnlyConnected = useOnlyConnectedMode();
-    const { projectSettings } = useInternalDynamicContext();
-    const hasKYCSettings = (_a = getEnabledKYC(projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.kyc)) === null || _a === void 0 ? void 0 : _a.length;
-    return !isOnlyConnected && Boolean(hasKYCSettings);
+    const isOnlyConnectedMode = useOnlyConnectedMode();
+    const { projectSettings, user } = useInternalDynamicContext();
+    if (isOnlyConnectedMode)
+        return false;
+    const hasAnyKYCFields = getUserProfileFields({
+        projectSettingsKyc: projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.kyc,
+        user,
+    });
+    return hasAnyKYCFields.length > 0;
 };
 
 export { useKYCFlag };

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

@@ -6,12 +6,14 @@ var useInternalDynamicContext = require('../../../context/DynamicContext/useInte
 require('@dynamic-labs/sdk-api');
 require('../../../shared/logger.cjs');
 require('@dynamic-labs/iconic');
-require('@dynamic-labs/multi-wallet');
+require('@dynamic-labs/wallet-connector-core');
 require('react/jsx-runtime');
 require('../../../context/ViewContext/ViewContext.cjs');
 require('react');
 var isSSR = require('../../../shared/utils/functions/isSSR/isSSR.cjs');
+require('@dynamic-labs/utils');
 require('../../constants/colors.cjs');
+require('ethers');
 require('../../../shared/consts/index.cjs');
 var useOnlyConnectedMode = require('../useOnlyConnectedMode/useOnlyConnectedMode.cjs');
 

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

@@ -2,12 +2,14 @@ import { useInternalDynamicContext } from '../../../context/DynamicContext/useIn
 import '@dynamic-labs/sdk-api';
 import '../../../shared/logger.js';
 import '@dynamic-labs/iconic';
-import '@dynamic-labs/multi-wallet';
+import '@dynamic-labs/wallet-connector-core';
 import 'react/jsx-runtime';
 import '../../../context/ViewContext/ViewContext.js';
 import 'react';
 import { isSSR } from '../../../shared/utils/functions/isSSR/isSSR.js';
+import '@dynamic-labs/utils';
 import '../../constants/colors.js';
+import 'ethers';
 import '../../../shared/consts/index.js';
 import { useOnlyConnectedMode } from '../useOnlyConnectedMode/useOnlyConnectedMode.js';
 

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

@@ -4,7 +4,7 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var _tslib = require('../../../../../_virtual/_tslib.cjs');
 var React = require('react');
-var multiWallet = require('@dynamic-labs/multi-wallet');
+var walletConnectorCore = require('@dynamic-labs/wallet-connector-core');
 
 const useMutation = (mutation, options = {}) => {
     const [state, setState] = React.useState({
@@ -32,18 +32,18 @@ const useMutation = (mutation, options = {}) => {
                 (_a = options === null || options === void 0 ? void 0 : options.onSuccess) === null || _a === void 0 ? void 0 : _a.call(options, data, variables);
             }
             catch (err) {
-                multiWallet.logger.error(err);
+                walletConnectorCore.logger.error(err);
             }
             return data;
         }
         catch (error) {
             setState({ error: error, isLoading: false });
-            multiWallet.logger.error(error);
+            walletConnectorCore.logger.error(error);
             try {
                 (_b = options === null || options === void 0 ? void 0 : options.onFailure) === null || _b === void 0 ? void 0 : _b.call(options, error, variables);
             }
             catch (err) {
-                multiWallet.logger.error(err);
+                walletConnectorCore.logger.error(err);
             }
         }
         return undefined;

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

@@ -1,6 +1,6 @@
 import { __awaiter } from '../../../../../_virtual/_tslib.js';
 import { useState, useCallback } from 'react';
-import { logger } from '@dynamic-labs/multi-wallet';
+import { logger } from '@dynamic-labs/wallet-connector-core';
 
 const useMutation = (mutation, options = {}) => {
     const [state, setState] = useState({

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

@@ -3,13 +3,16 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 var React = require('react');
-var multiWallet = require('@dynamic-labs/multi-wallet');
+var rpcProviders = require('@dynamic-labs/rpc-providers');
 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/utils');
 require('../../constants/colors.cjs');
+require('ethers');
 require('../../../shared/consts/index.cjs');
 
 const useRpcProviders = ({ networkConfigurations, }) => {
@@ -19,7 +22,7 @@ const useRpcProviders = ({ networkConfigurations, }) => {
     React.useEffect(() => {
         try {
             if (networkConfigurations) {
-                setProviders(multiWallet.getRpcProviders(networkConfigurations));
+                setProviders(rpcProviders.ChainRpcProviders.getProviders(networkConfigurations));
             }
         }
         catch (error) {
@@ -30,12 +33,12 @@ const useRpcProviders = ({ networkConfigurations, }) => {
         if (!networkConfigurations) {
             return undefined;
         }
-        return multiWallet.getEvmRpcProviderByChainId(networkConfigurations, chainId);
+        return rpcProviders.ChainRpcProviders.getEvmProviderByChainId(networkConfigurations, chainId);
     }, [networkConfigurations]);
     React.useEffect(() => {
         try {
             if (networkConfigurations) {
-                setEvmDefaultProvider(multiWallet.getEvmDefaultRpcProvider(networkConfigurations));
+                setEvmDefaultProvider(rpcProviders.ChainRpcProviders.getEvmProviderByChainId(networkConfigurations, 1));
             }
         }
         catch (error) {
@@ -45,7 +48,7 @@ const useRpcProviders = ({ networkConfigurations, }) => {
     React.useEffect(() => {
         try {
             if (networkConfigurations) {
-                setSolanaDefaultProvider(multiWallet.getSolanaDefaultRpcProvider(networkConfigurations));
+                setSolanaDefaultProvider(rpcProviders.ChainRpcProviders.getSolanaRpcProviderByChainId(networkConfigurations, '101'));
             }
         }
         catch (error) {

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

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

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

@@ -1,11 +1,14 @@
 import { useState, useEffect, useCallback } from 'react';
-import { getRpcProviders, getEvmRpcProviderByChainId, getEvmDefaultRpcProvider, getSolanaDefaultRpcProvider } from '@dynamic-labs/multi-wallet';
+import { ChainRpcProviders } from '@dynamic-labs/rpc-providers';
 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/utils';
 import '../../constants/colors.js';
+import 'ethers';
 import '../../../shared/consts/index.js';
 
 const useRpcProviders = ({ networkConfigurations, }) => {
@@ -15,23 +18,23 @@ const useRpcProviders = ({ networkConfigurations, }) => {
     useEffect(() => {
         try {
             if (networkConfigurations) {
-                setProviders(getRpcProviders(networkConfigurations));
+                setProviders(ChainRpcProviders.getProviders(networkConfigurations));
             }
         }
         catch (error) {
             logger.error(error);
         }
     }, [networkConfigurations]);
-    const getEvmRpcProviderByChainId$1 = useCallback((chainId) => {
+    const getEvmRpcProviderByChainId = useCallback((chainId) => {
         if (!networkConfigurations) {
             return undefined;
         }
-        return getEvmRpcProviderByChainId(networkConfigurations, chainId);
+        return ChainRpcProviders.getEvmProviderByChainId(networkConfigurations, chainId);
     }, [networkConfigurations]);
     useEffect(() => {
         try {
             if (networkConfigurations) {
-                setEvmDefaultProvider(getEvmDefaultRpcProvider(networkConfigurations));
+                setEvmDefaultProvider(ChainRpcProviders.getEvmProviderByChainId(networkConfigurations, 1));
             }
         }
         catch (error) {
@@ -41,7 +44,7 @@ const useRpcProviders = ({ networkConfigurations, }) => {
     useEffect(() => {
         try {
             if (networkConfigurations) {
-                setSolanaDefaultProvider(getSolanaDefaultRpcProvider(networkConfigurations));
+                setSolanaDefaultProvider(ChainRpcProviders.getSolanaRpcProviderByChainId(networkConfigurations, '101'));
             }
         }
         catch (error) {
@@ -51,7 +54,7 @@ const useRpcProviders = ({ networkConfigurations, }) => {
     return {
         evmDefaultProvider,
         evmProviders: providers === null || providers === void 0 ? void 0 : providers.evm,
-        getEvmRpcProviderByChainId: getEvmRpcProviderByChainId$1,
+        getEvmRpcProviderByChainId,
         solanaDefaultProvider,
         solanaProviders: providers === null || providers === void 0 ? void 0 : providers.solana,
     };

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

@@ -6,6 +6,13 @@ var React = require('react');
 var useInternalDynamicContext = require('../../../context/DynamicContext/useInternalDynamicContext.cjs');
 var useCreateUserProfileByJWTCallback = require('../useCreateUserProfileByJWTCallback/useCreateUserProfileByJWTCallback.cjs');
 
+/**
+ * A custom React hook that returns a function to update the user profile using a JSON Web Token (JWT).
+ * This hook internally uses the 'useCreateUserProfileByJWTCallback' hook to create the user profile by JWT
+ * and the 'useInternalDynamicContext' hook to set the callback for when the user profile is updated.
+ * The returned function uses 'useCallback' to memoize the function and optimize performance.
+ * @returns An object with the 'updateUserProfileByJWT' function.
+ */
 const useUpdateUserProfileByJWTCallback = () => {
     const { createUserProfileByJWT } = useCreateUserProfileByJWTCallback.useCreateUserProfileByJWTCallback();
     const { setCallback } = useInternalDynamicContext.useInternalDynamicContext();

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

@@ -1,3 +1,10 @@
+/**
+ * A custom React hook that returns a function to update the user profile using a JSON Web Token (JWT).
+ * This hook internally uses the 'useCreateUserProfileByJWTCallback' hook to create the user profile by JWT
+ * and the 'useInternalDynamicContext' hook to set the callback for when the user profile is updated.
+ * The returned function uses 'useCallback' to memoize the function and optimize performance.
+ * @returns An object with the 'updateUserProfileByJWT' function.
+ */
 export declare const useUpdateUserProfileByJWTCallback: () => {
     updateUserProfileByJWT: (jwt: string) => void;
 };

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

@@ -2,6 +2,13 @@ import { useCallback } from 'react';
 import { useInternalDynamicContext } from '../../../context/DynamicContext/useInternalDynamicContext.js';
 import { useCreateUserProfileByJWTCallback } from '../useCreateUserProfileByJWTCallback/useCreateUserProfileByJWTCallback.js';
 
+/**
+ * A custom React hook that returns a function to update the user profile using a JSON Web Token (JWT).
+ * This hook internally uses the 'useCreateUserProfileByJWTCallback' hook to create the user profile by JWT
+ * and the 'useInternalDynamicContext' hook to set the callback for when the user profile is updated.
+ * The returned function uses 'useCallback' to memoize the function and optimize performance.
+ * @returns An object with the 'updateUserProfileByJWT' function.
+ */
 const useUpdateUserProfileByJWTCallback = () => {
     const { createUserProfileByJWT } = useCreateUserProfileByJWTCallback();
     const { setCallback } = useInternalDynamicContext();

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

@@ -5,14 +5,16 @@ Object.defineProperty(exports, '__esModule', { value: true });
 var _tslib = require('../../../../../_virtual/_tslib.cjs');
 var React = require('react');
 var yup = require('yup');
-var multiWallet = require('@dynamic-labs/multi-wallet');
+var utils = require('@dynamic-labs/utils');
 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');
 var index = require('../../../shared/utils/functions/getValueByKey/index.cjs');
 require('../../constants/colors.cjs');
+require('ethers');
 var index$1 = require('../../../shared/consts/index.cjs');
 var fieldsConfig = require('../../../views/CollectUserDataView/fieldsConfig.cjs');
 var MockContext = require('../../../context/MockContext/MockContext.cjs');
@@ -48,7 +50,7 @@ const useUserDataForm = ({ onSubmit, onError, userProfile, shouldEnforcePolicies
             return;
         try {
             if (!(userProfile === null || userProfile === void 0 ? void 0 : userProfile.environmentId))
-                throw new multiWallet.DynamicError('Invalid environment ID');
+                throw new utils.DynamicError('Invalid environment ID');
             setFetch(true);
             let updatedUserFields = values;
             if (enforcePolicies) {
@@ -60,10 +62,10 @@ const useUserDataForm = ({ onSubmit, onError, userProfile, shouldEnforcePolicies
         catch (e) {
             logger.logger.error(e);
             onError === null || onError === void 0 ? void 0 : onError(e);
-            if (e.name === 'EmailAlreadyExistsError') {
+            if (e instanceof utils.EmailAlreadyExistsError) {
                 formikHelper.setErrors({ email: 'Email already exists' });
             }
-            else if (e.name === 'UsernameAlreadyExistsError') {
+            else if (e instanceof utils.UsernameAlreadyExistsError) {
                 formikHelper.setErrors({ username: 'Username already exists' });
             }
             else {

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

@@ -1,14 +1,16 @@
 import { __awaiter } from '../../../../../_virtual/_tslib.js';
 import { useState, useMemo, useCallback } from 'react';
 import { object } from 'yup';
-import { DynamicError } from '@dynamic-labs/multi-wallet';
+import { DynamicError, EmailAlreadyExistsError, UsernameAlreadyExistsError } from '@dynamic-labs/utils';
 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 { getValueByKey } from '../../../shared/utils/functions/getValueByKey/index.js';
 import '../../constants/colors.js';
+import 'ethers';
 import { countryCodes, tShirtSizes, teamNames } from '../../../shared/consts/index.js';
 import { fieldsConfig } from '../../../views/CollectUserDataView/fieldsConfig.js';
 import { useMockContext } from '../../../context/MockContext/MockContext.js';
@@ -56,10 +58,10 @@ const useUserDataForm = ({ onSubmit, onError, userProfile, shouldEnforcePolicies
         catch (e) {
             logger.error(e);
             onError === null || onError === void 0 ? void 0 : onError(e);
-            if (e.name === 'EmailAlreadyExistsError') {
+            if (e instanceof EmailAlreadyExistsError) {
                 formikHelper.setErrors({ email: 'Email already exists' });
             }
-            else if (e.name === 'UsernameAlreadyExistsError') {
+            else if (e instanceof UsernameAlreadyExistsError) {
                 formikHelper.setErrors({ username: 'Username already exists' });
             }
             else {

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

@@ -3,18 +3,21 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 var _tslib = require('../../../../../_virtual/_tslib.cjs');
-var multiWallet = require('@dynamic-labs/multi-wallet');
+var utils = require('@dynamic-labs/utils');
 var api = require('../../../data/api.cjs');
 var index = require('../../functions/storeAuthToken/index.cjs');
+require('@dynamic-labs/multi-wallet');
 var localStorage = require('../../constants/localStorage.cjs');
 require('../../constants/colors.cjs');
 var decodeJwt = require('../../../shared/utils/functions/decodeJwt/decodeJwt.cjs');
 var logger = require('../../../shared/logger.cjs');
 var setToLS = require('../../../shared/utils/functions/storage/setToLS.cjs');
 require('@dynamic-labs/iconic');
+require('@dynamic-labs/wallet-connector-core');
 require('react/jsx-runtime');
 var ViewContext = require('../../../context/ViewContext/ViewContext.cjs');
 require('react');
+require('ethers');
 var getVerifyArgs = require('../../functions/getVerifyArgs/getVerifyArgs.cjs');
 var createUserProfile = require('../../functions/createUserProfile/createUserProfile.cjs');
 var isSupportedNetwork = require('../../functions/isSupportedNetwork/isSupportedNetwork.cjs');
@@ -41,7 +44,7 @@ const useVerifyWallet = ({ consumeNonce, displayTermsOfService, environmentId, p
         let Jwt;
         const nonce = consumeNonce();
         if (nonce === undefined)
-            throw new multiWallet.DynamicError('Missing nonce');
+            throw new utils.DynamicError('Missing nonce');
         const verifyArgs = yield getVerifyArgs.getVerifyArgs({
             displayTermsOfService,
             environmentId,
@@ -59,7 +62,7 @@ const useVerifyWallet = ({ consumeNonce, displayTermsOfService, environmentId, p
             Jwt = yield api.linkWallet(environmentId, verifyArgs, authToken);
         }
         if (Jwt === undefined)
-            throw new multiWallet.DynamicError('Could not obtain a valid JWT');
+            throw new utils.DynamicError('Could not obtain a valid JWT');
         // TODO DYN-523: add verification here that the JWT is valid with the publicKey
         return Jwt;
     });
@@ -84,10 +87,9 @@ const useVerifyWallet = ({ consumeNonce, displayTermsOfService, environmentId, p
         }
     };
     const handleError = (e, walletConnector) => {
-        var _a;
         // 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.name === 'WalletUsedError') {
+        if (e instanceof utils.WalletUsedError) {
             setShowAuthFlow(true);
             setView('wallet-used');
             setIsSingleWalletAccount(false);
@@ -96,17 +98,17 @@ const useVerifyWallet = ({ consumeNonce, displayTermsOfService, environmentId, p
             }
             return;
         }
-        (_a = walletConnector.endSession) === null || _a === void 0 ? void 0 : _a.call(walletConnector);
-        if (e.name === 'ChainalysisError') {
+        walletConnector.endSession();
+        if (e instanceof utils.ChainalysisError) {
             setView('chainalysis-blocked-wallet');
             return;
         }
-        if (e.name === 'NoAccessError') {
+        if (e instanceof utils.NoAccessError) {
             setView('no-access');
             return;
         }
         if (connectedWallet && authMode === 'connect-only') {
-            throw new multiWallet.DynamicError(e.message);
+            throw new utils.DynamicError(e.message);
         }
         setView(loginWithEmail ? 'login-with-email-or-wallet' : 'wallet-list');
         logger.logger.error(e);
@@ -128,7 +130,7 @@ const useVerifyWallet = ({ consumeNonce, displayTermsOfService, environmentId, p
             const Jwt = yield generateJWT(walletConnector, walletProvider, fetchPublicAddressOpts, publicWalletAddress, captchaToken);
             const decodedJwt = decodeJwt.decodeJwt(Jwt);
             if (decodedJwt === undefined)
-                throw new multiWallet.DynamicError('Invalid token!');
+                throw new utils.DynamicError('Invalid token!');
             const user = yield createUserProfile.createUserProfile(decodedJwt);
             const isKycRequired = decodedJwt.missingFields.length;
             setOnboardingOnlyJwt(Jwt);
@@ -139,8 +141,7 @@ const useVerifyWallet = ({ consumeNonce, displayTermsOfService, environmentId, p
                 verifyOnly &&
                 !_isSupportedNetwork &&
                 !isKycRequired) {
-                const _isProgrammableNetworkSwitchSupported = isProgrammableNetworkSwitchSupported.isProgrammableNetworkSwitchSupported(walletConnector);
-                if (_isProgrammableNetworkSwitchSupported) {
+                if (isProgrammableNetworkSwitchSupported.isProgrammableNetworkSwitchSupported(walletConnector)) {
                     return setView('network-not-supported');
                 }
                 return setView('network-not-supported-manual');
@@ -159,6 +160,7 @@ const useVerifyWallet = ({ consumeNonce, displayTermsOfService, environmentId, p
                 setCallback('authSuccess');
             }
             else {
+                setView('wallet-list');
                 setCallback('linkSuccess');
             }
         }

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

@@ -1,16 +1,19 @@
 import { __awaiter } from '../../../../../_virtual/_tslib.js';
-import { DynamicError } from '@dynamic-labs/multi-wallet';
+import { DynamicError, WalletUsedError, ChainalysisError, NoAccessError } from '@dynamic-labs/utils';
 import { verifyWallet, linkWallet } from '../../../data/api.js';
 import { storeAuthToken } from '../../functions/storeAuthToken/index.js';
+import '@dynamic-labs/multi-wallet';
 import { LAST_USED_WALLET } from '../../constants/localStorage.js';
 import '../../constants/colors.js';
 import { decodeJwt } from '../../../shared/utils/functions/decodeJwt/decodeJwt.js';
 import { logger } from '../../../shared/logger.js';
 import { setToLS } from '../../../shared/utils/functions/storage/setToLS.js';
 import '@dynamic-labs/iconic';
+import '@dynamic-labs/wallet-connector-core';
 import 'react/jsx-runtime';
 import { useViewContext } from '../../../context/ViewContext/ViewContext.js';
 import 'react';
+import 'ethers';
 import { getVerifyArgs } from '../../functions/getVerifyArgs/getVerifyArgs.js';
 import { createUserProfile } from '../../functions/createUserProfile/createUserProfile.js';
 import { isSupportedNetwork } from '../../functions/isSupportedNetwork/isSupportedNetwork.js';
@@ -80,10 +83,9 @@ const useVerifyWallet = ({ consumeNonce, displayTermsOfService, environmentId, p
         }
     };
     const handleError = (e, walletConnector) => {
-        var _a;
         // 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.name === 'WalletUsedError') {
+        if (e instanceof WalletUsedError) {
             setShowAuthFlow(true);
             setView('wallet-used');
             setIsSingleWalletAccount(false);
@@ -92,12 +94,12 @@ const useVerifyWallet = ({ consumeNonce, displayTermsOfService, environmentId, p
             }
             return;
         }
-        (_a = walletConnector.endSession) === null || _a === void 0 ? void 0 : _a.call(walletConnector);
-        if (e.name === 'ChainalysisError') {
+        walletConnector.endSession();
+        if (e instanceof ChainalysisError) {
             setView('chainalysis-blocked-wallet');
             return;
         }
-        if (e.name === 'NoAccessError') {
+        if (e instanceof NoAccessError) {
             setView('no-access');
             return;
         }
@@ -135,8 +137,7 @@ const useVerifyWallet = ({ consumeNonce, displayTermsOfService, environmentId, p
                 verifyOnly &&
                 !_isSupportedNetwork &&
                 !isKycRequired) {
-                const _isProgrammableNetworkSwitchSupported = isProgrammableNetworkSwitchSupported(walletConnector);
-                if (_isProgrammableNetworkSwitchSupported) {
+                if (isProgrammableNetworkSwitchSupported(walletConnector)) {
                     return setView('network-not-supported');
                 }
                 return setView('network-not-supported-manual');
@@ -155,6 +156,7 @@ const useVerifyWallet = ({ consumeNonce, displayTermsOfService, environmentId, p
                 setCallback('authSuccess');
             }
             else {
+                setView('wallet-list');
                 setCallback('linkSuccess');
             }
         }

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

@@ -4,7 +4,8 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var _tslib = require('../../../../../_virtual/_tslib.cjs');
 var React = require('react');
-var multiWallet = require('@dynamic-labs/multi-wallet');
+var walletConnectorCore = require('@dynamic-labs/wallet-connector-core');
+var utils = require('@dynamic-labs/utils');
 var decodeJwt = require('../../../shared/utils/functions/decodeJwt/decodeJwt.cjs');
 var logger = require('../../../shared/logger.cjs');
 require('@dynamic-labs/iconic');
@@ -12,10 +13,12 @@ require('react/jsx-runtime');
 require('../../../context/ViewContext/ViewContext.cjs');
 var localStorage$1 = require('../../constants/localStorage.cjs');
 require('../../constants/colors.cjs');
+require('ethers');
 var useLocalStorage = require('../../../shared/utils/hooks/useLocalStorage/useLocalStorage.cjs');
 require('../../../shared/consts/index.cjs');
 var isWalletConnected = require('../../functions/isWalletConnected/isWalletConnected.cjs');
 var isSameWalletName = require('../../functions/isSameWalletName/isSameWalletName.cjs');
+require('@dynamic-labs/multi-wallet');
 require('@dynamic-labs/sdk-api');
 var shouldManuallyReconnectOnRefresh = require('../../functions/shouldManuallyReconnectOnRefresh/shouldManuallyReconnectOnRefresh.cjs');
 
@@ -89,7 +92,7 @@ const useWalletConnectors = ({ authToken, wallets: availableWallets, multiWallet
     const getSelectedWallet = React.useCallback((walletId) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
         const newWallet = wallets.find(({ id }) => id === walletId);
         if (!newWallet) {
-            throw new multiWallet.DynamicError(`Wallet with id: ${walletId} not found`);
+            throw new utils.DynamicError(`Wallet with id: ${walletId} not found`);
         }
         const connectedAccounts = yield newWallet.connector.getConnectedAccounts();
         return { connectedAccounts, newWallet };
@@ -127,7 +130,7 @@ const useWalletConnectors = ({ authToken, wallets: availableWallets, multiWallet
             setMultiWalletWidgetState('awaiting_connection');
             setShowQrcodeModal(checkIfShowQrCodeModal(newPrimaryWallet));
         }
-        if (multiWallet.isEmailWalletConnector(newPrimaryWallet.connector)) {
+        if (walletConnectorCore.isEmailWalletConnector(newPrimaryWallet.connector)) {
             const emailConnector = newPrimaryWallet.connector;
             const email = localStorage.getItem('magic-link-email');
             if (email) {

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

@@ -1,6 +1,7 @@
 import { __awaiter } from '../../../../../_virtual/_tslib.js';
 import { useState, useCallback, useEffect } from 'react';
-import { DynamicError, isEmailWalletConnector } from '@dynamic-labs/multi-wallet';
+import { isEmailWalletConnector } from '@dynamic-labs/wallet-connector-core';
+import { DynamicError } from '@dynamic-labs/utils';
 import { decodeJwt } from '../../../shared/utils/functions/decodeJwt/decodeJwt.js';
 import { logger } from '../../../shared/logger.js';
 import '@dynamic-labs/iconic';
@@ -8,10 +9,12 @@ import 'react/jsx-runtime';
 import '../../../context/ViewContext/ViewContext.js';
 import { PRIMARY_WALLET_ID } from '../../constants/localStorage.js';
 import '../../constants/colors.js';
+import 'ethers';
 import { useLocalStorage } from '../../../shared/utils/hooks/useLocalStorage/useLocalStorage.js';
 import '../../../shared/consts/index.js';
 import { isWalletConnected } from '../../functions/isWalletConnected/isWalletConnected.js';
 import { isSameWalletName } from '../../functions/isSameWalletName/isSameWalletName.js';
+import '@dynamic-labs/multi-wallet';
 import '@dynamic-labs/sdk-api';
 import { shouldManuallyReconnectOnRefresh } from '../../functions/shouldManuallyReconnectOnRefresh/shouldManuallyReconnectOnRefresh.js';