@dynamic-labs/sdk-react-core 1.0.0-alpha.0 → 1.0.0-alpha.10

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

@@ -10,7 +10,11 @@ type UseSocialAuthProps = {
 };
 export declare const useSocialAuth: ({ sessionTimeout, authMode, onSettled, onError, }: UseSocialAuthProps) => {
     readonly checkValidProvider: (provider: ProviderEnum) => boolean;
-    readonly connectSocialAccount: (provider: ProviderEnum, validator?: ((provider: ProviderEnum) => boolean) | undefined) => Promise<void>;
+    readonly connectSocialAccount: ({ provider, validator, captchaToken, }: {
+        provider: ProviderEnum;
+        validator?: ((provider: ProviderEnum) => boolean) | undefined;
+        captchaToken?: string | undefined;
+    }) => Promise<void>;
     readonly error: SocialOAuthError | undefined;
     readonly handleError: (code: SocialOAuthErrorCode, message: string) => void;
     readonly isProcessing: boolean;

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

@@ -6,6 +6,8 @@ import { SocialAccountAlreadyExistsError, NoAccessError } from '@dynamic-labs/ut
 import { useInternalDynamicContext } from '../../../context/DynamicContext/useInternalDynamicContext.js';
 import { getOAuthResult, verifyOAuth, signInOAuth } from '../../../data/api.js';
 import { useUpdateUserProfileByJWTCallback } from '../useUpdateUserProfileByJWTCallback/useUpdateUserProfileByJWTCallback.js';
+import { digestSHA256 } from '../../functions/digestSHA256/digestSHA256.js';
+import { encodeBase64URL } from '../../functions/encodeBase64URL/encodeBase64URL.js';
 import { decodeJwt } from '../../../shared/utils/functions/decodeJwt/decodeJwt.js';
 import '@dynamic-labs/iconic';
 import '@dynamic-labs/wallet-connector-core';
@@ -19,12 +21,10 @@ import 'viem';
 import '../../../shared/consts/index.js';
 import '@dynamic-labs/multi-wallet';
 import { getAuthToken } from '../../functions/getAuthToken/getAuthToken.js';
-import { randomString } from '../../functions/randomString/randomString.js';
-import { stringifyURIQuery } from '../../functions/stringifyURIQuery/stringifyURIQuery.js';
-import { digestSHA256 } from '../../functions/digestSHA256/digestSHA256.js';
-import { encodeBase64URL } from '../../functions/encodeBase64URL/encodeBase64URL.js';
 import { getOauthLoginUrl } from '../../functions/getOauthLoginUrl/getOauthLoginUrl.js';
 import { getProviderByType } from '../../functions/getProviderByType/getProviderByType.js';
+import { randomString } from '../../functions/randomString/randomString.js';
+import { stringifyURIQuery } from '../../functions/stringifyURIQuery/stringifyURIQuery.js';
 import { useCreateUserProfileByJWTCallback } from '../useCreateUserProfileByJWTCallback/useCreateUserProfileByJWTCallback.js';
 import { useErrorContext } from '../../../context/ErrorContext/ErrorContext.js';
 import { useEmbeddedWallet } from '../useEmbeddedWallet/useEmbeddedWallet.js';
@@ -121,10 +121,11 @@ const useSocialAuth = ({ sessionTimeout, authMode, onSettled, onError, }) => {
             }
         }
     });
