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

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

@@ -1,45 +1,46 @@
-export * from './getEnabledKYC';
-export * from './storeAuthToken';
+export * from './createUserProfile';
+export * from './digestSHA256';
+export * from './encodeBase64URL';
+export * from './findEmbeddedWalletFromVerifiedCredentials';
+export * from './findTurnkeyWallet';
 export * from './generateMessages';
+export * from './getActiveOauthCredential';
+export * from './getAppOrigin';
 export * from './getAuthToken';
-export * from './isWalletConnected';
-export * from './getVerifyArgs';
-export * from './createUserProfile';
-export * from './requiresTwoStepAuthentication';
-export * from './isSupportedNetwork';
-export * from './isEmailProviderEnabled';
-export * from './getEnabledProviders';
-export * from './pixelToRem';
-export * from './isProgrammableNetworkSwitchSupported';
+export * from './getEnabledKYC';
 export * from './getEnabledOAuthProviders';
-export * from './shouldManuallyReconnectOnRefresh';
-export * from './isNetworkUnsupported';
+export * from './getEnabledProviders';
+export * from './getEnabledSocialSignInProvidersAsProviderEnum';
+export * from './getOauthLoginUrl';
+export * from './getOrdinalNumber';
+export * from './getProviderByType';
+export * from './getProviderEnumForSocialSignInProvider';
+export * from './getRedirectURIOrigin';
 export * from './getReferencedAccount';
-export * from './getAppOrigin';
+export * from './getSocialSignInProviderForProviderEnum';
+export * from './getSocialSignInProviderFromString';
+export * from './getUserProfileFields';
+export * from './getUserWalletsFromVerifiedCredentials';
+export * from './getVerifyArgs';
+export * from './getWalletConnectorNetworks/getWalletConnectorNetworks';
 export * from './groupBy';
-export * from './isProviderEnabled';
+export * from './isEmailProviderEnabled';
+export * from './isEmbeddedWalletPresent';
+export * from './isMagicConnector';
+export * from './isNetworkUnsupported';
 export * from './isOnrampProvider';
-export * from './getWalletConnectorNetworks/getWalletConnectorNetworks';
+export * from './isProgrammableNetworkSwitchSupported';
+export * from './isProviderEnabled';
 export * from './isSocialKycEnabled';
-export * from './getUserProfileFields';
-export * from './isMagicConnector';
+export * from './isSupportedNetwork';
+export * from './isTestnet';
+export * from './isTurnkeyEnabled';
+export * from './isWalletConnected';
+export * from './pixelToRem';
 export * from './randomString';
-export * from './stringifyURIQuery';
-export * from './digestSHA256';
-export * from './encodeBase64URL';
-export * from './getRedirectURIOrigin';
+export * from './requiresTwoStepAuthentication';
 export * from './sendTransactionWithAutoNonce';
-export * from './getProviderEnumForSocialSignInProvider';
-export * from './getEnabledSocialSignInProvidersAsProviderEnum';
-export * from './getActiveOauthCredential';
-export * from './getSocialSignInProviderForProviderEnum';
-export * from './getSocialSignInProviderFromString';
-export * from './getOauthLoginUrl';
-export * from './isTurnkeyEnabled';
-export * from './isEmbeddedWalletPresent';
-export * from './findEmbeddedWalletFromVerifiedCredentials';
-export * from './findTurnkeyWallet';
-export * from './isTestnet';
-export * from './getOrdinalNumber';
-export * from './getProviderByType';
-export * from './getUserWalletsFromVerifiedCredentials';
+export * from './shouldManuallyReconnectOnRefresh';
+export * from './storeAuthToken';
+export * from './stringifyURIQuery';
+export * from './removeElementById';

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

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

package/src/lib/utils/functions/removeElementById/removeElementById.cjs

@@ -0,0 +1,16 @@
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+const removeElementById = (elementId) => {
+    let modalRootElement;
+    if (typeof window !== 'undefined') {
+        modalRootElement = window.document.getElementById(elementId);
+        if (!modalRootElement) {
+            return;
+        }
+        window.document.body.removeChild(modalRootElement);
+    }
+};
+
+exports.removeElementById = removeElementById;

