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

package/src/lib/utils/hooks/authenticationHooks/useConnectAndSignSplitSteps/useConnectAndSignSplitSteps.js

@@ -12,11 +12,11 @@ import '@dynamic-labs/wallet-connector-core';
 import 'react/jsx-runtime';
 import 'react';
 import '@dynamic-labs/wallet-book';
-import '@dynamic-labs/utils';
 import { LAST_USED_WALLET } from '../../../constants/localStorage.js';
 import '../../../constants/colors.js';
 import { LocalStorage } from '../../../../shared/utils/classes/storage/localStorage.js';
 import 'viem';
+import '@dynamic-labs/utils';
 import '../../../../shared/consts/index.js';
 import { useCaptchaContext } from '../../../../context/CaptchaContext/CaptchaContext.js';
 import { useHandleWalletsToConnect } from '../../useHandleWalletsToConnect/useHandleWalletsToConnect.js';
@@ -24,7 +24,7 @@ import { useHandleWalletsToConnect } from '../../useHandleWalletsToConnect/useHa
 const useConnectAndSignSplitSteps = () => {
     const { setView, goToInitialView } = useViewContext();
     const { setErrorMessage } = useErrorContext();
-    const { captchaToken } = useCaptchaContext();
+    const { getCaptchaToken, engageCaptcha } = useCaptchaContext();
     const { connectWallet, consumeNonce, displaySiweStatement, projectSettings, environmentId, setIsSingleWalletAccount, setShowAuthFlow, user, authMode, setCallback, setIsVerificationInProgress, } = useInternalDynamicContext();
     const { handleWalletsToConnect } = useHandleWalletsToConnect();
     const verifyWallet = useVerifyWallet({
@@ -44,15 +44,23 @@ const useConnectAndSignSplitSteps = () => {
         setIsVerificationInProgress(true);
         yield showPendingConnectView(walletConnector, setView);
         try {
-            yield connectWallet(walletConnector, fetchPublicAddressOpts);
-            setCallback('connectSuccess');
+            const connectionResult = yield connectWallet(walletConnector, fetchPublicAddressOpts);
+            setCallback('connectSuccess', {
+                walletId: connectionResult === null || connectionResult === void 0 ? void 0 : connectionResult.id,
+            });
             if (isConnectOnly(user, authMode)) {
                 LocalStorage.setToLS(LAST_USED_WALLET, walletConnector.key);
                 handleWalletsToConnect({ walletConnector });
                 return;
             }
             if ((_a = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.security.hCaptcha) === null || _a === void 0 ? void 0 : _a.enabled) {
-                setView('captcha');
+                engageCaptcha({
+                    authMethod: 'wallet',
+                    onCaptchaSuccess: (_captchaToken) => __awaiter(void 0, void 0, void 0, function* () {
+                        setShowAuthFlow(true);
+                        setView('pending-signature');
+                    }),
+                });
                 return;
             }
             setShowAuthFlow(true);
@@ -72,13 +80,13 @@ const useConnectAndSignSplitSteps = () => {
         // Raise verification ongoing flag
         setIsVerificationInProgress(true);
         try {
-            const publicWalletAddress = yield connectWallet(walletConnector, fetchPublicAddressOpts);
-            if (!publicWalletAddress) {
+            const connectionResult = yield connectWallet(walletConnector, fetchPublicAddressOpts);
+            if (!(connectionResult === null || connectionResult === void 0 ? void 0 : connectionResult.address)) {
                 return;
             }
             yield verifyWallet({
-                captchaToken,
-                publicWalletAddress,
+                captchaToken: getCaptchaToken(),
+                publicWalletAddress: connectionResult.address,
                 walletConnector,
             });
         }

package/src/lib/utils/hooks/authenticationHooks/useSignConnectOnlyUser/useSignConnectOnlyUser.cjs

@@ -14,16 +14,18 @@ require('@dynamic-labs/iconic');
 require('react/jsx-runtime');
 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');
+var CaptchaContext = require('../../../../context/CaptchaContext/CaptchaContext.cjs');
 
 const useSignConnectOnlyUser = () => {
     const { setView } = ViewContext.useViewContext();
     const { setErrorMessage } = ErrorContext.useErrorContext();
-    const { connectWallet, consumeNonce, displaySiweStatement, projectSettings, environmentId, setIsSingleWalletAccount, setShowAuthFlow, setSelectedWalletConnector, walletUiUtils, } = useInternalDynamicContext.useInternalDynamicContext();
+    const { getCaptchaToken } = CaptchaContext.useCaptchaContext();
+    const { connectWallet, consumeNonce, displaySiweStatement, projectSettings, environmentId, setIsSingleWalletAccount, setShowAuthFlow, setSelectedWalletConnectorKey, walletUiUtils, } = useInternalDynamicContext.useInternalDynamicContext();
     const verifyWallet = useVerifyWallet.useVerifyWallet({
         consumeNonce,
         displaySiweStatement,
@@ -41,17 +43,18 @@ const useSignConnectOnlyUser = () => {
             // We need this because in connect-only we don't want to show wallet-list
             // We don't want to show the back button in the pending signature view
             // because we don't want to go back to the wallet-list
-            setSelectedWalletConnector(walletConnector);
+            setSelectedWalletConnectorKey(walletConnector.key);
             setView('pending-signature-without-back-button');
             setShowAuthFlow(true);
             // Wallet should be already connected at this point
             // We just need to verify it
-            const publicWalletAddress = yield connectWallet(walletConnector, fetchPublicAddressOpts);
-            if (!publicWalletAddress) {
+            const connectionResult = yield connectWallet(walletConnector, fetchPublicAddressOpts);
+            if (!(connectionResult === null || connectionResult === void 0 ? void 0 : connectionResult.address)) {
                 return;
             }
             yield verifyWallet({
-                publicWalletAddress,
+                captchaToken: getCaptchaToken(),
+                publicWalletAddress: connectionResult.address,
                 walletConnector,
             });
         }

package/src/lib/utils/hooks/authenticationHooks/useSignConnectOnlyUser/useSignConnectOnlyUser.js

@@ -10,16 +10,18 @@ import '@dynamic-labs/iconic';
 import 'react/jsx-runtime';
 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 { useCaptchaContext } from '../../../../context/CaptchaContext/CaptchaContext.js';
 
 const useSignConnectOnlyUser = () => {
     const { setView } = useViewContext();
     const { setErrorMessage } = useErrorContext();
-    const { connectWallet, consumeNonce, displaySiweStatement, projectSettings, environmentId, setIsSingleWalletAccount, setShowAuthFlow, setSelectedWalletConnector, walletUiUtils, } = useInternalDynamicContext();
+    const { getCaptchaToken } = useCaptchaContext();
+    const { connectWallet, consumeNonce, displaySiweStatement, projectSettings, environmentId, setIsSingleWalletAccount, setShowAuthFlow, setSelectedWalletConnectorKey, walletUiUtils, } = useInternalDynamicContext();
     const verifyWallet = useVerifyWallet({
         consumeNonce,
         displaySiweStatement,
@@ -37,17 +39,18 @@ const useSignConnectOnlyUser = () => {
             // We need this because in connect-only we don't want to show wallet-list
             // We don't want to show the back button in the pending signature view
             // because we don't want to go back to the wallet-list
-            setSelectedWalletConnector(walletConnector);
+            setSelectedWalletConnectorKey(walletConnector.key);
             setView('pending-signature-without-back-button');
             setShowAuthFlow(true);
             // Wallet should be already connected at this point
             // We just need to verify it
-            const publicWalletAddress = yield connectWallet(walletConnector, fetchPublicAddressOpts);
-            if (!publicWalletAddress) {
+            const connectionResult = yield connectWallet(walletConnector, fetchPublicAddressOpts);
+            if (!(connectionResult === null || connectionResult === void 0 ? void 0 : connectionResult.address)) {
                 return;
             }
             yield verifyWallet({
-                publicWalletAddress,
+                captchaToken: getCaptchaToken(),
+                publicWalletAddress: connectionResult.address,
                 walletConnector,
             });
         }

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

@@ -14,7 +14,6 @@ export { useConfirmationModal } from './useConfirmationModal';
 export { useWalletUiUtils } from './useWalletUiUtils';
 export { useForceUpdate } from './useForceUpdate';
 export { useKYCFlag } from './useKYCFlag';
-export { useMultiWalletFlag } from './useMultiWalletFlag';
 export { useDefaultQrCode } from './useDefaultQrCode';
 export { useWalletItemActions } from './useWalletItemActions';
 export { usePromise } from './usePromise';

package/src/lib/utils/hooks/multiWallet/useMultiWallet/useMultiWallet.cjs

@@ -10,12 +10,12 @@ require('@dynamic-labs/wallet-connector-core');
 require('react/jsx-runtime');
 require('../../../../context/ViewContext/ViewContext.cjs');
 require('@dynamic-labs/wallet-book');
-require('@dynamic-labs/utils');
 var localStorage = require('../../../constants/localStorage.cjs');
 require('../../../constants/colors.cjs');
 var localStorage$1 = require('../../../../shared/utils/classes/storage/localStorage.cjs');
 require('viem');
 var useLocalStorage = require('../../../../shared/utils/hooks/useLocalStorage/useLocalStorage.cjs');
+require('@dynamic-labs/utils');
 require('../../../../shared/consts/index.cjs');
 
 const useMultiWallet = (toolkitEnabled, multiWalletSettings) => {

package/src/lib/utils/hooks/multiWallet/useMultiWallet/useMultiWallet.js

@@ -6,12 +6,12 @@ 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 { IS_MULTI_WALLET_ENABLED } from '../../../constants/localStorage.js';
 import '../../../constants/colors.js';
 import { LocalStorage } from '../../../../shared/utils/classes/storage/localStorage.js';
 import 'viem';
 import { useLocalStorage } from '../../../../shared/utils/hooks/useLocalStorage/useLocalStorage.js';
+import '@dynamic-labs/utils';
 import '../../../../shared/consts/index.js';
 
 const useMultiWallet = (toolkitEnabled, multiWalletSettings) => {

package/src/lib/utils/hooks/multiWallet/useSyncPrimaryWallet/useSyncPrimaryWallet.cjs

@@ -11,7 +11,7 @@ var useInternalDynamicContext = require('../../../../context/DynamicContext/useI
 var errors = require('../../../constants/errors.cjs');
 
 const useSyncPrimaryWallet = (canSync = true) => {
-    const { setShowAuthFlow, isAuthenticated, authMode, computeConnectedStateForWallets, connectWallet, handleLogOut, multiWalletWidgetState, primaryWallet, secondaryWallets, setMultiWalletWidgetState, setPrimaryWallet, setShowWidgetStatePopup, showLockedWalletView, showWidgetStatePopup, } = useInternalDynamicContext.useInternalDynamicContext();
+    const { setShowAuthFlow, isAuthenticated, authMode, computeConnectedStateForWallets, connectWallet, handleLogOut, multiWalletWidgetState, primaryWallet, secondaryWallets, setMultiWalletWidgetState, setPrimaryWallet, setShowWidgetStatePopup, showLockedWalletView, showWidgetStatePopup, setSelectedWalletWithAction, } = useInternalDynamicContext.useInternalDynamicContext();
     const { setView } = ViewContext.useViewContext();
     const handlePrimaryWalletNotActive = React.useCallback((connectedAddress) => {
         if (!primaryWallet)
@@ -30,6 +30,10 @@ const useSyncPrimaryWallet = (canSync = true) => {
             // to a connected secondary wallet as it was causing an infinite loop
             const connectedSecondaryWallet = secondaryWallets.find((wallet) => wallet.connected && primaryWallet.connector !== wallet.connector);
             if (!connectedSecondaryWallet) {
+                setSelectedWalletWithAction({
+                    action: 'select',
+                    wallet: primaryWallet,
+                });
                 setMultiWalletWidgetState('awaiting_account_switch', 'primary_not_connected');
                 return;
             }

package/src/lib/utils/hooks/multiWallet/useSyncPrimaryWallet/useSyncPrimaryWallet.js

@@ -7,7 +7,7 @@ import { useInternalDynamicContext } from '../../../../context/DynamicContext/us
 import { MISSING_ADDRESS_ERROR } from '../../../constants/errors.js';
 
 const useSyncPrimaryWallet = (canSync = true) => {
-    const { setShowAuthFlow, isAuthenticated, authMode, computeConnectedStateForWallets, connectWallet, handleLogOut, multiWalletWidgetState, primaryWallet, secondaryWallets, setMultiWalletWidgetState, setPrimaryWallet, setShowWidgetStatePopup, showLockedWalletView, showWidgetStatePopup, } = useInternalDynamicContext();
+    const { setShowAuthFlow, isAuthenticated, authMode, computeConnectedStateForWallets, connectWallet, handleLogOut, multiWalletWidgetState, primaryWallet, secondaryWallets, setMultiWalletWidgetState, setPrimaryWallet, setShowWidgetStatePopup, showLockedWalletView, showWidgetStatePopup, setSelectedWalletWithAction, } = useInternalDynamicContext();
     const { setView } = useViewContext();
     const handlePrimaryWalletNotActive = useCallback((connectedAddress) => {
         if (!primaryWallet)
@@ -26,6 +26,10 @@ const useSyncPrimaryWallet = (canSync = true) => {
             // to a connected secondary wallet as it was causing an infinite loop
             const connectedSecondaryWallet = secondaryWallets.find((wallet) => wallet.connected && primaryWallet.connector !== wallet.connector);
             if (!connectedSecondaryWallet) {
+                setSelectedWalletWithAction({
+                    action: 'select',
+                    wallet: primaryWallet,
+                });
                 setMultiWalletWidgetState('awaiting_account_switch', 'primary_not_connected');
                 return;
             }

package/src/lib/utils/hooks/multiWallet/useVerifyOnAwaitingSignature/useVerifyOnAwaitingSignature.cjs

@@ -11,18 +11,18 @@ 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');
 require('../../../../shared/utils/classes/storage/localStorage.cjs');
 require('viem');
+require('@dynamic-labs/utils');
 require('../../../../shared/consts/index.cjs');
 require('@dynamic-labs/multi-wallet');
 var requiresTwoStepAuthentication = require('../../../functions/requiresTwoStepAuthentication/requiresTwoStepAuthentication.cjs');
 var useConnectAndSign = require('../../authenticationHooks/useConnectAndSign/useConnectAndSign.cjs');
 require('../../../../context/ErrorContext/ErrorContext.cjs');
-require('../../../../config/ApiEndpoint.cjs');
 require('../../../../context/AccessDeniedContext/AccessDeniedContext.cjs');
 require('../../../../context/AccountExistsContext/AccountExistsContext.cjs');
+require('../../../../config/ApiEndpoint.cjs');
 require('../../../../context/CaptchaContext/CaptchaContext.cjs');
 require('../../../../context/EmailVerificationContext/EmailVerificationContext.cjs');
 

package/src/lib/utils/hooks/multiWallet/useVerifyOnAwaitingSignature/useVerifyOnAwaitingSignature.js

@@ -7,18 +7,18 @@ 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 '../../../../shared/utils/classes/storage/localStorage.js';
 import 'viem';
+import '@dynamic-labs/utils';
 import '../../../../shared/consts/index.js';
 import '@dynamic-labs/multi-wallet';
 import { requiresTwoStepAuthentication } from '../../../functions/requiresTwoStepAuthentication/requiresTwoStepAuthentication.js';
 import { useConnectAndSign } from '../../authenticationHooks/useConnectAndSign/useConnectAndSign.js';
 import '../../../../context/ErrorContext/ErrorContext.js';
-import '../../../../config/ApiEndpoint.js';
 import '../../../../context/AccessDeniedContext/AccessDeniedContext.js';
 import '../../../../context/AccountExistsContext/AccountExistsContext.js';
+import '../../../../config/ApiEndpoint.js';
 import '../../../../context/CaptchaContext/CaptchaContext.js';
 import '../../../../context/EmailVerificationContext/EmailVerificationContext.js';
 

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

@@ -47,7 +47,8 @@ const useAuthLayoutChecks = (walletConnector) => {
         view !== 'passkey-intro' &&
         view !== 'social-redirect-view' &&
         view !== 'update-email' &&
-        view !== 'collect-user-data-login-with-email';
+        view !== 'collect-user-data-login-with-email' &&
+        view !== 'passkey-recovery-start';
     const showConnectedWalletProgress = isBridgeFlow &&
         (view === 'wallet-list' ||
             view === 'qr-code' ||
@@ -78,7 +79,9 @@ const useAuthLayoutChecks = (walletConnector) => {
         view === 'email-wallet-otp-verification-view';
     const showCloseButton = view !== 'login-with-email-or-wallet-full-wallet-list' &&
         view !== 'login-with-email-verification' &&
-        view !== 'network-not-supported';
+        view !== 'network-not-supported' &&
+        view !== 'passkey-recovery-complete' &&
+        view !== 'passkey-recovery-start';
     const showBackButton = view === 'qr-code' ||
         view === 'pending-signature' ||
         view === 'no-qr-not-installed' ||

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

@@ -43,7 +43,8 @@ const useAuthLayoutChecks = (walletConnector) => {
         view !== 'passkey-intro' &&
         view !== 'social-redirect-view' &&
         view !== 'update-email' &&
-        view !== 'collect-user-data-login-with-email';
+        view !== 'collect-user-data-login-with-email' &&
+        view !== 'passkey-recovery-start';
     const showConnectedWalletProgress = isBridgeFlow &&
         (view === 'wallet-list' ||
             view === 'qr-code' ||
@@ -74,7 +75,9 @@ const useAuthLayoutChecks = (walletConnector) => {
         view === 'email-wallet-otp-verification-view';
     const showCloseButton = view !== 'login-with-email-or-wallet-full-wallet-list' &&
         view !== 'login-with-email-verification' &&
-        view !== 'network-not-supported';
+        view !== 'network-not-supported' &&
+        view !== 'passkey-recovery-complete' &&
+        view !== 'passkey-recovery-start';
     const showBackButton = view === 'qr-code' ||
         view === 'pending-signature' ||
         view === 'no-qr-not-installed' ||

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

@@ -7,8 +7,9 @@ var React = require('react');
 var utils = require('@dynamic-labs/utils');
 var useInternalDynamicContext = require('../../../context/DynamicContext/useInternalDynamicContext.cjs');
 require('@dynamic-labs/wallet-connector-core');
-require('../../../context/ViewContext/ViewContext.cjs');
+require('../../../context/CaptchaContext/CaptchaContext.cjs');
 require('../../../context/ErrorContext/ErrorContext.cjs');
+require('../../../context/ViewContext/ViewContext.cjs');
 require('@dynamic-labs/sdk-api');
 require('../../../shared/logger.cjs');
 require('@dynamic-labs/iconic');
@@ -18,11 +19,10 @@ require('../../constants/colors.cjs');
 require('../../../shared/utils/classes/storage/localStorage.cjs');
 require('viem');
 require('../../../shared/consts/index.cjs');
-require('../../../config/ApiEndpoint.cjs');
 require('@dynamic-labs/multi-wallet');
 require('../../../context/AccessDeniedContext/AccessDeniedContext.cjs');
 require('../../../context/AccountExistsContext/AccountExistsContext.cjs');
-require('../../../context/CaptchaContext/CaptchaContext.cjs');
+require('../../../config/ApiEndpoint.cjs');
 var useSignConnectOnlyUser = require('../authenticationHooks/useSignConnectOnlyUser/useSignConnectOnlyUser.cjs');
 require('../../../context/EmailVerificationContext/EmailVerificationContext.cjs');
 

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

@@ -3,8 +3,9 @@ import { useState, useCallback } from 'react';
 import { DynamicError } from '@dynamic-labs/utils';
 import { useInternalDynamicContext } from '../../../context/DynamicContext/useInternalDynamicContext.js';
 import '@dynamic-labs/wallet-connector-core';
-import '../../../context/ViewContext/ViewContext.js';
+import '../../../context/CaptchaContext/CaptchaContext.js';
 import '../../../context/ErrorContext/ErrorContext.js';
+import '../../../context/ViewContext/ViewContext.js';
 import '@dynamic-labs/sdk-api';
 import '../../../shared/logger.js';
 import '@dynamic-labs/iconic';
@@ -14,11 +15,10 @@ import '../../constants/colors.js';
 import '../../../shared/utils/classes/storage/localStorage.js';
 import 'viem';
 import '../../../shared/consts/index.js';
-import '../../../config/ApiEndpoint.js';
 import '@dynamic-labs/multi-wallet';
 import '../../../context/AccessDeniedContext/AccessDeniedContext.js';
 import '../../../context/AccountExistsContext/AccountExistsContext.js';
-import '../../../context/CaptchaContext/CaptchaContext.js';
+import '../../../config/ApiEndpoint.js';
 import { useSignConnectOnlyUser } from '../authenticationHooks/useSignConnectOnlyUser/useSignConnectOnlyUser.js';
 import '../../../context/EmailVerificationContext/EmailVerificationContext.js';
 

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

@@ -10,10 +10,10 @@ require('@dynamic-labs/iconic');
 require('react/jsx-runtime');
 require('../../../context/ViewContext/ViewContext.cjs');
 require('@dynamic-labs/wallet-book');
-require('@dynamic-labs/utils');
 require('../../constants/colors.cjs');
 var localStorage$1 = require('../../../shared/utils/classes/storage/localStorage.cjs');
 require('viem');
+require('@dynamic-labs/utils');
 require('../../../shared/consts/index.cjs');
 
 const useClearWalletConnectSessions = ({ connectors }) => {

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

@@ -6,10 +6,10 @@ import '@dynamic-labs/iconic';
 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 useClearWalletConnectSessions = ({ connectors }) => {

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

@@ -10,10 +10,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');
 var useMediaQuery = require('../../../shared/utils/hooks/useMediaQuery/useMediaQuery.cjs');
 require('../../../shared/consts/index.cjs');
 

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

@@ -6,10 +6,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 { useMediaQuery } from '../../../shared/utils/hooks/useMediaQuery/useMediaQuery.js';
 import '../../../shared/consts/index.js';
 

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

@@ -5,23 +5,23 @@ 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 api = require('../../../data/api.cjs');
 require('@dynamic-labs/sdk-api');
 require('../../../shared/logger.cjs');
 require('@dynamic-labs/iconic');
 require('react/jsx-runtime');
 require('../../../context/ViewContext/ViewContext.cjs');
 require('@dynamic-labs/wallet-book');
-require('@dynamic-labs/utils');
 var localStorage = require('../../constants/localStorage.cjs');
 require('../../constants/colors.cjs');
 require('../../../shared/utils/classes/storage/localStorage.cjs');
 require('viem');
 var useLocalStorage = require('../../../shared/utils/hooks/useLocalStorage/useLocalStorage.cjs');
+require('@dynamic-labs/utils');
 require('../../../shared/consts/index.cjs');
-var getWalletProvider = require('../../functions/getWalletProvider/getWalletProvider.cjs');
-var api = require('../../../data/api.cjs');
 require('@dynamic-labs/multi-wallet');
 var shouldManuallyReconnectOnRefresh = require('../../functions/shouldManuallyReconnectOnRefresh/shouldManuallyReconnectOnRefresh.cjs');
+var getWalletProvider = require('../../functions/getWalletProvider/getWalletProvider.cjs');
 
 const useConnectWallet = ({ authMode, clearPrimaryWalletId, enableVisitTrackingOnConnectOnly, environmentId, primaryWalletId, setPrimaryWalletId, wallets, onDisconnect, onBeforeConnectSuccessConfirmation, setShowAuthFlow, isBridgeFlow, }) => {
     const [connectedWalletsInfo, setConnectedWalletsInfo, removeConnectedWalletsInfo,] = useLocalStorage.useLocalStorage(localStorage.CONNECTED_WALLETS_INFO, []);
@@ -153,15 +153,15 @@ const useConnectWallet = ({ authMode, clearPrimaryWalletId, enableVisitTrackingO
     });
     const shouldSkipCreatingVisit = authMode === 'connect-only' && !enableVisitTrackingOnConnectOnly;
     const connectWallet = (walletConnector, fetchPublicAddressOpts, shouldCallCallback = true) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
-        const publicWalletAddress = yield walletConnector.fetchPublicAddress(fetchPublicAddressOpts);
-        if (!publicWalletAddress) {
+        const walletAddress = yield walletConnector.fetchPublicAddress(fetchPublicAddressOpts);
+        if (!walletAddress) {
             const error = new Error();
             error.code = 'missing-public-address';
             throw error;
         }
         if (onBeforeConnectSuccessConfirmation && shouldCallCallback) {
             const shouldProceedWithConnection = yield onBeforeConnectSuccessConfirmation({
-                address: publicWalletAddress,
+                address: walletAddress,
                 chain: walletConnector.connectedChain,
                 connector: walletConnector,
             });
@@ -183,7 +183,7 @@ const useConnectWallet = ({ authMode, clearPrimaryWalletId, enableVisitTrackingO
         else {
             applyConnectedWalletToStore({
                 provider: getWalletProvider.getWalletProvider(walletConnector),
-                walletAddress: publicWalletAddress,
+                walletAddress: walletAddress,
                 walletChain,
                 walletConnectorKey: walletConnector.key,
                 walletId,
@@ -196,13 +196,13 @@ const useConnectWallet = ({ authMode, clearPrimaryWalletId, enableVisitTrackingO
                     authMode,
                     chain: walletChain || '',
                     environmentId,
-                    publicWalletAddress,
+                    publicWalletAddress: walletAddress,
                     walletName: walletConnector.name,
                     walletProvider: getWalletProvider.getWalletProvider(walletConnector),
                 });
             }
         }
-        return publicWalletAddress;
+        return { address: walletAddress, id: walletId };
     });
     const getConnectedWalletById = React.useCallback((walletId) => connectedWallets.find((wallet) => wallet.id === walletId), [connectedWallets]);
     return {

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

@@ -1,5 +1,6 @@
 import { Dispatch, SetStateAction } from 'react';
 import { Chain, FetchPublicAddressOpts, WalletConnector } from '@dynamic-labs/wallet-connector-core';
+import { ConnectWalletResult } from '../../../context/DynamicContext/types';
 import { AuthModeType, OnBeforeConnectSuccessConfirmation, Wallet, WalletOption } from '../../../shared';
 export type ConnectedWalletConnectorType = {
     id: string;
@@ -21,7 +22,7 @@ type Props = {
     isBridgeFlow: boolean;
 };
 type UseConnectWalletValue = {
-    connectWallet: (walletConnector: WalletConnector, fetchPublicAddressOpts?: FetchPublicAddressOpts, shouldCallCallback?: boolean) => Promise<string | undefined>;
+    connectWallet: (walletConnector: WalletConnector, fetchPublicAddressOpts?: FetchPublicAddressOpts, shouldCallCallback?: boolean) => Promise<ConnectWalletResult | undefined>;
     connectedWallet: Wallet | null;
     connectedWallets: Wallet[];
     connectedWalletsInfo: ConnectedWalletConnectorType[];

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

@@ -1,23 +1,23 @@
 import { __awaiter } from '../../../../../_virtual/_tslib.js';
 import { useState, useCallback, useEffect } from 'react';
 import { getWalletConnectorByKey, logger } from '@dynamic-labs/wallet-connector-core';
+import { createVisit } from '../../../data/api.js';
 import '@dynamic-labs/sdk-api';
 import '../../../shared/logger.js';
 import '@dynamic-labs/iconic';
 import 'react/jsx-runtime';
 import '../../../context/ViewContext/ViewContext.js';
 import '@dynamic-labs/wallet-book';
-import '@dynamic-labs/utils';
 import { CONNECTED_WALLETS_INFO } from '../../constants/localStorage.js';
 import '../../constants/colors.js';
 import '../../../shared/utils/classes/storage/localStorage.js';
 import 'viem';
 import { useLocalStorage } from '../../../shared/utils/hooks/useLocalStorage/useLocalStorage.js';
+import '@dynamic-labs/utils';
 import '../../../shared/consts/index.js';
-import { getWalletProvider } from '../../functions/getWalletProvider/getWalletProvider.js';
-import { createVisit } from '../../../data/api.js';
 import '@dynamic-labs/multi-wallet';
 import { shouldManuallyReconnectOnRefresh } from '../../functions/shouldManuallyReconnectOnRefresh/shouldManuallyReconnectOnRefresh.js';
+import { getWalletProvider } from '../../functions/getWalletProvider/getWalletProvider.js';
 
 const useConnectWallet = ({ authMode, clearPrimaryWalletId, enableVisitTrackingOnConnectOnly, environmentId, primaryWalletId, setPrimaryWalletId, wallets, onDisconnect, onBeforeConnectSuccessConfirmation, setShowAuthFlow, isBridgeFlow, }) => {
     const [connectedWalletsInfo, setConnectedWalletsInfo, removeConnectedWalletsInfo,] = useLocalStorage(CONNECTED_WALLETS_INFO, []);
@@ -149,15 +149,15 @@ const useConnectWallet = ({ authMode, clearPrimaryWalletId, enableVisitTrackingO
     });
     const shouldSkipCreatingVisit = authMode === 'connect-only' && !enableVisitTrackingOnConnectOnly;
     const connectWallet = (walletConnector, fetchPublicAddressOpts, shouldCallCallback = true) => __awaiter(void 0, void 0, void 0, function* () {
-        const publicWalletAddress = yield walletConnector.fetchPublicAddress(fetchPublicAddressOpts);
-        if (!publicWalletAddress) {
+        const walletAddress = yield walletConnector.fetchPublicAddress(fetchPublicAddressOpts);
+        if (!walletAddress) {
             const error = new Error();
             error.code = 'missing-public-address';
             throw error;
         }
         if (onBeforeConnectSuccessConfirmation && shouldCallCallback) {
             const shouldProceedWithConnection = yield onBeforeConnectSuccessConfirmation({
-                address: publicWalletAddress,
+                address: walletAddress,
                 chain: walletConnector.connectedChain,
                 connector: walletConnector,
             });
@@ -179,7 +179,7 @@ const useConnectWallet = ({ authMode, clearPrimaryWalletId, enableVisitTrackingO
         else {
             applyConnectedWalletToStore({
                 provider: getWalletProvider(walletConnector),
-                walletAddress: publicWalletAddress,
+                walletAddress: walletAddress,
                 walletChain,
                 walletConnectorKey: walletConnector.key,
                 walletId,
@@ -192,13 +192,13 @@ const useConnectWallet = ({ authMode, clearPrimaryWalletId, enableVisitTrackingO
                     authMode,
                     chain: walletChain || '',
                     environmentId,
-                    publicWalletAddress,
+                    publicWalletAddress: walletAddress,
                     walletName: walletConnector.name,
                     walletProvider: getWalletProvider(walletConnector),
                 });
             }
         }
-        return publicWalletAddress;
+        return { address: walletAddress, id: walletId };
     });
     const getConnectedWalletById = useCallback((walletId) => connectedWallets.find((wallet) => wallet.id === walletId), [connectedWallets]);
     return {

package/src/lib/utils/hooks/useConnectWithEmail/useConnectWithEmail.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');
 require('../../../shared/utils/classes/storage/localStorage.cjs');
 require('viem');
+require('@dynamic-labs/utils');
 require('../../../shared/consts/index.cjs');
 var ErrorContext = require('../../../context/ErrorContext/ErrorContext.cjs');
 var useInternalDynamicContext = require('../../../context/DynamicContext/useInternalDynamicContext.cjs');

package/src/lib/utils/hooks/useConnectWithEmail/useConnectWithEmail.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 '../../../shared/utils/classes/storage/localStorage.js';
 import 'viem';
+import '@dynamic-labs/utils';
 import '../../../shared/consts/index.js';
 import { useErrorContext } from '../../../context/ErrorContext/ErrorContext.js';
 import { useInternalDynamicContext } from '../../../context/DynamicContext/useInternalDynamicContext.js';