-    const signInAccount = (provider, code, verifier, state) => __awaiter(void 0, void 0, void 0, function* () {
+    const signInAccount = (provider, code, verifier, state, captchaToken) => __awaiter(void 0, void 0, void 0, function* () {
         var _b;
         try {
             const jwt = yield signInOAuth(environmentId, provider, {
+                captchaToken,
                 code,
                 codeVerifier: verifier,
                 state,
@@ -166,7 +167,7 @@ const useSocialAuth = ({ sessionTimeout, authMode, onSettled, onError, }) => {
             handleError(SocialOAuthErrorCode.GENERAL_ERROR, error);
         }
     });
-    const connectSocialAccount = (provider, validator) => __awaiter(void 0, void 0, void 0, function* () {
+    const connectSocialAccount = ({ provider, validator, captchaToken, }) => __awaiter(void 0, void 0, void 0, function* () {
         var _c, _d;
         clearInterval(authWindowInterval.current);
         clearError();
@@ -249,7 +250,7 @@ const useSocialAuth = ({ sessionTimeout, authMode, onSettled, onError, }) => {
                 return;
             }
             if (authMode === 'signin') {
-                yield signInAccount(provider, code, verifier, state);
+                yield signInAccount(provider, code, verifier, state, captchaToken);
             }
             else {
                 yield linkAccount(provider, code, verifier, state);

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

@@ -26,6 +26,8 @@ var usePromise = require('../usePromise/usePromise.cjs');
 const useTransactionEstimatedGas = (provider, transaction) => usePromise.usePromise(() => _tslib.__awaiter(void 0, void 0, void 0, function* () {
     const { from } = transaction, transactionWithoutFrom = _tslib.__rest(transaction, ["from"]);
     return provider.estimateGas(Object.assign(Object.assign({}, transactionWithoutFrom), { account: from }));
-}), { deps: [transaction, provider] });
+}), {
+    deps: [transaction, provider],
+});
 
 exports.useTransactionEstimatedGas = useTransactionEstimatedGas;

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

@@ -22,6 +22,8 @@ import { usePromise } from '../usePromise/usePromise.js';
 const useTransactionEstimatedGas = (provider, transaction) => usePromise(() => __awaiter(void 0, void 0, void 0, function* () {
     const { from } = transaction, transactionWithoutFrom = __rest(transaction, ["from"]);
     return provider.estimateGas(Object.assign(Object.assign({}, transactionWithoutFrom), { account: from }));
-}), { deps: [transaction, provider] });
+}), {
+    deps: [transaction, provider],
+});
 
 export { useTransactionEstimatedGas };

package/src/lib/utils/hooks/useUserUpdateRequest/useUpdateUser/useUpdateUser.cjs

@@ -15,18 +15,18 @@ require('react/jsx-runtime');
 require('../../../../context/ViewContext/ViewContext.cjs');
 require('../../../../shared/logger.cjs');
 require('@dynamic-labs/wallet-book');
-require('@dynamic-labs/utils');
 require('../../../constants/colors.cjs');
 require('../../../../shared/utils/classes/storage/localStorage.cjs');
 require('viem');
+require('@dynamic-labs/utils');
 require('../../../../shared/consts/index.cjs');
 var isEmailVerificationRequired = require('../../../functions/authenication/isEmailVerificationRequired/isEmailVerificationRequired.cjs');
+require('../../../../context/CaptchaContext/CaptchaContext.cjs');
 require('../../../../context/ErrorContext/ErrorContext.cjs');
 require('@dynamic-labs/multi-wallet');
 require('@dynamic-labs/sdk-api');
 require('../../../../context/AccessDeniedContext/AccessDeniedContext.cjs');
 require('../../../../context/AccountExistsContext/AccountExistsContext.cjs');
-require('../../../../context/CaptchaContext/CaptchaContext.cjs');
 var useEmailVerificationRequest = require('../../authenticationHooks/useEmailVerificationRequest/useEmailVerificationRequest.cjs');
 var useUpdateUserProfileByJWTCallback = require('../../useUpdateUserProfileByJWTCallback/useUpdateUserProfileByJWTCallback.cjs');
 
@@ -46,6 +46,7 @@ const userFieldsSchema = yup.object().shape({
     kdaWallet: yup.string(),
     lastName: yup.string(),
     ltcWallet: yup.string(),
+    metadata: yup.object(),
     newsletterNotification: yup.boolean(),
     phoneNumber: yup.string(),
     tShirtSize: yup.string(),
@@ -60,10 +61,13 @@ const useUpdateUser = (validationSchemaStripUnknown) => {
     const { updateUserProfileByJWT } = useUpdateUserProfileByJWTCallback.useUpdateUserProfileByJWTCallback();
     return React.useCallback((userFields, userEnvironmentId) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
         var _a, _b, _c;
+        // `stripUnknown: true` will automatically strip out any values in the metadata object
+        // so we need to pull out the metadata object here and then re-add it after stripping unknown fields
+        const { metadata } = userFields;
         const validatedUserFields = yield userFieldsSchema.validate(userFields, {
             stripUnknown: validationSchemaStripUnknown,
         });
-        const updateUserProfileResponse = yield api.updateUserProfileFields(jwtToken, userEnvironmentId || environmentId, validatedUserFields);
+        const updateUserProfileResponse = yield api.updateUserProfileFields(jwtToken, userEnvironmentId || environmentId, Object.assign(Object.assign({}, validatedUserFields), { metadata }));
         // check if decoded JWT still somehow has missing fields, we can't proceed if it does
         const decodedJwt = decodeJwt.decodeJwt(updateUserProfileResponse.jwt);
         const missingFields = (_a = decodedJwt === null || decodedJwt === void 0 ? void 0 : decodedJwt.missingFields) !== null && _a !== void 0 ? _a : [];

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

@@ -11,18 +11,18 @@ import 'react/jsx-runtime';
 import '../../../../context/ViewContext/ViewContext.js';
 import '../../../../shared/logger.js';
 import '@dynamic-labs/wallet-book';
-import '@dynamic-labs/utils';
 import '../../../constants/colors.js';
 import '../../../../shared/utils/classes/storage/localStorage.js';
 import 'viem';
+import '@dynamic-labs/utils';
 import '../../../../shared/consts/index.js';
 import { isEmailVerificationRequired } from '../../../functions/authenication/isEmailVerificationRequired/isEmailVerificationRequired.js';
+import '../../../../context/CaptchaContext/CaptchaContext.js';
 import '../../../../context/ErrorContext/ErrorContext.js';
 import '@dynamic-labs/multi-wallet';
 import '@dynamic-labs/sdk-api';
 import '../../../../context/AccessDeniedContext/AccessDeniedContext.js';
 import '../../../../context/AccountExistsContext/AccountExistsContext.js';
-import '../../../../context/CaptchaContext/CaptchaContext.js';
 import { useEmailVerificationRequest } from '../../authenticationHooks/useEmailVerificationRequest/useEmailVerificationRequest.js';
 import { useUpdateUserProfileByJWTCallback } from '../../useUpdateUserProfileByJWTCallback/useUpdateUserProfileByJWTCallback.js';
 
@@ -42,6 +42,7 @@ const userFieldsSchema = object().shape({
     kdaWallet: string(),
     lastName: string(),
     ltcWallet: string(),
+    metadata: object(),
     newsletterNotification: boolean(),
     phoneNumber: string(),
     tShirtSize: string(),
@@ -56,10 +57,13 @@ const useUpdateUser = (validationSchemaStripUnknown) => {
     const { updateUserProfileByJWT } = useUpdateUserProfileByJWTCallback();
     return useCallback((userFields, userEnvironmentId) => __awaiter(void 0, void 0, void 0, function* () {
         var _a, _b, _c;
+        // `stripUnknown: true` will automatically strip out any values in the metadata object
+        // so we need to pull out the metadata object here and then re-add it after stripping unknown fields
+        const { metadata } = userFields;
         const validatedUserFields = yield userFieldsSchema.validate(userFields, {
             stripUnknown: validationSchemaStripUnknown,
         });
-        const updateUserProfileResponse = yield updateUserProfileFields(jwtToken, userEnvironmentId || environmentId, validatedUserFields);
+        const updateUserProfileResponse = yield updateUserProfileFields(jwtToken, userEnvironmentId || environmentId, Object.assign(Object.assign({}, validatedUserFields), { metadata }));
         // check if decoded JWT still somehow has missing fields, we can't proceed if it does
         const decodedJwt = decodeJwt(updateUserProfileResponse.jwt);
         const missingFields = (_a = decodedJwt === null || decodedJwt === void 0 ? void 0 : decodedJwt.missingFields) !== null && _a !== void 0 ? _a : [];

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

@@ -11,10 +11,10 @@ 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('viem');
+require('@dynamic-labs/utils');
 require('../../../shared/consts/index.cjs');
 
 const useValidateSession = ({ handleLogOut, user, authToken, walletConnectV1Bridge, walletConnectors, wcVersion, }) => {
@@ -61,7 +61,9 @@ const useValidateSession = ({ handleLogOut, user, authToken, walletConnectV1Brid
             oldBridge: currentWalletConnectV1Bridge,
         });
     });
-    const hasWCV1Data = localStorage.LocalStorage.getKeys().some((key) => key.startsWith('walletconnect') || key.startsWith('walletlink'));
+    // Pera Wallet uses WC v1 and sets a 'walletconnect' key in localStorage
+    // so we can't just check for a key starting with 'walletconnect'
+    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 ||

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

@@ -7,10 +7,10 @@ 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 'viem';
+import '@dynamic-labs/utils';
 import '../../../shared/consts/index.js';
 
 const useValidateSession = ({ handleLogOut, user, authToken, walletConnectV1Bridge, walletConnectors, wcVersion, }) => {
@@ -57,7 +57,9 @@ const useValidateSession = ({ handleLogOut, user, authToken, walletConnectV1Brid
             oldBridge: currentWalletConnectV1Bridge,
         });
     });
-    const hasWCV1Data = LocalStorage.getKeys().some((key) => key.startsWith('walletconnect') || key.startsWith('walletlink'));
+    // Pera Wallet uses WC v1 and sets a 'walletconnect' key in localStorage
+    // so we can't just check for a key starting with 'walletconnect'
+    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 ||

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

@@ -3,15 +3,17 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 var _tslib = require('../../../../../_virtual/_tslib.cjs');
-var walletConnectorCore = require('@dynamic-labs/wallet-connector-core');
 var utils = require('@dynamic-labs/utils');
+var walletConnectorCore = require('@dynamic-labs/wallet-connector-core');
+var AccessDeniedContext = require('../../../context/AccessDeniedContext/AccessDeniedContext.cjs');
+var AccountExistsContext = require('../../../context/AccountExistsContext/AccountExistsContext.cjs');
+var useInternalDynamicContext = require('../../../context/DynamicContext/useInternalDynamicContext.cjs');
+var ErrorContext = require('../../../context/ErrorContext/ErrorContext.cjs');
+var ViewContext = require('../../../context/ViewContext/ViewContext.cjs');
 var api = require('../../../data/api.cjs');
-var index = require('../../functions/storeAuthToken/index.cjs');
-require('@dynamic-labs/multi-wallet');
 var decodeJwt = require('../../../shared/utils/functions/decodeJwt/decodeJwt.cjs');
 require('@dynamic-labs/iconic');
 require('react/jsx-runtime');
-var ViewContext = require('../../../context/ViewContext/ViewContext.cjs');
 require('react');
 var logger = require('../../../shared/logger.cjs');
 require('@dynamic-labs/wallet-book');
@@ -20,15 +22,13 @@ require('../../constants/colors.cjs');
 var localStorage = require('../../../shared/utils/classes/storage/localStorage.cjs');
 require('viem');
 require('../../../shared/consts/index.cjs');
-var getVerifyArgs = require('../../functions/getVerifyArgs/getVerifyArgs.cjs');
 var createUserProfile = require('../../functions/createUserProfile/createUserProfile.cjs');
+require('@dynamic-labs/multi-wallet');
 require('@dynamic-labs/sdk-api');
-var useInternalDynamicContext = require('../../../context/DynamicContext/useInternalDynamicContext.cjs');
-var ErrorContext = require('../../../context/ErrorContext/ErrorContext.cjs');
+var getVerifyArgs = require('../../functions/getVerifyArgs/getVerifyArgs.cjs');
+var index = require('../../functions/storeAuthToken/index.cjs');
 var getSiweStatement = require('../../functions/getSiweStatement/getSiweStatement.cjs');
 var getWalletProvider = require('../../functions/getWalletProvider/getWalletProvider.cjs');
-var AccessDeniedContext = require('../../../context/AccessDeniedContext/AccessDeniedContext.cjs');
-var AccountExistsContext = require('../../../context/AccountExistsContext/AccountExistsContext.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.
@@ -38,7 +38,7 @@ const useVerifyWallet = ({ consumeNonce, displaySiweStatement, environmentId, pr
     const { setExistentAccountData } = AccountExistsContext.useAccountExistsContext();
     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, removeConnectedWalletsInfo, setIsVerificationInProgress, eventsCallbacks, } = useInternalDynamicContext.useInternalDynamicContext();
+    const { setUser, multiWalletWidgetState, debugError, multiWallet: multiWalletEnabled, appName, primaryWalletId, setCallback, setShowAuthFlow, setPrimaryWalletId, siweStatement, connectedWallets, authMode, setOnboardingOnlyJwt, authToken, setAuthMode, removeConnectedWalletsInfo, setIsVerificationInProgress, eventsCallbacks, } = 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.
@@ -136,7 +136,7 @@ const useVerifyWallet = ({ consumeNonce, displaySiweStatement, environmentId, pr
             setView('account-exists');
             return;
         }
-        if (connectedWallet && authMode === 'connect-only') {
+        if (connectedWallets.length && authMode === 'connect-only') {
             throw new utils.DynamicError(e.message);
         }
         goToInitialView();
@@ -187,7 +187,9 @@ const useVerifyWallet = ({ consumeNonce, displaySiweStatement, environmentId, pr
             }
             else {
                 setView('wallet-list');
-                setCallback('linkSuccess');
+                setCallback('linkSuccess', {
+                    walletId: decodedJwt.lastVerifiedCredentialId,
+                });
             }
         }
         catch (e) {

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

@@ -1,5 +1,5 @@
 import { Dispatch, SetStateAction } from 'react';
-import { ProjectSettingsProps, VerifyProps, VerifyCallbackArgs } from '../../../shared/types';
+import { ProjectSettingsProps, VerifyCallbackArgs, VerifyProps } from '../../../shared/types';
 type UseVerifyWalletArgs = VerifyProps & ProjectSettingsProps & {
     consumeNonce: () => string | undefined;
     displaySiweStatement: boolean;

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

@@ -1,13 +1,15 @@
 import { __awaiter } from '../../../../../_virtual/_tslib.js';
-import { isSocialWalletConnector } from '@dynamic-labs/wallet-connector-core';
 import { DynamicError, WalletUsedError, ChainalysisError, GateBlockedError, NoAccessError, AccountExistsError } from '@dynamic-labs/utils';
+import { isSocialWalletConnector } from '@dynamic-labs/wallet-connector-core';
+import { useAccessDeniedContext } from '../../../context/AccessDeniedContext/AccessDeniedContext.js';
+import { useAccountExistsContext } from '../../../context/AccountExistsContext/AccountExistsContext.js';
+import { useInternalDynamicContext } from '../../../context/DynamicContext/useInternalDynamicContext.js';
+import { useErrorContext } from '../../../context/ErrorContext/ErrorContext.js';
+import { useViewContext } from '../../../context/ViewContext/ViewContext.js';
 import { verifyWallet, linkWallet } from '../../../data/api.js';
-import { storeAuthToken } from '../../functions/storeAuthToken/index.js';
-import '@dynamic-labs/multi-wallet';
 import { decodeJwt } from '../../../shared/utils/functions/decodeJwt/decodeJwt.js';
 import '@dynamic-labs/iconic';
 import 'react/jsx-runtime';
-import { useViewContext } from '../../../context/ViewContext/ViewContext.js';
 import 'react';
 import { logger } from '../../../shared/logger.js';
 import '@dynamic-labs/wallet-book';
@@ -16,15 +18,13 @@ import '../../constants/colors.js';
 import { LocalStorage } from '../../../shared/utils/classes/storage/localStorage.js';
 import 'viem';
 import '../../../shared/consts/index.js';
-import { getVerifyArgs } from '../../functions/getVerifyArgs/getVerifyArgs.js';
 import { createUserProfile } from '../../functions/createUserProfile/createUserProfile.js';
+import '@dynamic-labs/multi-wallet';
 import '@dynamic-labs/sdk-api';
-import { useInternalDynamicContext } from '../../../context/DynamicContext/useInternalDynamicContext.js';
-import { useErrorContext } from '../../../context/ErrorContext/ErrorContext.js';
+import { getVerifyArgs } from '../../functions/getVerifyArgs/getVerifyArgs.js';
+import { storeAuthToken } from '../../functions/storeAuthToken/index.js';
 import { getSiweStatement } from '../../functions/getSiweStatement/getSiweStatement.js';
 import { getWalletProvider } from '../../functions/getWalletProvider/getWalletProvider.js';
-import { useAccessDeniedContext } from '../../../context/AccessDeniedContext/AccessDeniedContext.js';
-import { useAccountExistsContext } from '../../../context/AccountExistsContext/AccountExistsContext.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.
@@ -34,7 +34,7 @@ const useVerifyWallet = ({ consumeNonce, displaySiweStatement, environmentId, pr
     const { setExistentAccountData } = useAccountExistsContext();
     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, removeConnectedWalletsInfo, setIsVerificationInProgress, eventsCallbacks, } = useInternalDynamicContext();
+    const { setUser, multiWalletWidgetState, debugError, multiWallet: multiWalletEnabled, appName, primaryWalletId, setCallback, setShowAuthFlow, setPrimaryWalletId, siweStatement, connectedWallets, authMode, setOnboardingOnlyJwt, authToken, setAuthMode, removeConnectedWalletsInfo, setIsVerificationInProgress, eventsCallbacks, } = 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.
@@ -132,7 +132,7 @@ const useVerifyWallet = ({ consumeNonce, displaySiweStatement, environmentId, pr
             setView('account-exists');
             return;
         }
-        if (connectedWallet && authMode === 'connect-only') {
+        if (connectedWallets.length && authMode === 'connect-only') {
             throw new DynamicError(e.message);
         }
         goToInitialView();
@@ -183,7 +183,9 @@ const useVerifyWallet = ({ consumeNonce, displaySiweStatement, environmentId, pr
             }
             else {
                 setView('wallet-list');
-                setCallback('linkSuccess');
+                setCallback('linkSuccess', {
+                    walletId: decodedJwt.lastVerifiedCredentialId,
+                });
             }
         }
         catch (e) {

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

@@ -30,7 +30,6 @@ const useWalletConnectorEvent = (eventEmitters, eventName, handler) => {
             return () => emitter.off(eventName, callback);
         });
         return () => unsubscribeCallbacks.forEach((unsubscribe) => unsubscribe());
-        // eslint-disable-next-line react-hooks/exhaustive-deps
     }, [eventEmitters, eventName]);
 };
 

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

@@ -26,7 +26,6 @@ const useWalletConnectorEvent = (eventEmitters, eventName, handler) => {
             return () => emitter.off(eventName, callback);
         });
         return () => unsubscribeCallbacks.forEach((unsubscribe) => unsubscribe());
-        // eslint-disable-next-line react-hooks/exhaustive-deps
     }, [eventEmitters, eventName]);
 };
 

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

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

package/src/lib/utils/hooks/{useWallets/useWallets.cjs → useWalletConnectorOptions/useWalletConnectorOptions.cjs}

@@ -6,8 +6,8 @@ var React = require('react');
 var data = require('../../../views/WalletList/data.cjs');
 var verifyMagicIsSetup = require('./utils/verifyMagicIsSetup/verifyMagicIsSetup.cjs');
 
-const useWallets = ({ projectSettings, appLogoUrl, appName, deepLinkPreference, flowNetwork, networkConfigurations, walletBook, walletConnectV1Bridge, walletUiUtils, walletConnectorsProp, walletConnectPreferredChains, walletConnectorExtensions, }) => {
-    const wallets = React.useMemo(() => {
+const useWalletConnectorOptions = ({ projectSettings, appLogoUrl, appName, deepLinkPreference, flowNetwork, networkConfigurations, walletBook, walletConnectV1Bridge, walletUiUtils, walletConnectorsProp, walletConnectPreferredChains, walletConnectorExtensions, }) => {
+    const walletConnectorOptions = React.useMemo(() => {
         if (!projectSettings ||
             !Object.keys(walletBook !== null && walletBook !== void 0 ? walletBook : {}).length ||
             !networkConfigurations)
@@ -33,7 +33,6 @@ const useWallets = ({ projectSettings, appLogoUrl, appName, deepLinkPreference,
     }, [
         appLogoUrl,
         appName,
-        networkConfigurations,
         projectSettings,
         walletConnectorsProp,
         walletConnectV1Bridge,
@@ -43,11 +42,11 @@ const useWallets = ({ projectSettings, appLogoUrl, appName, deepLinkPreference,
         networkConfigurations,
     ]);
     React.useEffect(() => {
-        if (!projectSettings || wallets.length === 0)
+        if (!projectSettings || walletConnectorOptions.length === 0)
             return;
-        verifyMagicIsSetup.verifyMagicIsSetup(projectSettings, wallets.map(({ walletConnector }) => walletConnector));
-    }, [wallets, projectSettings]);
-    return { wallets };
+        verifyMagicIsSetup.verifyMagicIsSetup(projectSettings, walletConnectorOptions.map(({ walletConnector }) => walletConnector));
+    }, [walletConnectorOptions, projectSettings]);
+    return { walletConnectorOptions };
 };
 
-exports.useWallets = useWallets;
+exports.useWalletConnectorOptions = useWalletConnectorOptions;

package/src/lib/utils/hooks/{useWallets/useWallets.d.ts → useWalletConnectorOptions/useWalletConnectorOptions.d.ts}

@@ -16,7 +16,7 @@ type Props = {
     walletUiUtils: WalletUiUtils<WalletConnector>;
     walletConnectorExtensions?: WalletConnectorExtension[];
 };
-export declare const useWallets: ({ projectSettings, appLogoUrl, appName, deepLinkPreference, flowNetwork, networkConfigurations, walletBook, walletConnectV1Bridge, walletUiUtils, walletConnectorsProp, walletConnectPreferredChains, walletConnectorExtensions, }: Props) => {
-    wallets: import("../../../shared").WalletOption[];
+export declare const useWalletConnectorOptions: ({ projectSettings, appLogoUrl, appName, deepLinkPreference, flowNetwork, networkConfigurations, walletBook, walletConnectV1Bridge, walletUiUtils, walletConnectorsProp, walletConnectPreferredChains, walletConnectorExtensions, }: Props) => {
+    walletConnectorOptions: import("../../../shared").WalletOption[];
 };
 export {};

package/src/lib/utils/hooks/{useWallets/useWallets.js → useWalletConnectorOptions/useWalletConnectorOptions.js}

@@ -2,8 +2,8 @@ import { useMemo, useEffect } from 'react';
 import { getWallets } from '../../../views/WalletList/data.js';
 import { verifyMagicIsSetup } from './utils/verifyMagicIsSetup/verifyMagicIsSetup.js';
 
-const useWallets = ({ projectSettings, appLogoUrl, appName, deepLinkPreference, flowNetwork, networkConfigurations, walletBook, walletConnectV1Bridge, walletUiUtils, walletConnectorsProp, walletConnectPreferredChains, walletConnectorExtensions, }) => {
-    const wallets = useMemo(() => {
+const useWalletConnectorOptions = ({ projectSettings, appLogoUrl, appName, deepLinkPreference, flowNetwork, networkConfigurations, walletBook, walletConnectV1Bridge, walletUiUtils, walletConnectorsProp, walletConnectPreferredChains, walletConnectorExtensions, }) => {
+    const walletConnectorOptions = useMemo(() => {
         if (!projectSettings ||
             !Object.keys(walletBook !== null && walletBook !== void 0 ? walletBook : {}).length ||
             !networkConfigurations)
@@ -29,7 +29,6 @@ const useWallets = ({ projectSettings, appLogoUrl, appName, deepLinkPreference,
     }, [
         appLogoUrl,
         appName,
-        networkConfigurations,
         projectSettings,
         walletConnectorsProp,
         walletConnectV1Bridge,
@@ -39,11 +38,11 @@ const useWallets = ({ projectSettings, appLogoUrl, appName, deepLinkPreference,
         networkConfigurations,
     ]);
     useEffect(() => {
-        if (!projectSettings || wallets.length === 0)
+        if (!projectSettings || walletConnectorOptions.length === 0)
             return;
-        verifyMagicIsSetup(projectSettings, wallets.map(({ walletConnector }) => walletConnector));
-    }, [wallets, projectSettings]);
-    return { wallets };
+        verifyMagicIsSetup(projectSettings, walletConnectorOptions.map(({ walletConnector }) => walletConnector));
+    }, [walletConnectorOptions, projectSettings]);
+    return { walletConnectorOptions };
 };
 
-export { useWallets };
+export { useWalletConnectorOptions };

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

@@ -11,10 +11,10 @@ require('react/jsx-runtime');
 require('../../../context/ViewContext/ViewContext.cjs');
 require('react');
 require('@dynamic-labs/wallet-book');
-require('@dynamic-labs/utils');
 require('../../constants/colors.cjs');
 require('../../../shared/utils/classes/storage/localStorage.cjs');
 require('viem');
+require('@dynamic-labs/utils');
 require('../../../shared/consts/index.cjs');
 require('@dynamic-labs/multi-wallet');
 var getReferencedAccount = require('../../functions/getReferencedAccount/getReferencedAccount.cjs');

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

@@ -7,10 +7,10 @@ import 'react/jsx-runtime';
 import '../../../context/ViewContext/ViewContext.js';
 import 'react';
 import '@dynamic-labs/wallet-book';
-import '@dynamic-labs/utils';
 import '../../constants/colors.js';
 import '../../../shared/utils/classes/storage/localStorage.js';
 import 'viem';
+import '@dynamic-labs/utils';
 import '../../../shared/consts/index.js';
 import '@dynamic-labs/multi-wallet';
 import { getReferencedAccount } from '../../functions/getReferencedAccount/getReferencedAccount.js';

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

@@ -4,8 +4,8 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var _tslib = require('../../../../../_virtual/_tslib.cjs');
 var React = require('react');
-var walletConnectorCore = require('@dynamic-labs/wallet-connector-core');
 var utils = require('@dynamic-labs/utils');
+var walletConnectorCore = require('@dynamic-labs/wallet-connector-core');
 require('@dynamic-labs/sdk-api');
 var logger = require('../../../shared/logger.cjs');
 require('@dynamic-labs/iconic');
@@ -18,10 +18,10 @@ require('viem');
 require('../../../shared/consts/index.cjs');
 var isSameWalletName = require('../../functions/isSameWalletName/isSameWalletName.cjs');
 var useWalletsConnectionState = require('../useWalletsConnectionState/useWalletsConnectionState.cjs');
-var createLinkedWalletsFromWalletOptions = require('./utils/createLinkedWalletsFromWalletOptions/createLinkedWalletsFromWalletOptions.cjs');
 var reconnectSocialWallet = require('./reconnectSocialWallet.cjs');
+var createLinkedWalletsFromWalletOptions = require('./utils/createLinkedWalletsFromWalletOptions/createLinkedWalletsFromWalletOptions.cjs');
 
-const useWalletConnectors = ({ authMode, authToken, connectedWallets, wallets: availableWallets, multiWalletWidgetState, setDesktopUri, setMultiWalletWidgetState, setQrcodeUri, primaryWalletId, setPrimaryWalletId, user, onboardingOnlyJwt, canHaveMultipleWalletsConnected, }) => {
+const useWalletConnectors = ({ authMode, authToken, connectedWallets, walletConnectorOptions, multiWalletWidgetState, setDesktopUri, setMultiWalletWidgetState, setQrcodeUri, primaryWalletId, setPrimaryWalletId, user, onboardingOnlyJwt, canHaveMultipleWalletsConnected, }) => {
     const [showQrcodeModal, setShowQrcodeModal] = React.useState(false);
     const linkedWallets = React.useMemo(() => {
         if (!authToken) {
@@ -30,9 +30,9 @@ const useWalletConnectors = ({ authMode, authToken, connectedWallets, wallets: a
         return createLinkedWalletsFromWalletOptions.createLinkedWalletsFromWalletOptions({
             authToken,
             primaryWalletId,
-            walletOptions: availableWallets,
+            walletConnectorOptions,
         });
-    }, [authToken, primaryWalletId, availableWallets]);
+    }, [authToken, primaryWalletId, walletConnectorOptions]);
     const walletsBasedOnAuthMode = React.useMemo(() => {
         // Before signing the first message we are using connected wallets list
         // This is because we want the first connected wallet to have events applied by useWalletEventListeners
@@ -42,6 +42,14 @@ const useWalletConnectors = ({ authMode, authToken, connectedWallets, wallets: a
         if (authMode === 'connect-and-sign' && (user || onboardingOnlyJwt)) {
             return linkedWallets;
         }
+        /**
+         * This is to handle users in connect-only who are signing in with social/email
+         * with an embedded wallet
+         */
+        if (authMode === 'connect-only' &&
+            linkedWallets.find((wallet) => walletConnectorCore.isEmbeddedConnector(wallet.connector))) {
+            return linkedWallets;
+        }
         return connectedWallets;
     }, [authMode, connectedWallets, linkedWallets, user, onboardingOnlyJwt]);
     /**
@@ -54,13 +62,10 @@ const useWalletConnectors = ({ authMode, authToken, connectedWallets, wallets: a
     React.useEffect(() => walletsBasedOnAuthMode.forEach((wallet) => {
         wallet.connector.initEventListener();
     }), [walletsBasedOnAuthMode]);
-    const { connectedWalletMap, computeConnectedStateForWallets, didConnectedStateLoad, } = useWalletsConnectionState.useWalletsConnectionState(walletsBasedOnAuthMode);
+    const { connectedWalletMap, didConnectedStateLoad } = useWalletsConnectionState.useWalletsConnectionState(walletsBasedOnAuthMode);
     const wallets = React.useMemo(() => walletsBasedOnAuthMode.map((wallet) => (Object.assign(Object.assign({}, wallet), { connected: Boolean(connectedWalletMap[wallet.id]) }))), [connectedWalletMap, walletsBasedOnAuthMode]);
-    React.useEffect(() => {
-        computeConnectedStateForWallets();
-    }, [primaryWalletId, computeConnectedStateForWallets]);
-    const getPrimaryWallet = React.useCallback(() => { var _a; return (_a = wallets.find((wallet) => wallet.id === primaryWalletId)) !== null && _a !== void 0 ? _a : null; }, [primaryWalletId, wallets]);
-    const getSecondaryWallets = React.useCallback(() => canHaveMultipleWalletsConnected
+    const primaryWallet = React.useMemo(() => { var _a; return (_a = wallets.find((wallet) => wallet.id === primaryWalletId)) !== null && _a !== void 0 ? _a : null; }, [primaryWalletId, wallets]);
+    const secondaryWallets = React.useMemo(() => canHaveMultipleWalletsConnected
         ? wallets.filter((wallet) => wallet.id !== primaryWalletId)
         : [], [primaryWalletId, wallets, canHaveMultipleWalletsConnected]);
     const getSelectedWallet = React.useCallback((walletId) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
@@ -97,7 +102,6 @@ const useWalletConnectors = ({ authMode, authToken, connectedWallets, wallets: a
         }
         if (primaryWalletId === walletId)
             return;
-        const primaryWallet = getPrimaryWallet();
         if (checkIfAccountChangeIsRequired(primaryWallet, newPrimaryWallet)) {
             yield newPrimaryWallet.connector.connect();
             setPrimaryWalletId(walletId);
@@ -149,7 +153,7 @@ const useWalletConnectors = ({ authMode, authToken, connectedWallets, wallets: a
         authToken,
         checkIfAccountChangeIsRequired,
         checkIfShowQrCodeModal,
-        getPrimaryWallet,
+        primaryWallet,
         getSelectedWallet,
         primaryWalletId,
         setDesktopUri,
@@ -157,18 +161,13 @@ const useWalletConnectors = ({ authMode, authToken, connectedWallets, wallets: a
         setPrimaryWalletId,
         setQrcodeUri,
     ]);
-    const walletConnectors = wallets.map((wallet) => wallet.connector);
     return {
-        computeConnectedStateForWallets,
         didConnectedStateLoad,
-        getPrimaryWallet,
-        getSecondaryWallets,
-        primaryWallet: getPrimaryWallet(),
-        secondaryWallets: getSecondaryWallets(),
+        primaryWallet,
+        secondaryWallets,
         setPrimaryWallet,
         setShowQrcodeModal,
         showQrcodeModal,
-        walletConnectors,
         wallets,
     };
 };