package/src/lib/utils/functions/removeElementById/removeElementById.d.ts

@@ -0,0 +1 @@
+export declare const removeElementById: (elementId: string) => void;

package/src/lib/utils/functions/removeElementById/removeElementById.js

@@ -0,0 +1,12 @@
+const removeElementById = (elementId) => {
+    let modalRootElement;
+    if (typeof window !== 'undefined') {
+        modalRootElement = window.document.getElementById(elementId);
+        if (!modalRootElement) {
+            return;
+        }
+        window.document.body.removeChild(modalRootElement);
+    }
+};
+
+export { removeElementById };

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

@@ -10,11 +10,11 @@ require('react/jsx-runtime');
 require('../../../context/ViewContext/ViewContext.cjs');
 require('react');
 require('@dynamic-labs/wallet-book');
-require('@dynamic-labs/utils');
 var localStorage$1 = require('../../constants/localStorage.cjs');
 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 storeAuthToken = (jwt) => {

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

@@ -6,11 +6,11 @@ import 'react/jsx-runtime';
 import '../../../context/ViewContext/ViewContext.js';
 import 'react';
 import '@dynamic-labs/wallet-book';
-import '@dynamic-labs/utils';
 import { AUTH_TOKEN } 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';
 
 const storeAuthToken = (jwt) => {

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/helpers/showPendingConnectView.cjs

@@ -5,7 +5,7 @@ Object.defineProperty(exports, '__esModule', { value: true });
 var _tslib = require('../../../../../../_virtual/_tslib.cjs');
 var getWalletProvider = require('../../../functions/getWalletProvider/getWalletProvider.cjs');
 
-const specialCareWallets = ['slope', 'myalgo', 'bloctoevm'];
+const specialCareWallets = ['slope', 'myalgo', 'bloctoevm', 'perawallet'];
 const showPendingConnectView = (walletConnector, setView) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
     const walletProvider = getWalletProvider.getWalletProvider(walletConnector);
     // We don't want to show the pending connect view for qrCode and walletConnect

package/src/lib/utils/hooks/authenticationHooks/helpers/showPendingConnectView.js

@@ -1,7 +1,7 @@
 import { __awaiter } from '../../../../../../_virtual/_tslib.js';
 import { getWalletProvider } from '../../../functions/getWalletProvider/getWalletProvider.js';
 
-const specialCareWallets = ['slope', 'myalgo', 'bloctoevm'];
+const specialCareWallets = ['slope', 'myalgo', 'bloctoevm', 'perawallet'];
 const showPendingConnectView = (walletConnector, setView) => __awaiter(void 0, void 0, void 0, function* () {
     const walletProvider = getWalletProvider(walletConnector);
     // We don't want to show the pending connect view for qrCode and walletConnect

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

@@ -4,34 +4,34 @@ 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');
 require('react/jsx-runtime');
 require('react');
 require('@dynamic-labs/wallet-book');
-require('@dynamic-labs/utils');
 var localStorage$1 = require('../../../constants/localStorage.cjs');
 require('../../../constants/colors.cjs');
 var localStorage = require('../../../../shared/utils/classes/storage/localStorage.cjs');
 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();
+    const { engageCaptcha, getCaptchaToken } = CaptchaContext.useCaptchaContext();
     const { setErrorMessage } = ErrorContext.useErrorContext();
-    const { captchaToken } = CaptchaContext.useCaptchaContext();
     const { authMode, connectWallet, consumeNonce, displaySiweStatement, environmentId, projectSettings, setIsSingleWalletAccount, user, walletUiUtils, setCallback, setIsVerificationInProgress, } = useInternalDynamicContext.useInternalDynamicContext();
     const { handleWalletsToConnect } = useHandleWalletsToConnect.useHandleWalletsToConnect();
     const verifyWallet = useVerifyWallet.useVerifyWallet({
@@ -41,8 +41,35 @@ const useConnectAndSign = ({ shouldUpdateWallets = true, shouldCallCallback = tr
         projectSettings,
         setIsSingleWalletAccount,
     });
+    const handleWalletVerify = (walletConnector, publicWalletAddress, captchaToken) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
+        if (!walletConnectorCore.isEmailWalletConnector(walletConnector) ||
+            walletConnectorCore.isBloctoConnector(walletConnector)) {
+            setView('pending-signature');
+        }
+        else {
+            walletUiUtils.disabledConfirmationOnce();
+        }
+        yield verifyWallet({
+            captchaToken,
+            publicWalletAddress,
+            walletConnector,
+        });
+    });
+    const handleWalletVerifyError = (err) => {
+        var _a;
+        const userCancelled = (err === null || err === void 0 ? void 0 : err.code) === 'user-cancelled';
+        if (!userCancelled)
+            logger.logger.debug(err);
+        setErrorMessage((_a = err === null || err === void 0 ? void 0 : err.code) === null || _a === void 0 ? void 0 : _a.toString());
+        goToInitialView();
+        // Since auth failed, clear verification flag
+        // But if user cancelled, clearStatesOnBackClick will have already cleared it. So avoid
+        // clearing again since that would trigger a warning
+        if (!userCancelled)
+            setIsVerificationInProgress(false);
+    };
     return ({ walletConnector, fetchPublicAddressOpts = undefined, }) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
-        var _a, _b;
+        var _a;
         // Raise verification ongoing flag
         setIsVerificationInProgress(true);
         try {
@@ -55,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,
@@ -70,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) {
@@ -79,34 +109,23 @@ const useConnectAndSign = ({ shouldUpdateWallets = true, shouldCallCallback = tr
                 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) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
+                        try {
+                            yield handleWalletVerify(walletConnector, address, captchaToken);
+                        }
+                        catch (e) {
+                            handleWalletVerifyError(e);
+                        }
+                    }),
+                });
                 return;
             }
-            if (!walletConnectorCore.isEmailWalletConnector(walletConnector) ||
-                walletConnectorCore.isBloctoConnector(walletConnector)) {
-                setView('pending-signature');
-            }
-            else {
-                walletUiUtils.disabledConfirmationOnce();
-            }
-            yield verifyWallet({
-                captchaToken,
-                publicWalletAddress,
-                walletConnector,
-            });
+            yield handleWalletVerify(walletConnector, address, getCaptchaToken());
         }
         catch (err) {
-            const userCancelled = (err === null || err === void 0 ? void 0 : err.code) === 'user-cancelled';
-            if (!userCancelled)
-                logger.logger.debug(err);
-            setErrorMessage((_b = err === null || err === void 0 ? void 0 : err.code) === null || _b === void 0 ? void 0 : _b.toString());
-            goToInitialView();
-            // Since auth failed, clear verification flag
-            // But if user cancelled, clearStatesOnBackClick will have already cleared it. So avoid
-            // clearing again since that would trigger a warning
-            if (!userCancelled)
-                setIsVerificationInProgress(false);
-            return;
+            handleWalletVerifyError(err);
         }
     });
 };

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

