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

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

@@ -3,10 +3,11 @@
 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/multi-wallet');
 require('react/jsx-runtime');
 require('../../../context/ViewContext/ViewContext.cjs');
 require('../../constants/colors.cjs');
@@ -19,7 +20,7 @@ const useRpcProviders = ({ networkConfigurations, }) => {
     React.useEffect(() => {
         try {
             if (networkConfigurations) {
-                setProviders(multiWallet.getRpcProviders(networkConfigurations));
+                setProviders(rpcProviders.ChainRpcProviders.getProviders(networkConfigurations));
             }
         }
         catch (error) {
@@ -30,12 +31,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 +46,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,8 +1,9 @@
 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/multi-wallet';
 import 'react/jsx-runtime';
 import '../../../context/ViewContext/ViewContext.js';
 import '../../constants/colors.js';
@@ -15,23 +16,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 +42,7 @@ const useRpcProviders = ({ networkConfigurations, }) => {
     useEffect(() => {
         try {
             if (networkConfigurations) {
-                setSolanaDefaultProvider(getSolanaDefaultRpcProvider(networkConfigurations));
+                setSolanaDefaultProvider(ChainRpcProviders.getSolanaRpcProviderByChainId(networkConfigurations, '101'));
             }
         }
         catch (error) {
@@ -51,7 +52,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/useUserDataForm/useUserDataForm.cjs

@@ -5,10 +5,11 @@ 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/multi-wallet');
 require('react/jsx-runtime');
 require('../../../context/ViewContext/ViewContext.cjs');
 var index = require('../../../shared/utils/functions/getValueByKey/index.cjs');
@@ -48,7 +49,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 +61,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,10 +1,11 @@
 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/multi-wallet';
 import 'react/jsx-runtime';
 import '../../../context/ViewContext/ViewContext.js';
 import { getValueByKey } from '../../../shared/utils/functions/getValueByKey/index.js';
@@ -56,10 +57,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/useUserUpdateRequest/useUserUpdateRequest.cjs

@@ -32,23 +32,7 @@ const useUserUpdateRequestInternal = ({ validationSchemaStripUnknown, }) => {
     const { verifyEmail: verifyEmailFn } = useEmailVerificationRequest.useEmailVerificationRequest();
     const { updateUserProfileByJWT } = useUpdateUserProfileByJWTCallback.useUpdateUserProfileByJWTCallback();
     const updateUser = React.useCallback((userFields, userEnvironmentId) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
-        const handleEmailVerification = () => _tslib.__awaiter(void 0, void 0, void 0, function* () {
-            var _a, _b;
-            setEmail((_a = updateUserProfileResponse.emailVerification) === null || _a === void 0 ? void 0 : _a.email);
-            setVerificationUUID((_b = updateUserProfileResponse.emailVerification) === null || _b === void 0 ? void 0 : _b.verificationUUID);
-            // DYN-2046 - Customers have the opportunity to programmatically use our email verification and profile editing.
-            // VerifyEmailFN was scoped to bypass the problem with memoization of the state at the beginning of Promise.
-            // setEmail and setVerificationUUID in the above lines will are not visible in this promise.
-            const scopedVerifyEmailFn = (verificationToken) => {
-                var _a;
-                return verifyEmailFn(verificationToken, (_a = updateUserProfileResponse.emailVerification) === null || _a === void 0 ? void 0 : _a.verificationUUID);
-            };
-            return {
-                isEmailVerificationRequired: _isEmailVerificationRequired,
-                updateUserProfileResponse,
-                verifyEmailFn: scopedVerifyEmailFn,
-            };
-        });
+        var _a, _b;
         const validatedUserFields = yield userFieldsSchema.validate(userFields, {
             stripUnknown: validationSchemaStripUnknown,
         });
@@ -58,11 +42,25 @@ const useUserUpdateRequestInternal = ({ validationSchemaStripUnknown, }) => {
             // If email verification is not needed then we can update the user profile immediately.
             updateUserProfileByJWT(updateUserProfileResponse.jwt);
             return {
-                isEmailVerificationRequired: false,
+                isEmailVerificationRequired: _isEmailVerificationRequired,
                 updateUserProfileResponse,
             };
         }
-        return handleEmailVerification();
+        // We update EmailContext to use this information in the Email Verification view
+        setEmail((_a = updateUserProfileResponse.emailVerification) === null || _a === void 0 ? void 0 : _a.email);
+        setVerificationUUID((_b = updateUserProfileResponse.emailVerification) === null || _b === void 0 ? void 0 : _b.verificationUUID);
+        // DYN-2046 - Customers have the opportunity to programmatically use our email verification and profile editing.
+        // VerifyEmailFN was scoped to bypass the problem with memoization of the state at the beginning of Promise.
+        // setEmail and setVerificationUUID in the above lines will are not visible in this promise.
+        const scopedVerifyEmailFn = (verificationToken) => {
+            var _a;
+            return verifyEmailFn(verificationToken, (_a = updateUserProfileResponse.emailVerification) === null || _a === void 0 ? void 0 : _a.verificationUUID);
+        };
+        return {
+            isEmailVerificationRequired: _isEmailVerificationRequired,
+            updateUserProfileResponse,
+            verifyEmailFn: scopedVerifyEmailFn,
+        };
     }), [
         environmentId,
         jwtToken,

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

@@ -4,21 +4,23 @@ export declare const useUserUpdateRequestInternal: ({ validationSchemaStripUnkno
     validationSchemaStripUnknown: boolean;
 }) => {
     updateUser: (userFields: UpdateUserFieldsArg, userEnvironmentId?: string) => Promise<{
-        isEmailVerificationRequired: boolean;
+        isEmailVerificationRequired: false;
         updateUserProfileResponse: import("@dynamic-labs/sdk-api").UpdateSelfResponse;
-        verifyEmailFn: (verificationToken: string) => Promise<import("@dynamic-labs/sdk-api").UpdateSelfResponse>;
+        verifyEmailFn?: undefined;
     } | {
-        isEmailVerificationRequired: boolean;
+        isEmailVerificationRequired: true;
         updateUserProfileResponse: import("@dynamic-labs/sdk-api").UpdateSelfResponse;
+        verifyEmailFn: (verificationToken: string) => Promise<import("@dynamic-labs/sdk-api").UpdateSelfResponse>;
     }>;
 };
 export declare const useUserUpdateRequest: () => {
     updateUser: (userFields: UpdateUserFieldsArg, userEnvironmentId?: string) => Promise<{
-        isEmailVerificationRequired: boolean;
+        isEmailVerificationRequired: false;
         updateUserProfileResponse: import("@dynamic-labs/sdk-api").UpdateSelfResponse;
-        verifyEmailFn: (verificationToken: string) => Promise<import("@dynamic-labs/sdk-api").UpdateSelfResponse>;
+        verifyEmailFn?: undefined;
     } | {
-        isEmailVerificationRequired: boolean;
+        isEmailVerificationRequired: true;
         updateUserProfileResponse: import("@dynamic-labs/sdk-api").UpdateSelfResponse;
+        verifyEmailFn: (verificationToken: string) => Promise<import("@dynamic-labs/sdk-api").UpdateSelfResponse>;
     }>;
 };

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

@@ -28,23 +28,7 @@ const useUserUpdateRequestInternal = ({ validationSchemaStripUnknown, }) => {
     const { verifyEmail: verifyEmailFn } = useEmailVerificationRequest();
     const { updateUserProfileByJWT } = useUpdateUserProfileByJWTCallback();
     const updateUser = useCallback((userFields, userEnvironmentId) => __awaiter(void 0, void 0, void 0, function* () {
-        const handleEmailVerification = () => __awaiter(void 0, void 0, void 0, function* () {
-            var _a, _b;
-            setEmail((_a = updateUserProfileResponse.emailVerification) === null || _a === void 0 ? void 0 : _a.email);
-            setVerificationUUID((_b = updateUserProfileResponse.emailVerification) === null || _b === void 0 ? void 0 : _b.verificationUUID);
-            // DYN-2046 - Customers have the opportunity to programmatically use our email verification and profile editing.
-            // VerifyEmailFN was scoped to bypass the problem with memoization of the state at the beginning of Promise.
-            // setEmail and setVerificationUUID in the above lines will are not visible in this promise.
-            const scopedVerifyEmailFn = (verificationToken) => {
-                var _a;
-                return verifyEmailFn(verificationToken, (_a = updateUserProfileResponse.emailVerification) === null || _a === void 0 ? void 0 : _a.verificationUUID);
-            };
-            return {
-                isEmailVerificationRequired: _isEmailVerificationRequired,
-                updateUserProfileResponse,
-                verifyEmailFn: scopedVerifyEmailFn,
-            };
-        });
+        var _a, _b;
         const validatedUserFields = yield userFieldsSchema.validate(userFields, {
             stripUnknown: validationSchemaStripUnknown,
         });
@@ -54,11 +38,25 @@ const useUserUpdateRequestInternal = ({ validationSchemaStripUnknown, }) => {
             // If email verification is not needed then we can update the user profile immediately.
             updateUserProfileByJWT(updateUserProfileResponse.jwt);
             return {
-                isEmailVerificationRequired: false,
+                isEmailVerificationRequired: _isEmailVerificationRequired,
                 updateUserProfileResponse,
             };
         }
-        return handleEmailVerification();
+        // We update EmailContext to use this information in the Email Verification view
+        setEmail((_a = updateUserProfileResponse.emailVerification) === null || _a === void 0 ? void 0 : _a.email);
+        setVerificationUUID((_b = updateUserProfileResponse.emailVerification) === null || _b === void 0 ? void 0 : _b.verificationUUID);
+        // DYN-2046 - Customers have the opportunity to programmatically use our email verification and profile editing.
+        // VerifyEmailFN was scoped to bypass the problem with memoization of the state at the beginning of Promise.
+        // setEmail and setVerificationUUID in the above lines will are not visible in this promise.
+        const scopedVerifyEmailFn = (verificationToken) => {
+            var _a;
+            return verifyEmailFn(verificationToken, (_a = updateUserProfileResponse.emailVerification) === null || _a === void 0 ? void 0 : _a.verificationUUID);
+        };
+        return {
+            isEmailVerificationRequired: _isEmailVerificationRequired,
+            updateUserProfileResponse,
+            verifyEmailFn: scopedVerifyEmailFn,
+        };
     }), [
         environmentId,
         jwtToken,

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

@@ -3,9 +3,10 @@
 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');
@@ -29,7 +30,7 @@ require('../../../shared/consts/index.cjs');
 // This logic is used to both verify or link a wallet
 // Since we are re-using the different screens to authenticate or link the wallet.
 // This logic is the best place to determine whether we should verify or verify and link.
-const useVerifyWallet = ({ consumeNonce, displayTermsOfService, environmentId, setIsSingleWalletAccount, }) => {
+const useVerifyWallet = ({ consumeNonce, displayTermsOfService, environmentId, projectSettings, setIsSingleWalletAccount, }) => {
     const { setView } = ViewContext.useViewContext();
     const { setErrorMessage, setError } = ErrorContext.useErrorContext();
     const { setUser, multiWalletWidgetState, debugError, multiWallet: multiWalletEnabled, appName, primaryWalletId, setCallback, setShowAuthFlow, setPrimaryWalletId, siweStatement, connectedWallet, authMode, setOnboardingOnlyJwt, authToken, loginWithEmail, } = useInternalDynamicContext.useInternalDynamicContext();
@@ -41,7 +42,7 @@ const useVerifyWallet = ({ consumeNonce, displayTermsOfService, environmentId, s
         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,
@@ -58,20 +59,20 @@ const useVerifyWallet = ({ consumeNonce, displayTermsOfService, environmentId, s
         else {
             Jwt = yield api.linkWallet(environmentId, verifyArgs, authToken);
         }
-        if (Jwt === undefined) {
-            throw new multiWallet.DynamicError('Could not obtain a valid JWT');
-        }
+        if (Jwt === undefined)
+            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;
     });
     // Overrides the stored primary wallet id when the
     // user logs in for the first time.
     // Or when the user is linking an additional
     // account on the same wallet as the primary wallet.
-    const updatePrimaryWalletId = (walletConnector, decodedJwt) => {
-        const newSelectedCredentialWallet = decodedJwt.verifiedCredentials.find((cred) => cred.id === decodedJwt.lastVerifiedCredentialId &&
+    const updatePrimaryWalletId = (walletConnector, user) => {
+        const newSelectedCredentialWallet = user.verifiedCredentials.find((cred) => cred.id === user.lastVerifiedCredentialId &&
             cred.format === 'blockchain');
         if (newSelectedCredentialWallet) {
-            const currentPrimaryWallet = decodedJwt.verifiedCredentials.find((a) => a.id === primaryWalletId);
+            const currentPrimaryWallet = user.verifiedCredentials.find((a) => a.id === primaryWalletId);
             if (verifyOnly ||
                 primaryWalletId === undefined ||
                 (multiWalletWidgetState === 'awaiting_signature' &&
@@ -86,7 +87,7 @@ const useVerifyWallet = ({ consumeNonce, displayTermsOfService, environmentId, s
     const handleError = (e, walletConnector) => {
         // 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,16 +97,16 @@ const useVerifyWallet = ({ consumeNonce, displayTermsOfService, environmentId, s
             return;
         }
         walletConnector.endSession();
-        if (e.name === 'ChainalysisError') {
+        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);
@@ -127,19 +128,31 @@ const useVerifyWallet = ({ consumeNonce, displayTermsOfService, environmentId, s
             const Jwt = yield generateJWT(walletConnector, walletProvider, fetchPublicAddressOpts, publicWalletAddress, captchaToken);
             const decodedJwt = decodeJwt.decodeJwt(Jwt);
             if (decodedJwt === undefined)
-                throw new multiWallet.DynamicError('Invalid token!');
-            setToLS.setToLS(localStorage.LAST_USED_WALLET, walletConnector.name);
-            updatePrimaryWalletId(walletConnector, decodedJwt);
+                throw new utils.DynamicError('Invalid token!');
+            const user = yield createUserProfile.createUserProfile(decodedJwt);
             const isKycRequired = decodedJwt.missingFields.length;
-            if (verifyOnly && isKycRequired) {
-                setOnboardingOnlyJwt(Jwt);
+            setOnboardingOnlyJwt(Jwt);
+            setToLS.setToLS(localStorage.LAST_USED_WALLET, walletConnector.name);
+            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);
-                setView('collect-user-data');
-                return;
+                return setView('collect-user-data');
             }
-            const user = yield createUserProfile.createUserProfile(decodedJwt);
             index.storeAuthToken(Jwt);
+            setOnboardingOnlyJwt(undefined);
             setUser(user); // The user should only be set if no KYC is needed.
+            setShowAuthFlow(false);
             /* istanbul ignore else */
             if (verifyOnly) {
                 setCallback('authSuccess');
@@ -148,17 +161,6 @@ const useVerifyWallet = ({ consumeNonce, displayTermsOfService, environmentId, s
                 setView('wallet-list');
                 setCallback('linkSuccess');
             }
-            // Routes user to "Not Supported Network" screen if the user is not on the supported network
-            if (!_isSupportedNetwork) {
-                if (isProgrammableNetworkSwitchSupported.isProgrammableNetworkSwitchSupported(walletConnector)) {
-                    setView('network-not-supported');
-                }
-                else {
-                    setView('network-not-supported-manual');
-                }
-                return;
-            }
-            setShowAuthFlow(false);
         }
         catch (e) {
             handleError(e, walletConnector);

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

@@ -5,5 +5,5 @@ type UseVerifyWalletArgs = VerifyProps & ProjectSettingsProps & {
     displayTermsOfService: boolean;
     setIsSingleWalletAccount: Dispatch<SetStateAction<boolean>>;
 };
-export declare const useVerifyWallet: ({ consumeNonce, displayTermsOfService, environmentId, setIsSingleWalletAccount, }: UseVerifyWalletArgs) => ({ walletConnector, fetchPublicAddressOpts, publicWalletAddress, captchaToken, }: VerifyCallbackArgs) => Promise<void>;
+export declare const useVerifyWallet: ({ consumeNonce, displayTermsOfService, environmentId, projectSettings, setIsSingleWalletAccount, }: UseVerifyWalletArgs) => ({ walletConnector, fetchPublicAddressOpts, publicWalletAddress, captchaToken, }: VerifyCallbackArgs) => Promise<void>;
 export {};

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

@@ -1,7 +1,8 @@
 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';
@@ -25,7 +26,7 @@ import '../../../shared/consts/index.js';
 // This logic is used to both verify or link a wallet
 // Since we are re-using the different screens to authenticate or link the wallet.
 // This logic is the best place to determine whether we should verify or verify and link.
-const useVerifyWallet = ({ consumeNonce, displayTermsOfService, environmentId, setIsSingleWalletAccount, }) => {
+const useVerifyWallet = ({ consumeNonce, displayTermsOfService, environmentId, projectSettings, setIsSingleWalletAccount, }) => {
     const { setView } = useViewContext();
     const { setErrorMessage, setError } = useErrorContext();
     const { setUser, multiWalletWidgetState, debugError, multiWallet: multiWalletEnabled, appName, primaryWalletId, setCallback, setShowAuthFlow, setPrimaryWalletId, siweStatement, connectedWallet, authMode, setOnboardingOnlyJwt, authToken, loginWithEmail, } = useInternalDynamicContext();
@@ -54,20 +55,20 @@ const useVerifyWallet = ({ consumeNonce, displayTermsOfService, environmentId, s
         else {
             Jwt = yield linkWallet(environmentId, verifyArgs, authToken);
         }
-        if (Jwt === undefined) {
+        if (Jwt === undefined)
             throw new DynamicError('Could not obtain a valid JWT');
-        }
+        // TODO DYN-523: add verification here that the JWT is valid with the publicKey
         return Jwt;
     });
     // Overrides the stored primary wallet id when the
     // user logs in for the first time.
     // Or when the user is linking an additional
     // account on the same wallet as the primary wallet.
-    const updatePrimaryWalletId = (walletConnector, decodedJwt) => {
-        const newSelectedCredentialWallet = decodedJwt.verifiedCredentials.find((cred) => cred.id === decodedJwt.lastVerifiedCredentialId &&
+    const updatePrimaryWalletId = (walletConnector, user) => {
+        const newSelectedCredentialWallet = user.verifiedCredentials.find((cred) => cred.id === user.lastVerifiedCredentialId &&
             cred.format === 'blockchain');
         if (newSelectedCredentialWallet) {
-            const currentPrimaryWallet = decodedJwt.verifiedCredentials.find((a) => a.id === primaryWalletId);
+            const currentPrimaryWallet = user.verifiedCredentials.find((a) => a.id === primaryWalletId);
             if (verifyOnly ||
                 primaryWalletId === undefined ||
                 (multiWalletWidgetState === 'awaiting_signature' &&
@@ -82,7 +83,7 @@ const useVerifyWallet = ({ consumeNonce, displayTermsOfService, environmentId, s
     const handleError = (e, walletConnector) => {
         // 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,11 +93,11 @@ const useVerifyWallet = ({ consumeNonce, displayTermsOfService, environmentId, s
             return;
         }
         walletConnector.endSession();
-        if (e.name === 'ChainalysisError') {
+        if (e instanceof ChainalysisError) {
             setView('chainalysis-blocked-wallet');
             return;
         }
-        if (e.name === 'NoAccessError') {
+        if (e instanceof NoAccessError) {
             setView('no-access');
             return;
         }
@@ -124,18 +125,30 @@ const useVerifyWallet = ({ consumeNonce, displayTermsOfService, environmentId, s
             const decodedJwt = decodeJwt(Jwt);
             if (decodedJwt === undefined)
                 throw new DynamicError('Invalid token!');
-            setToLS(LAST_USED_WALLET, walletConnector.name);
-            updatePrimaryWalletId(walletConnector, decodedJwt);
+            const user = yield createUserProfile(decodedJwt);
             const isKycRequired = decodedJwt.missingFields.length;
-            if (verifyOnly && isKycRequired) {
-                setOnboardingOnlyJwt(Jwt);
+            setOnboardingOnlyJwt(Jwt);
+            setToLS(LAST_USED_WALLET, walletConnector.name);
+            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);
-                setView('collect-user-data');
-                return;
+                return setView('collect-user-data');
             }
-            const user = yield createUserProfile(decodedJwt);
             storeAuthToken(Jwt);
+            setOnboardingOnlyJwt(undefined);
             setUser(user); // The user should only be set if no KYC is needed.
+            setShowAuthFlow(false);
             /* istanbul ignore else */
             if (verifyOnly) {
                 setCallback('authSuccess');
@@ -144,17 +157,6 @@ const useVerifyWallet = ({ consumeNonce, displayTermsOfService, environmentId, s
                 setView('wallet-list');
                 setCallback('linkSuccess');
             }
-            // Routes user to "Not Supported Network" screen if the user is not on the supported network
-            if (!_isSupportedNetwork) {
-                if (isProgrammableNetworkSwitchSupported(walletConnector)) {
-                    setView('network-not-supported');
-                }
-                else {
-                    setView('network-not-supported-manual');
-                }
-                return;
-            }
-            setShowAuthFlow(false);
         }
         catch (e) {
             handleError(e, walletConnector);

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

@@ -5,6 +5,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 utils = require('@dynamic-labs/utils');
 var decodeJwt = require('../../../shared/utils/functions/decodeJwt/decodeJwt.cjs');
 var logger = require('../../../shared/logger.cjs');
 require('@dynamic-labs/iconic');
@@ -89,7 +90,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 };

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/multi-wallet';
+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';

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

@@ -18,6 +18,6 @@ export type UseWalletEventListenersArgs = {
 };
 export declare const useWalletEventListeners: ({ computeConnectedStateForWallets, handleLogOut, multiWallet, multiWalletWidgetState, primaryWallet, secondaryWallets, selectedWalletConnector, setSelectedWalletConnector, setMultiWalletWidgetState, user, setPrimaryWalletId, connectWalletByAddressAndChain, }: UseWalletEventListenersArgs) => {
     loadingNetwork: boolean;
-    network: number | undefined;
-    setNetwork: import("react").Dispatch<import("react").SetStateAction<number | undefined>>;
+    network: string | number | undefined;
+    setNetwork: import("react").Dispatch<import("react").SetStateAction<string | number | undefined>>;
 };

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

@@ -10,6 +10,7 @@ var useInternalDynamicContext = require('../../../context/DynamicContext/useInte
 var ErrorContext = require('../../../context/ErrorContext/ErrorContext.cjs');
 var ViewContext = require('../../../context/ViewContext/ViewContext.cjs');
 require('../../constants/colors.cjs');
+require('@dynamic-labs/utils');
 require('@dynamic-labs/sdk-api');
 require('../../../shared/logger.cjs');
 require('@dynamic-labs/iconic');