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

package/src/lib/utils/functions/walletFilters/index.cjs

@@ -24,7 +24,7 @@ const SortWallets = (sortedWalletKeys) => (wallets) => [...wallets].sort((wallet
 });
 const FilterWallets = (walletKeys) => (wallets) => wallets.filter((wallet) => walletKeys.includes(wallet.key));
 const RemoveWallets = (walletKeys) => (wallets) => wallets.filter((wallet) => !walletKeys.includes(wallet.key));
-const FilterWalletsByChainName = (chainName) => (wallets) => wallets.filter((wallet) => wallet.walletConnector.supportedChains.includes(chainName));
+const FilterBridgeChainsName = (chainName) => (wallets) => wallets.filter((wallet) => wallet.walletConnector.supportedChains.includes(chainName));
 /**
  * Filters and sorts the wallet selection by the provided sortedWalletKeys.
  * This filter should be used when you only want specific wallets to be available
@@ -37,8 +37,8 @@ const FilterAndSortWallets = (sortedWalletKeys) => (wallets) => {
 const UniswapFilter = () => (wallets) => FilterAndSortWallets(['uniswap', 'metamask', 'coinbase', 'walletconnect'])(wallets);
 
 exports.FilterAndSortWallets = FilterAndSortWallets;
+exports.FilterBridgeChainsName = FilterBridgeChainsName;
 exports.FilterWallets = FilterWallets;
-exports.FilterWalletsByChainName = FilterWalletsByChainName;
 exports.RemoveWallets = RemoveWallets;
 exports.SortWallets = SortWallets;
 exports.UniswapFilter = UniswapFilter;

package/src/lib/utils/functions/walletFilters/index.d.ts

@@ -10,7 +10,7 @@ import { WalletOption } from '../../../shared';
 export declare const SortWallets: (sortedWalletKeys: string[]) => (wallets: WalletOption[]) => WalletOption[];
 export declare const FilterWallets: (walletKeys: string[]) => (wallets: WalletOption[]) => WalletOption[];
 export declare const RemoveWallets: (walletKeys: string[]) => (wallets: WalletOption[]) => WalletOption[];
-export declare const FilterWalletsByChainName: (chainName: Chain) => (wallets: WalletOption[]) => WalletOption[];
+export declare const FilterBridgeChainsName: (chainName: Chain) => (wallets: WalletOption[]) => WalletOption[];
 /**
  * Filters and sorts the wallet selection by the provided sortedWalletKeys.
  * This filter should be used when you only want specific wallets to be available

package/src/lib/utils/functions/walletFilters/index.js

@@ -20,7 +20,7 @@ const SortWallets = (sortedWalletKeys) => (wallets) => [...wallets].sort((wallet
 });
 const FilterWallets = (walletKeys) => (wallets) => wallets.filter((wallet) => walletKeys.includes(wallet.key));
 const RemoveWallets = (walletKeys) => (wallets) => wallets.filter((wallet) => !walletKeys.includes(wallet.key));
-const FilterWalletsByChainName = (chainName) => (wallets) => wallets.filter((wallet) => wallet.walletConnector.supportedChains.includes(chainName));
+const FilterBridgeChainsName = (chainName) => (wallets) => wallets.filter((wallet) => wallet.walletConnector.supportedChains.includes(chainName));
 /**
  * Filters and sorts the wallet selection by the provided sortedWalletKeys.
  * This filter should be used when you only want specific wallets to be available
@@ -32,4 +32,4 @@ const FilterAndSortWallets = (sortedWalletKeys) => (wallets) => {
 };
 const UniswapFilter = () => (wallets) => FilterAndSortWallets(['uniswap', 'metamask', 'coinbase', 'walletconnect'])(wallets);
 
-export { FilterAndSortWallets, FilterWallets, FilterWalletsByChainName, RemoveWallets, SortWallets, UniswapFilter };
+export { FilterAndSortWallets, FilterBridgeChainsName, FilterWallets, RemoveWallets, SortWallets, UniswapFilter };

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

@@ -4,11 +4,10 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var _tslib = require('../../../../../../_virtual/_tslib.cjs');
 var walletConnectorCore = require('@dynamic-labs/wallet-connector-core');
-var showPendingConnectView = require('../helpers/showPendingConnectView.cjs');
-var isConnectOnly = require('../helpers/isConnectOnly.cjs');
+var CaptchaContext = require('../../../../context/CaptchaContext/CaptchaContext.cjs');
 var useInternalDynamicContext = require('../../../../context/DynamicContext/useInternalDynamicContext.cjs');
-var ViewContext = require('../../../../context/ViewContext/ViewContext.cjs');
 var ErrorContext = require('../../../../context/ErrorContext/ErrorContext.cjs');
+var ViewContext = require('../../../../context/ViewContext/ViewContext.cjs');
 require('@dynamic-labs/sdk-api');
 var logger = require('../../../../shared/logger.cjs');
 require('@dynamic-labs/iconic');
@@ -21,12 +20,13 @@ var localStorage = require('../../../../shared/utils/classes/storage/localStorag
 require('viem');
 require('@dynamic-labs/utils');
 require('../../../../shared/consts/index.cjs');
-var useVerifyWallet = require('../../useVerifyWallet/useVerifyWallet.cjs');
-var CaptchaContext = require('../../../../context/CaptchaContext/CaptchaContext.cjs');
-var useHandleWalletsToConnect = require('../../useHandleWalletsToConnect/useHandleWalletsToConnect.cjs');
 require('@dynamic-labs/multi-wallet');
-var isSupportedNetwork = require('../../../functions/isSupportedNetwork/isSupportedNetwork.cjs');
 var isProgrammableNetworkSwitchSupported = require('../../../functions/isProgrammableNetworkSwitchSupported/isProgrammableNetworkSwitchSupported.cjs');
+var isSupportedNetwork = require('../../../functions/isSupportedNetwork/isSupportedNetwork.cjs');
+var useHandleWalletsToConnect = require('../../useHandleWalletsToConnect/useHandleWalletsToConnect.cjs');
+var useVerifyWallet = require('../../useVerifyWallet/useVerifyWallet.cjs');
+var showPendingConnectView = require('../helpers/showPendingConnectView.cjs');
+var isConnectOnly = require('../helpers/isConnectOnly.cjs');
 
 const useConnectAndSign = ({ shouldUpdateWallets = true, shouldCallCallback = true, } = {}) => {
     const { setView, goToInitialView } = ViewContext.useViewContext();
@@ -82,10 +82,11 @@ const useConnectAndSign = ({ shouldUpdateWallets = true, shouldCallCallback = tr
                     setView('wait-for-email-confirmation-view');
                 }
             }
-            const publicWalletAddress = yield connectWallet(walletConnector, fetchPublicAddressOpts, shouldCallCallback);
-            if (!publicWalletAddress) {
+            const connectionResult = yield connectWallet(walletConnector, fetchPublicAddressOpts, shouldCallCallback);
+            if (!(connectionResult === null || connectionResult === void 0 ? void 0 : connectionResult.address)) {
                 return;
             }
+            const { address, id } = connectionResult;
             const walletNetwork = yield walletConnector.getNetwork();
             const usesSupportedNetwork = isSupportedNetwork.isSupportedNetwork({
                 network: walletNetwork,
@@ -97,7 +98,9 @@ const useConnectAndSign = ({ shouldUpdateWallets = true, shouldCallCallback = tr
                 }
                 return setView('network-not-supported-manual');
             }
-            setCallback('connectSuccess');
+            setCallback('connectSuccess', {
+                walletId: id,
+            });
             if (isConnectOnly.isConnectOnly(user, authMode)) {
                 localStorage.LocalStorage.setToLS(localStorage$1.LAST_USED_WALLET, walletConnector.key);
                 if (shouldUpdateWallets) {
@@ -110,7 +113,7 @@ const useConnectAndSign = ({ shouldUpdateWallets = true, shouldCallCallback = tr
                     authMethod: 'wallet',
                     onCaptchaSuccess: (captchaToken) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
                         try {
-                            yield handleWalletVerify(walletConnector, publicWalletAddress, captchaToken);
+                            yield handleWalletVerify(walletConnector, address, captchaToken);
                         }
                         catch (e) {
                             handleWalletVerifyError(e);
@@ -119,7 +122,7 @@ const useConnectAndSign = ({ shouldUpdateWallets = true, shouldCallCallback = tr
                 });
                 return;
             }
-            yield handleWalletVerify(walletConnector, publicWalletAddress, getCaptchaToken());
+            yield handleWalletVerify(walletConnector, address, getCaptchaToken());
         }
         catch (err) {
             handleWalletVerifyError(err);

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

@@ -1,10 +1,9 @@
 import { __awaiter } from '../../../../../../_virtual/_tslib.js';
 import { isEmailWalletConnector, isEmailOTPWalletConnector, isBloctoConnector } from '@dynamic-labs/wallet-connector-core';
-import { showPendingConnectView } from '../helpers/showPendingConnectView.js';
-import { isConnectOnly } from '../helpers/isConnectOnly.js';
+import { useCaptchaContext } from '../../../../context/CaptchaContext/CaptchaContext.js';
 import { useInternalDynamicContext } from '../../../../context/DynamicContext/useInternalDynamicContext.js';
-import { useViewContext } from '../../../../context/ViewContext/ViewContext.js';
 import { useErrorContext } from '../../../../context/ErrorContext/ErrorContext.js';
+import { useViewContext } from '../../../../context/ViewContext/ViewContext.js';
 import '@dynamic-labs/sdk-api';
 import { logger } from '../../../../shared/logger.js';
 import '@dynamic-labs/iconic';
@@ -17,12 +16,13 @@ import { LocalStorage } from '../../../../shared/utils/classes/storage/localStor
 import 'viem';
 import '@dynamic-labs/utils';
 import '../../../../shared/consts/index.js';
-import { useVerifyWallet } from '../../useVerifyWallet/useVerifyWallet.js';
-import { useCaptchaContext } from '../../../../context/CaptchaContext/CaptchaContext.js';
-import { useHandleWalletsToConnect } from '../../useHandleWalletsToConnect/useHandleWalletsToConnect.js';
 import '@dynamic-labs/multi-wallet';
-import { isSupportedNetwork } from '../../../functions/isSupportedNetwork/isSupportedNetwork.js';
 import { isProgrammableNetworkSwitchSupported } from '../../../functions/isProgrammableNetworkSwitchSupported/isProgrammableNetworkSwitchSupported.js';
+import { isSupportedNetwork } from '../../../functions/isSupportedNetwork/isSupportedNetwork.js';
+import { useHandleWalletsToConnect } from '../../useHandleWalletsToConnect/useHandleWalletsToConnect.js';
+import { useVerifyWallet } from '../../useVerifyWallet/useVerifyWallet.js';
+import { showPendingConnectView } from '../helpers/showPendingConnectView.js';
+import { isConnectOnly } from '../helpers/isConnectOnly.js';
 
 const useConnectAndSign = ({ shouldUpdateWallets = true, shouldCallCallback = true, } = {}) => {
     const { setView, goToInitialView } = useViewContext();
@@ -78,10 +78,11 @@ const useConnectAndSign = ({ shouldUpdateWallets = true, shouldCallCallback = tr
                     setView('wait-for-email-confirmation-view');
                 }
             }
-            const publicWalletAddress = yield connectWallet(walletConnector, fetchPublicAddressOpts, shouldCallCallback);
-            if (!publicWalletAddress) {
+            const connectionResult = yield connectWallet(walletConnector, fetchPublicAddressOpts, shouldCallCallback);
+            if (!(connectionResult === null || connectionResult === void 0 ? void 0 : connectionResult.address)) {
                 return;
             }
+            const { address, id } = connectionResult;
             const walletNetwork = yield walletConnector.getNetwork();
             const usesSupportedNetwork = isSupportedNetwork({
                 network: walletNetwork,
@@ -93,7 +94,9 @@ const useConnectAndSign = ({ shouldUpdateWallets = true, shouldCallCallback = tr
                 }
                 return setView('network-not-supported-manual');
             }
-            setCallback('connectSuccess');
+            setCallback('connectSuccess', {
+                walletId: id,
+            });
             if (isConnectOnly(user, authMode)) {
                 LocalStorage.setToLS(LAST_USED_WALLET, walletConnector.key);
                 if (shouldUpdateWallets) {
@@ -106,7 +109,7 @@ const useConnectAndSign = ({ shouldUpdateWallets = true, shouldCallCallback = tr
                     authMethod: 'wallet',
                     onCaptchaSuccess: (captchaToken) => __awaiter(void 0, void 0, void 0, function* () {
                         try {
-                            yield handleWalletVerify(walletConnector, publicWalletAddress, captchaToken);
+                            yield handleWalletVerify(walletConnector, address, captchaToken);
                         }
                         catch (e) {
                             handleWalletVerifyError(e);
@@ -115,7 +118,7 @@ const useConnectAndSign = ({ shouldUpdateWallets = true, shouldCallCallback = tr
                 });
                 return;
             }
-            yield handleWalletVerify(walletConnector, publicWalletAddress, getCaptchaToken());
+            yield handleWalletVerify(walletConnector, address, getCaptchaToken());
         }
         catch (err) {
             handleWalletVerifyError(err);

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

@@ -48,8 +48,10 @@ const useConnectAndSignSplitSteps = () => {
         setIsVerificationInProgress(true);
         yield showPendingConnectView.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.isConnectOnly(user, authMode)) {
                 localStorage.LocalStorage.setToLS(localStorage$1.LAST_USED_WALLET, walletConnector.key);
                 handleWalletsToConnect({ walletConnector });
@@ -82,13 +84,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: getCaptchaToken(),
-                publicWalletAddress,
+                publicWalletAddress: connectionResult.address,
                 walletConnector,
             });
         }

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

@@ -44,8 +44,10 @@ 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 });
@@ -78,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: getCaptchaToken(),
-                publicWalletAddress,
+                publicWalletAddress: connectionResult.address,
                 walletConnector,
             });
         }

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

@@ -48,13 +48,13 @@ const useSignConnectOnlyUser = () => {
             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({
                 captchaToken: getCaptchaToken(),
-                publicWalletAddress,
+                publicWalletAddress: connectionResult.address,
                 walletConnector,
             });
         }

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

@@ -44,13 +44,13 @@ const useSignConnectOnlyUser = () => {
             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({
                 captchaToken: getCaptchaToken(),
-                publicWalletAddress,
+                publicWalletAddress: connectionResult.address,
                 walletConnector,
             });
         }

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

@@ -20,9 +20,9 @@ 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

@@ -16,9 +16,9 @@ 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/useConnectWallet/useConnectWallet.cjs

@@ -5,6 +5,7 @@ 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');
@@ -18,10 +19,9 @@ 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,6 +1,7 @@
 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';
@@ -14,10 +15,9 @@ 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/useConnectedWalletsNetworkValidation/useConnectedWalletsNetworkValidation.cjs

@@ -17,11 +17,11 @@ require('viem');
 require('@dynamic-labs/utils');
 require('../../../shared/consts/index.cjs');
 require('@dynamic-labs/multi-wallet');
-var isSupportedNetwork = require('../../functions/isSupportedNetwork/isSupportedNetwork.cjs');
 var isProgrammableNetworkSwitchSupported = require('../../functions/isProgrammableNetworkSwitchSupported/isProgrammableNetworkSwitchSupported.cjs');
+var isSupportedNetwork = require('../../functions/isSupportedNetwork/isSupportedNetwork.cjs');
 
 const useConnectedWalletsNetworkValidation = () => {
-    const { connectedWallets, selectedWalletConnector, setSelectedWalletConnectorKey, setShowAuthFlow, showAuthFlow, walletsToConnectByChain, sdkHasLoaded, } = useInternalDynamicContext.useInternalDynamicContext();
+    const { connectedWallets, selectedWalletConnector, setSelectedWalletConnectorKey, setShowAuthFlow, showAuthFlow, bridgeChainsToConnect, sdkHasLoaded, } = useInternalDynamicContext.useInternalDynamicContext();
     const { setView } = ViewContext.useViewContext();
     React.useEffect(() => {
         /**
@@ -37,7 +37,7 @@ const useConnectedWalletsNetworkValidation = () => {
             return;
         }
         const connectedWalletsWithInvalidNetwork = connectedWallets.filter((connectedWallet) => {
-            const isChainInWalletsToConnect = walletsToConnectByChain === null || walletsToConnectByChain === void 0 ? void 0 : walletsToConnectByChain.some((walletToConnectByChain) => walletToConnectByChain.chain === connectedWallet.chain);
+            const isChainInWalletsToConnect = bridgeChainsToConnect === null || bridgeChainsToConnect === void 0 ? void 0 : bridgeChainsToConnect.some((walletToConnectByChain) => walletToConnectByChain.chain === connectedWallet.chain);
             const isSupported = isSupportedNetwork.isSupportedNetwork({
                 network: connectedWallet.network,
                 walletConnector: connectedWallet.connector,
@@ -72,7 +72,7 @@ const useConnectedWalletsNetworkValidation = () => {
         setSelectedWalletConnectorKey,
         setShowAuthFlow,
         setView,
-        walletsToConnectByChain,
+        bridgeChainsToConnect,
     ]);
 };
 

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

@@ -13,11 +13,11 @@ import 'viem';
 import '@dynamic-labs/utils';
 import '../../../shared/consts/index.js';
 import '@dynamic-labs/multi-wallet';
-import { isSupportedNetwork } from '../../functions/isSupportedNetwork/isSupportedNetwork.js';
 import { isProgrammableNetworkSwitchSupported } from '../../functions/isProgrammableNetworkSwitchSupported/isProgrammableNetworkSwitchSupported.js';
+import { isSupportedNetwork } from '../../functions/isSupportedNetwork/isSupportedNetwork.js';
 
 const useConnectedWalletsNetworkValidation = () => {
-    const { connectedWallets, selectedWalletConnector, setSelectedWalletConnectorKey, setShowAuthFlow, showAuthFlow, walletsToConnectByChain, sdkHasLoaded, } = useInternalDynamicContext();
+    const { connectedWallets, selectedWalletConnector, setSelectedWalletConnectorKey, setShowAuthFlow, showAuthFlow, bridgeChainsToConnect, sdkHasLoaded, } = useInternalDynamicContext();
     const { setView } = useViewContext();
     useEffect(() => {
         /**
@@ -33,7 +33,7 @@ const useConnectedWalletsNetworkValidation = () => {
             return;
         }
         const connectedWalletsWithInvalidNetwork = connectedWallets.filter((connectedWallet) => {
-            const isChainInWalletsToConnect = walletsToConnectByChain === null || walletsToConnectByChain === void 0 ? void 0 : walletsToConnectByChain.some((walletToConnectByChain) => walletToConnectByChain.chain === connectedWallet.chain);
+            const isChainInWalletsToConnect = bridgeChainsToConnect === null || bridgeChainsToConnect === void 0 ? void 0 : bridgeChainsToConnect.some((walletToConnectByChain) => walletToConnectByChain.chain === connectedWallet.chain);
             const isSupported = isSupportedNetwork({
                 network: connectedWallet.network,
                 walletConnector: connectedWallet.connector,
@@ -68,7 +68,7 @@ const useConnectedWalletsNetworkValidation = () => {
         setSelectedWalletConnectorKey,
         setShowAuthFlow,
         setView,
-        walletsToConnectByChain,
+        bridgeChainsToConnect,
     ]);
 };