@dynamic-labs/sdk-react-core 0.18.0-RC.9 → 0.18.0-beta.28

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

@@ -32,6 +32,7 @@ const getDynamicLayoutData = ({ view }) => {
         },
     };
     const headerMap = {
+        'account-exists': { heading: 'Account already exists' },
         'chainalysis-blocked-wallet': {
             heading: 'Access denied',
         },

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

@@ -7,7 +7,7 @@ const getMissingChains = (arr1, arr2) => {
         return;
     }
     // create a Set of all 'chain' values from the second array
-    const chainSet = new Set(arr2.map((obj) => obj.chain));
+    const chainSet = new Set(arr2.map((obj) => obj.walletChain));
     // filter out objects from the first array that have 'chain' present in the set
     const uniqueChains = arr1.filter((obj) => !chainSet.has(obj.chain));
     return uniqueChains;

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

@@ -1,3 +1,3 @@
-import { ChainsToConnect } from '../../../context/DynamicContext';
+import { ChainsToConnect } from '../../../context/DynamicContext/types';
 import { ConnectedWalletConnectorType } from '../../hooks/useConnectWallet/useConnectWallet';
 export declare const getMissingChains: (arr1: ChainsToConnect[] | undefined, arr2: ConnectedWalletConnectorType[] | undefined) => ChainsToConnect[] | undefined;

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

@@ -3,7 +3,7 @@ const getMissingChains = (arr1, arr2) => {
         return;
     }
     // create a Set of all 'chain' values from the second array
-    const chainSet = new Set(arr2.map((obj) => obj.chain));
+    const chainSet = new Set(arr2.map((obj) => obj.walletChain));
     // filter out objects from the first array that have 'chain' present in the set
     const uniqueChains = arr1.filter((obj) => !chainSet.has(obj.chain));
     return uniqueChains;

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

@@ -6,7 +6,7 @@ var _tslib = require('../../../../../_virtual/_tslib.cjs');
 var index = require('../generateMessages/index.cjs');
 
 // TODO - This function is doing too much we should split it up.
-const getVerifyArgs = ({ walletConnector, nonce, walletProvider, environmentId, displayTermsOfService, skipEmptyAccountCheck, siweStatement, publicWalletAddress, }) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
+const getVerifyArgs = ({ walletConnector, nonce, walletProvider, environmentId, displaySiweStatement, skipEmptyAccountCheck, siweStatement, publicWalletAddress, }) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
     // WARNING - PLEASE READ!
     // DO NOT ADD ANY NEW ASYNC WORK WITH AWAIT!
     // Deep linking could break with too many blocking awaits
@@ -15,7 +15,7 @@ const getVerifyArgs = ({ walletConnector, nonce, walletProvider, environmentId,
     // instead of the actual wallet app.
     const chain = walletConnector.connectedChain;
     // generate message to sign and then initiate signing step to prove ownership
-    const { messageToSign, signedMessage } = yield index.generateMessages(publicWalletAddress, walletConnector, nonce, environmentId, displayTermsOfService, siweStatement);
+    const { messageToSign, signedMessage } = yield index.generateMessages(publicWalletAddress, walletConnector, nonce, environmentId, displaySiweStatement, siweStatement);
     const network = String(yield walletConnector.getNetwork());
     return {
         chain,

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

@@ -2,7 +2,7 @@ import { FetchPublicAddressOpts } from '@dynamic-labs/wallet-connector-core';
 import { WalletConnector } from '../../../..';
 import { WalletProvider } from '../../../shared';
 type Props = {
-    displayTermsOfService: boolean;
+    displaySiweStatement: boolean;
     environmentId: string;
     fetchPublicAddressOpts?: FetchPublicAddressOpts;
     nonce: string;
@@ -12,8 +12,8 @@ type Props = {
     walletConnector: WalletConnector;
     walletProvider: WalletProvider;
 };
-export declare const getVerifyArgs: ({ walletConnector, nonce, walletProvider, environmentId, displayTermsOfService, skipEmptyAccountCheck, siweStatement, publicWalletAddress, }: Props) => Promise<{
-    chain: "ETH" | "FLOW" | "SOL" | "EVM" | "ALGO" | "STARK" | "ATOM" | "COSMOS";
+export declare const getVerifyArgs: ({ walletConnector, nonce, walletProvider, environmentId, displaySiweStatement, skipEmptyAccountCheck, siweStatement, publicWalletAddress, }: Props) => Promise<{
+    chain: "ETH" | "FLOW" | "SOL" | "EVM" | "ALGO" | "STARK" | "ATOM" | "COSMOS" | undefined;
     messageToSign: string;
     network: string;
     publicWalletAddress: string;

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

@@ -2,7 +2,7 @@ import { __awaiter } from '../../../../../_virtual/_tslib.js';
 import { generateMessages } from '../generateMessages/index.js';
 
 // TODO - This function is doing too much we should split it up.
-const getVerifyArgs = ({ walletConnector, nonce, walletProvider, environmentId, displayTermsOfService, skipEmptyAccountCheck, siweStatement, publicWalletAddress, }) => __awaiter(void 0, void 0, void 0, function* () {
+const getVerifyArgs = ({ walletConnector, nonce, walletProvider, environmentId, displaySiweStatement, skipEmptyAccountCheck, siweStatement, publicWalletAddress, }) => __awaiter(void 0, void 0, void 0, function* () {
     // WARNING - PLEASE READ!
     // DO NOT ADD ANY NEW ASYNC WORK WITH AWAIT!
     // Deep linking could break with too many blocking awaits
@@ -11,7 +11,7 @@ const getVerifyArgs = ({ walletConnector, nonce, walletProvider, environmentId,
     // instead of the actual wallet app.
     const chain = walletConnector.connectedChain;
     // generate message to sign and then initiate signing step to prove ownership
-    const { messageToSign, signedMessage } = yield generateMessages(publicWalletAddress, walletConnector, nonce, environmentId, displayTermsOfService, siweStatement);
+    const { messageToSign, signedMessage } = yield generateMessages(publicWalletAddress, walletConnector, nonce, environmentId, displaySiweStatement, siweStatement);
     const network = String(yield walletConnector.getNetwork());
     return {
         chain,

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

@@ -0,0 +1,12 @@
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+const getWalletConnectorNetworks = (walletConnector) => {
+    if (!walletConnector)
+        return [];
+    const _walletConnector = walletConnector;
+    return (_walletConnector.evmNetworks || _walletConnector.starknetNetworks || []);
+};
+
+exports.getWalletConnectorNetworks = getWalletConnectorNetworks;

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

@@ -0,0 +1,3 @@
+import { NetworkConfiguration } from '@dynamic-labs/sdk-api';
+import { WalletConnector } from '@dynamic-labs/wallet-connector-core';
+export declare const getWalletConnectorNetworks: (walletConnector?: WalletConnector | null) => NetworkConfiguration[];

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

@@ -0,0 +1,8 @@
+const getWalletConnectorNetworks = (walletConnector) => {
+    if (!walletConnector)
+        return [];
+    const _walletConnector = walletConnector;
+    return (_walletConnector.evmNetworks || _walletConnector.starknetNetworks || []);
+};
+
+export { getWalletConnectorNetworks };

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

@@ -2,6 +2,8 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-const getWalletVerifiedCredential = (walletAddress, verifiedCredentials) => verifiedCredentials === null || verifiedCredentials === void 0 ? void 0 : verifiedCredentials.find((credential) => credential.address === walletAddress);
+var walletConnectorCore = require('@dynamic-labs/wallet-connector-core');
+
+const getWalletVerifiedCredential = (walletAddress, verifiedCredentials, walletChain) => verifiedCredentials === null || verifiedCredentials === void 0 ? void 0 : verifiedCredentials.find(({ address }) => walletConnectorCore.isSameAddress(address || '', walletAddress || '', walletChain));
 
 exports.getWalletVerifiedCredential = getWalletVerifiedCredential;

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

@@ -1,2 +1,2 @@
 import { JwtVerifiedCredential } from '@dynamic-labs/sdk-api';
-export declare const getWalletVerifiedCredential: (walletAddress: string | undefined, verifiedCredentials: JwtVerifiedCredential[] | undefined) => JwtVerifiedCredential | undefined;
+export declare const getWalletVerifiedCredential: (walletAddress: string | undefined, verifiedCredentials: JwtVerifiedCredential[] | undefined, walletChain: string) => JwtVerifiedCredential | undefined;

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

@@ -1,3 +1,5 @@
-const getWalletVerifiedCredential = (walletAddress, verifiedCredentials) => verifiedCredentials === null || verifiedCredentials === void 0 ? void 0 : verifiedCredentials.find((credential) => credential.address === walletAddress);
+import { isSameAddress } from '@dynamic-labs/wallet-connector-core';
+
+const getWalletVerifiedCredential = (walletAddress, verifiedCredentials, walletChain) => verifiedCredentials === null || verifiedCredentials === void 0 ? void 0 : verifiedCredentials.find(({ address }) => isSameAddress(address || '', walletAddress || '', walletChain));
 
 export { getWalletVerifiedCredential };

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

@@ -18,3 +18,6 @@ export * from './getReferencedAccount';
 export * from './getAppOrigin';
 export * from './groupBy';
 export * from './isProviderEnabled';
+export * from './isOnrampProvider';
+export * from './getWalletConnectorNetworks/getWalletConnectorNetworks';
+export * from './isSocialKycEnabled';

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

@@ -6,6 +6,7 @@ var sdkApi = require('@dynamic-labs/sdk-api');
 var isProviderEnabled = require('../isProviderEnabled/isProviderEnabled.cjs');
 
 const isEmailProviderEnabled = (providers) => isProviderEnabled.isProviderEnabled(providers, sdkApi.ProviderEnum.EmailOnly) ||
+    isProviderEnabled.isProviderEnabled(providers, sdkApi.ProviderEnum.Blocto) ||
     isProviderEnabled.isProviderEnabled(providers, sdkApi.ProviderEnum.MagicLink);
 
 exports.isEmailProviderEnabled = isEmailProviderEnabled;

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

@@ -2,6 +2,7 @@ import { ProviderEnum } from '@dynamic-labs/sdk-api';
 import { isProviderEnabled } from '../isProviderEnabled/isProviderEnabled.js';
 
 const isEmailProviderEnabled = (providers) => isProviderEnabled(providers, ProviderEnum.EmailOnly) ||
+    isProviderEnabled(providers, ProviderEnum.Blocto) ||
     isProviderEnabled(providers, ProviderEnum.MagicLink);
 
 export { isEmailProviderEnabled };

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

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

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

@@ -0,0 +1,9 @@
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+var onrampProviders = require('../../constants/onrampProviders.cjs');
+
+const isOnrampProvider = (provider) => onrampProviders.ONRAMP_PROVIDERS.includes(provider.provider);
+
+exports.isOnrampProvider = isOnrampProvider;

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

@@ -0,0 +1,2 @@
+import { Provider } from '@dynamic-labs/sdk-api';
+export declare const isOnrampProvider: (provider: Provider) => boolean;

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

@@ -0,0 +1,5 @@
+import { ONRAMP_PROVIDERS } from '../../constants/onrampProviders.js';
+
+const isOnrampProvider = (provider) => ONRAMP_PROVIDERS.includes(provider.provider);
+
+export { isOnrampProvider };

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

@@ -4,10 +4,10 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var walletConnectorCore = require('@dynamic-labs/wallet-connector-core');
 
-const isSelectedWalletAlreadyConnected = (connectedWallets, selectedWallet, user) => {
+const isSelectedWalletAlreadyConnected = (linkedWallets, selectedWallet, user) => {
     if (!user)
         return false;
-    return connectedWallets
+    return linkedWallets
         .map(({ connector }) => walletConnectorCore.normalizeWalletName(connector.name))
         .includes(walletConnectorCore.normalizeWalletName(selectedWallet.name));
 };

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

@@ -1,3 +1,3 @@
 import type { WalletConnector } from '@dynamic-labs/wallet-connector-core';
 import { UserProfile, Wallet } from '../../../shared/types';
-export declare const isSelectedWalletAlreadyConnected: (connectedWallets: Wallet[], selectedWallet: WalletConnector, user?: UserProfile | undefined) => boolean;
+export declare const isSelectedWalletAlreadyConnected: (linkedWallets: Wallet[], selectedWallet: WalletConnector, user?: UserProfile | undefined) => boolean;

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

@@ -1,9 +1,9 @@
 import { normalizeWalletName } from '@dynamic-labs/wallet-connector-core';
 
-const isSelectedWalletAlreadyConnected = (connectedWallets, selectedWallet, user) => {
+const isSelectedWalletAlreadyConnected = (linkedWallets, selectedWallet, user) => {
     if (!user)
         return false;
-    return connectedWallets
+    return linkedWallets
         .map(({ connector }) => normalizeWalletName(connector.name))
         .includes(normalizeWalletName(selectedWallet.name));
 };

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

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

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

@@ -0,0 +1,7 @@
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+const isSocialKycEnabled = (projectSettings) => { var _a; return Boolean((_a = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.kyc.find(({ name }) => name === 'social')) === null || _a === void 0 ? void 0 : _a.enabled); };
+
+exports.isSocialKycEnabled = isSocialKycEnabled;

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

@@ -0,0 +1,2 @@
+import { ProjectSettings } from '@dynamic-labs/sdk-api';
+export declare const isSocialKycEnabled: (projectSettings?: ProjectSettings) => boolean;

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

@@ -0,0 +1,3 @@
+const isSocialKycEnabled = (projectSettings) => { var _a; return Boolean((_a = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.kyc.find(({ name }) => name === 'social')) === null || _a === void 0 ? void 0 : _a.enabled); };
+
+export { isSocialKycEnabled };

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

@@ -2,15 +2,15 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
+var getWalletConnectorNetworks = require('../getWalletConnectorNetworks/getWalletConnectorNetworks.cjs');
+
 const isSupportedNetwork = ({ walletConnector, network }) => {
-    const evmNetworks = walletConnector.evmNetworks || [];
-    /**
-     * Currently only supports EVM networks. But this could support other types of networks in the future.
-     * When this happens, network could be a string (solana) or a number (ethereum). Be sure to remove the Number() cast.
-     * when this happens.
-     */
-    const currentEvmNetwork = evmNetworks === null || evmNetworks === void 0 ? void 0 : evmNetworks.find((element) => element.chainId === Number(network));
-    return !(evmNetworks && evmNetworks.length && !currentEvmNetwork);
+    const supportedNetworks = getWalletConnectorNetworks.getWalletConnectorNetworks(walletConnector);
+    if (!supportedNetworks.length) {
+        return true;
+    }
+    const isCurrentNetworkSupported = supportedNetworks.some(({ chainId }) => String(chainId) === String(network));
+    return isCurrentNetworkSupported;
 };
 
 exports.isSupportedNetwork = isSupportedNetwork;

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

@@ -1,12 +1,12 @@
+import { getWalletConnectorNetworks } from '../getWalletConnectorNetworks/getWalletConnectorNetworks.js';
+
 const isSupportedNetwork = ({ walletConnector, network }) => {
-    const evmNetworks = walletConnector.evmNetworks || [];
-    /**
-     * Currently only supports EVM networks. But this could support other types of networks in the future.
-     * When this happens, network could be a string (solana) or a number (ethereum). Be sure to remove the Number() cast.
-     * when this happens.
-     */
-    const currentEvmNetwork = evmNetworks === null || evmNetworks === void 0 ? void 0 : evmNetworks.find((element) => element.chainId === Number(network));
-    return !(evmNetworks && evmNetworks.length && !currentEvmNetwork);
+    const supportedNetworks = getWalletConnectorNetworks(walletConnector);
+    if (!supportedNetworks.length) {
+        return true;
+    }
+    const isCurrentNetworkSupported = supportedNetworks.some(({ chainId }) => String(chainId) === String(network));
+    return isCurrentNetworkSupported;
 };
 
 export { isSupportedNetwork };

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

@@ -18,9 +18,7 @@ require('ethers');
 require('../../../shared/consts/index.cjs');
 
 const storeAuthToken = (jwt) => {
-    // TODO: update it to not use localStorage
-    //        when we decide how to handle JWT https://linear.app/dynamic-labs/issue/DYN-178
-    localStorage.LocalStorage.setToLS(localStorage$1.AUTH_TOKEN, jwt);
+    localStorage.LocalStorage.setToLS(localStorage$1.AUTH_TOKEN, jwt, true);
 };
 
 exports.storeAuthToken = storeAuthToken;

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

@@ -14,9 +14,7 @@ import 'ethers';
 import '../../../shared/consts/index.js';
 
 const storeAuthToken = (jwt) => {
-    // TODO: update it to not use localStorage
-    //        when we decide how to handle JWT https://linear.app/dynamic-labs/issue/DYN-178
-    LocalStorage.setToLS(AUTH_TOKEN, jwt);
+    LocalStorage.setToLS(AUTH_TOKEN, jwt, true);
 };
 
 export { storeAuthToken };

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'];
+const specialCareWallets = ['slope', 'myalgo', 'bloctoevm'];
 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'];
+const specialCareWallets = ['slope', 'myalgo', 'bloctoevm'];
 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

@@ -32,31 +32,34 @@ const useConnectAndSign = () => {
     const { setView, goToInitialView } = ViewContext.useViewContext();
     const { setErrorMessage } = ErrorContext.useErrorContext();
     const { captchaToken } = CaptchaContext.useCaptchaContext();
-    const { authMode, connectWallet, consumeNonce, displayTermsOfService, environmentId, projectSettings, setIsSingleWalletAccount, user, walletUiUtils, setCallback, setNetwork, } = useInternalDynamicContext.useInternalDynamicContext();
+    const { authMode, connectWallet, consumeNonce, displaySiweStatement, environmentId, projectSettings, setIsSingleWalletAccount, user, walletUiUtils, setCallback, setIsVerificationInProgress, isFullyConnected, } = useInternalDynamicContext.useInternalDynamicContext();
     const { handleWalletsToConnect } = useHandleWalletsToConnect.useHandleWalletsToConnect();
     const verifyWallet = useVerifyWallet.useVerifyWallet({
         consumeNonce,
-        displayTermsOfService,
+        displaySiweStatement,
         environmentId,
         projectSettings,
         setIsSingleWalletAccount,
     });
     return ({ walletConnector, fetchPublicAddressOpts = undefined, }) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
         var _a, _b;
-        yield showPendingConnectView.showPendingConnectView(walletConnector, setView);
+        // Raise verification ongoing flag
+        setIsVerificationInProgress(true);
         try {
+            yield showPendingConnectView.showPendingConnectView(walletConnector, setView);
             if (walletConnectorCore.isEmailWalletConnector(walletConnector)) {
                 if (walletConnectorCore.isEmailOTPWalletConnector(walletConnector)) {
                     setView('email-wallet-otp-verification-view');
                 }
-                else {
+                else if (!walletConnectorCore.isBloctoConnector(walletConnector)) {
                     setView('wait-for-email-confirmation-view');
                 }
             }
             const publicWalletAddress = yield connectWallet(walletConnector, fetchPublicAddressOpts);
-            setCallback('connectSuccess');
+            if (!publicWalletAddress) {
+                return;
+            }
             const walletNetwork = yield walletConnector.getNetwork();
-            setNetwork(walletNetwork);
             const usesSupportedNetwork = isSupportedNetwork.isSupportedNetwork({
                 network: walletNetwork,
                 walletConnector,
@@ -70,13 +73,18 @@ const useConnectAndSign = () => {
             if (isConnectOnly.isConnectOnly(user, authMode)) {
                 localStorage.LocalStorage.setToLS(localStorage$1.LAST_USED_WALLET, walletConnector.name);
                 handleWalletsToConnect();
+                if (!isFullyConnected) {
+                    setCallback('connectSuccess');
+                }
                 return;
             }
+            setCallback('connectSuccess');
             if ((_a = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.security.hCaptcha) === null || _a === void 0 ? void 0 : _a.enabled) {
                 setView('captcha');
                 return;
             }
-            if (!walletConnectorCore.isEmailWalletConnector(walletConnector)) {
+            if (!walletConnectorCore.isEmailWalletConnector(walletConnector) ||
+                walletConnectorCore.isBloctoConnector(walletConnector)) {
                 setView('pending-signature');
             }
             else {
@@ -92,6 +100,8 @@ const useConnectAndSign = () => {
             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, lower flag
+            setIsVerificationInProgress(false);
             return;
         }
     });

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

@@ -1,5 +1,5 @@
 import { __awaiter } from '../../../../../../_virtual/_tslib.js';
-import { isEmailWalletConnector, isEmailOTPWalletConnector } from '@dynamic-labs/wallet-connector-core';
+import { isEmailWalletConnector, isEmailOTPWalletConnector, isBloctoConnector } from '@dynamic-labs/wallet-connector-core';
 import { showPendingConnectView } from '../helpers/showPendingConnectView.js';
 import { isConnectOnly } from '../helpers/isConnectOnly.js';
 import { useInternalDynamicContext } from '../../../../context/DynamicContext/useInternalDynamicContext.js';
@@ -28,31 +28,34 @@ const useConnectAndSign = () => {
     const { setView, goToInitialView } = useViewContext();
     const { setErrorMessage } = useErrorContext();
     const { captchaToken } = useCaptchaContext();
-    const { authMode, connectWallet, consumeNonce, displayTermsOfService, environmentId, projectSettings, setIsSingleWalletAccount, user, walletUiUtils, setCallback, setNetwork, } = useInternalDynamicContext();
+    const { authMode, connectWallet, consumeNonce, displaySiweStatement, environmentId, projectSettings, setIsSingleWalletAccount, user, walletUiUtils, setCallback, setIsVerificationInProgress, isFullyConnected, } = useInternalDynamicContext();
     const { handleWalletsToConnect } = useHandleWalletsToConnect();
     const verifyWallet = useVerifyWallet({
         consumeNonce,
-        displayTermsOfService,
+        displaySiweStatement,
         environmentId,
         projectSettings,
         setIsSingleWalletAccount,
     });
     return ({ walletConnector, fetchPublicAddressOpts = undefined, }) => __awaiter(void 0, void 0, void 0, function* () {
         var _a, _b;
-        yield showPendingConnectView(walletConnector, setView);
+        // Raise verification ongoing flag
+        setIsVerificationInProgress(true);
         try {
+            yield showPendingConnectView(walletConnector, setView);
             if (isEmailWalletConnector(walletConnector)) {
                 if (isEmailOTPWalletConnector(walletConnector)) {
                     setView('email-wallet-otp-verification-view');
                 }
-                else {
+                else if (!isBloctoConnector(walletConnector)) {
                     setView('wait-for-email-confirmation-view');
                 }
             }
             const publicWalletAddress = yield connectWallet(walletConnector, fetchPublicAddressOpts);
-            setCallback('connectSuccess');
+            if (!publicWalletAddress) {
+                return;
+            }
             const walletNetwork = yield walletConnector.getNetwork();
-            setNetwork(walletNetwork);
             const usesSupportedNetwork = isSupportedNetwork({
                 network: walletNetwork,
                 walletConnector,
@@ -66,13 +69,18 @@ const useConnectAndSign = () => {
             if (isConnectOnly(user, authMode)) {
                 LocalStorage.setToLS(LAST_USED_WALLET, walletConnector.name);
                 handleWalletsToConnect();
+                if (!isFullyConnected) {
+                    setCallback('connectSuccess');
+                }
                 return;
             }
+            setCallback('connectSuccess');
             if ((_a = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.security.hCaptcha) === null || _a === void 0 ? void 0 : _a.enabled) {
                 setView('captcha');
                 return;
             }
-            if (!isEmailWalletConnector(walletConnector)) {
+            if (!isEmailWalletConnector(walletConnector) ||
+                isBloctoConnector(walletConnector)) {
                 setView('pending-signature');
             }
             else {
@@ -88,6 +96,8 @@ const useConnectAndSign = () => {
             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, lower flag
+            setIsVerificationInProgress(false);
             return;
         }
     });

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

@@ -29,11 +29,11 @@ const useConnectAndSignSplitSteps = () => {
     const { setView, goToInitialView } = ViewContext.useViewContext();
     const { setErrorMessage } = ErrorContext.useErrorContext();
     const { captchaToken } = CaptchaContext.useCaptchaContext();
-    const { connectWallet, consumeNonce, displayTermsOfService, projectSettings, environmentId, setIsSingleWalletAccount, setShowAuthFlow, user, authMode, setCallback, } = useInternalDynamicContext.useInternalDynamicContext();
+    const { connectWallet, consumeNonce, displaySiweStatement, projectSettings, environmentId, setIsSingleWalletAccount, setShowAuthFlow, user, authMode, setCallback, setIsVerificationInProgress, } = useInternalDynamicContext.useInternalDynamicContext();
     const { handleWalletsToConnect } = useHandleWalletsToConnect.useHandleWalletsToConnect();
     const verifyWallet = useVerifyWallet.useVerifyWallet({
         consumeNonce,
-        displayTermsOfService,
+        displaySiweStatement,
         environmentId,
         projectSettings,
         setIsSingleWalletAccount,
@@ -44,6 +44,8 @@ const useConnectAndSignSplitSteps = () => {
     // or in Dapper
     const onlyConnectUser = ({ walletConnector, fetchPublicAddressOpts = undefined, }) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
         var _a;
+        // Raise verification ongoing flag
+        setIsVerificationInProgress(true);
         yield showPendingConnectView.showPendingConnectView(walletConnector, setView);
         try {
             yield connectWallet(walletConnector, fetchPublicAddressOpts);
@@ -64,14 +66,20 @@ const useConnectAndSignSplitSteps = () => {
             logger.logger.debug(err);
             setErrorMessage(err.toString());
             goToInitialView();
+            setIsVerificationInProgress(false);
             return;
         }
     });
     // This method is similar to useConnectAndSign, but it does not call showPendingConnectView
     // This is because we already called it in onlyConnectUser and now we just want to sign
     const signAlreadyConnectedUser = ({ walletConnector, fetchPublicAddressOpts = undefined, }) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
+        // Raise verification ongoing flag
+        setIsVerificationInProgress(true);
         try {
             const publicWalletAddress = yield connectWallet(walletConnector, fetchPublicAddressOpts);
+            if (!publicWalletAddress) {
+                return;
+            }
             yield verifyWallet({
                 captchaToken,
                 publicWalletAddress,
@@ -82,6 +90,7 @@ const useConnectAndSignSplitSteps = () => {
             logger.logger.debug(err);
             setErrorMessage(err.toString());
             goToInitialView();
+            setIsVerificationInProgress(false);
             return;
         }
     });

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

@@ -25,11 +25,11 @@ const useConnectAndSignSplitSteps = () => {
     const { setView, goToInitialView } = useViewContext();
     const { setErrorMessage } = useErrorContext();
     const { captchaToken } = useCaptchaContext();
-    const { connectWallet, consumeNonce, displayTermsOfService, projectSettings, environmentId, setIsSingleWalletAccount, setShowAuthFlow, user, authMode, setCallback, } = useInternalDynamicContext();
+    const { connectWallet, consumeNonce, displaySiweStatement, projectSettings, environmentId, setIsSingleWalletAccount, setShowAuthFlow, user, authMode, setCallback, setIsVerificationInProgress, } = useInternalDynamicContext();
     const { handleWalletsToConnect } = useHandleWalletsToConnect();
     const verifyWallet = useVerifyWallet({
         consumeNonce,
-        displayTermsOfService,
+        displaySiweStatement,
         environmentId,
         projectSettings,
         setIsSingleWalletAccount,
@@ -40,6 +40,8 @@ const useConnectAndSignSplitSteps = () => {
     // or in Dapper
     const onlyConnectUser = ({ walletConnector, fetchPublicAddressOpts = undefined, }) => __awaiter(void 0, void 0, void 0, function* () {
         var _a;
+        // Raise verification ongoing flag
+        setIsVerificationInProgress(true);
         yield showPendingConnectView(walletConnector, setView);
         try {
             yield connectWallet(walletConnector, fetchPublicAddressOpts);
@@ -60,14 +62,20 @@ const useConnectAndSignSplitSteps = () => {
             logger.debug(err);
             setErrorMessage(err.toString());
             goToInitialView();
+            setIsVerificationInProgress(false);
             return;
         }
     });
     // This method is similar to useConnectAndSign, but it does not call showPendingConnectView
     // This is because we already called it in onlyConnectUser and now we just want to sign
     const signAlreadyConnectedUser = ({ walletConnector, fetchPublicAddressOpts = undefined, }) => __awaiter(void 0, void 0, void 0, function* () {
+        // Raise verification ongoing flag
+        setIsVerificationInProgress(true);
         try {
             const publicWalletAddress = yield connectWallet(walletConnector, fetchPublicAddressOpts);
+            if (!publicWalletAddress) {
+                return;
+            }
             yield verifyWallet({
                 captchaToken,
                 publicWalletAddress,
@@ -78,6 +86,7 @@ const useConnectAndSignSplitSteps = () => {
             logger.debug(err);
             setErrorMessage(err.toString());
             goToInitialView();
+            setIsVerificationInProgress(false);
             return;
         }
     });