@@ -1,33 +1,33 @@
 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';
 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 { 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();
+    const { engageCaptcha, getCaptchaToken } = useCaptchaContext();
     const { setErrorMessage } = useErrorContext();
-    const { captchaToken } = useCaptchaContext();
     const { authMode, connectWallet, consumeNonce, displaySiweStatement, environmentId, projectSettings, setIsSingleWalletAccount, user, walletUiUtils, setCallback, setIsVerificationInProgress, } = useInternalDynamicContext();
     const { handleWalletsToConnect } = useHandleWalletsToConnect();
     const verifyWallet = useVerifyWallet({
@@ -37,8 +37,35 @@ const useConnectAndSign = ({ shouldUpdateWallets = true, shouldCallCallback = tr
         projectSettings,
         setIsSingleWalletAccount,
     });
+    const handleWalletVerify = (walletConnector, publicWalletAddress, captchaToken) => __awaiter(void 0, void 0, void 0, function* () {
+        if (!isEmailWalletConnector(walletConnector) ||
+            isBloctoConnector(walletConnector)) {
+            setView('pending-signature');
+        }
+        else {
+            walletUiUtils.disabledConfirmationOnce();
+        }
+        yield verifyWallet({
+            captchaToken,
+            publicWalletAddress,
+            walletConnector,
+        });
+    });
+    const handleWalletVerifyError = (err) => {
+        var _a;
+        const userCancelled = (err === null || err === void 0 ? void 0 : err.code) === 'user-cancelled';
+        if (!userCancelled)
+            logger.debug(err);
+        setErrorMessage((_a = err === null || err === void 0 ? void 0 : err.code) === null || _a === void 0 ? void 0 : _a.toString());
+        goToInitialView();
+        // Since auth failed, clear verification flag
+        // But if user cancelled, clearStatesOnBackClick will have already cleared it. So avoid
+        // clearing again since that would trigger a warning
+        if (!userCancelled)
+            setIsVerificationInProgress(false);
+    };
     return ({ walletConnector, fetchPublicAddressOpts = undefined, }) => __awaiter(void 0, void 0, void 0, function* () {
-        var _a, _b;
+        var _a;
         // Raise verification ongoing flag
         setIsVerificationInProgress(true);
         try {
@@ -51,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,
@@ -66,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) {
@@ -75,34 +105,23 @@ const useConnectAndSign = ({ shouldUpdateWallets = true, shouldCallCallback = tr
                 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* () {
+                        try {
+                            yield handleWalletVerify(walletConnector, address, captchaToken);
+                        }
+                        catch (e) {
+                            handleWalletVerifyError(e);
+                        }
+                    }),
+                });
                 return;
             }
-            if (!isEmailWalletConnector(walletConnector) ||
-                isBloctoConnector(walletConnector)) {
-                setView('pending-signature');
-            }
-            else {
-                walletUiUtils.disabledConfirmationOnce();
-            }
-            yield verifyWallet({
-                captchaToken,
-                publicWalletAddress,
-                walletConnector,
-            });
+            yield handleWalletVerify(walletConnector, address, getCaptchaToken());
         }
         catch (err) {
-            const userCancelled = (err === null || err === void 0 ? void 0 : err.code) === 'user-cancelled';
-            if (!userCancelled)
-                logger.debug(err);
-            setErrorMessage((_b = err === null || err === void 0 ? void 0 : err.code) === null || _b === void 0 ? void 0 : _b.toString());
-            goToInitialView();
-            // Since auth failed, clear verification flag
-            // But if user cancelled, clearStatesOnBackClick will have already cleared it. So avoid
-            // clearing again since that would trigger a warning
-            if (!userCancelled)
-                setIsVerificationInProgress(false);
-            return;
+            handleWalletVerifyError(err);
         }
     });
 };

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

@@ -16,11 +16,11 @@ require('@dynamic-labs/wallet-connector-core');
 require('react/jsx-runtime');
 require('react');
 require('@dynamic-labs/wallet-book');
-require('@dynamic-labs/utils');
 var localStorage$1 = require('../../../constants/localStorage.cjs');
 require('../../../constants/colors.cjs');
 var localStorage = 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');
 var useHandleWalletsToConnect = require('../../useHandleWalletsToConnect/useHandleWalletsToConnect.cjs');
@@ -28,7 +28,7 @@ var useHandleWalletsToConnect = require('../../useHandleWalletsToConnect/useHand
 const useConnectAndSignSplitSteps = () => {
     const { setView, goToInitialView } = ViewContext.useViewContext();
     const { setErrorMessage } = ErrorContext.useErrorContext();
-    const { captchaToken } = CaptchaContext.useCaptchaContext();
+    const { getCaptchaToken, engageCaptcha } = CaptchaContext.useCaptchaContext();
     const { connectWallet, consumeNonce, displaySiweStatement, projectSettings, environmentId, setIsSingleWalletAccount, setShowAuthFlow, user, authMode, setCallback, setIsVerificationInProgress, } = useInternalDynamicContext.useInternalDynamicContext();
     const { handleWalletsToConnect } = useHandleWalletsToConnect.useHandleWalletsToConnect();
     const verifyWallet = useVerifyWallet.useVerifyWallet({
@@ -48,15 +48,23 @@ 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 });
                 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) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
+                        setShowAuthFlow(true);
+                        setView('pending-signature');
+                    }),
+                });
                 return;
             }
             setShowAuthFlow(true);
@@ -76,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,
-                publicWalletAddress,
+                captchaToken: getCaptchaToken(),
+                publicWalletAddress: connectionResult.address,
                 walletConnector,
             });
         }