@dynamic-labs/sdk-react-core 2.0.0-alpha.3 → 2.0.0-alpha.30

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

@@ -0,0 +1,36 @@
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+require('@dynamic-labs/wallet-connector-core');
+require('@dynamic-labs/sdk-api-core');
+require('../../../shared/logger.cjs');
+require('@dynamic-labs/iconic');
+require('react/jsx-runtime');
+require('../../../context/ViewContext/ViewContext.cjs');
+require('react');
+require('@dynamic-labs/wallet-book');
+require('../../constants/colors.cjs');
+require('../../constants/values.cjs');
+require('../../../shared/utils/classes/storage/localStorage.cjs');
+require('@dynamic-labs/utils');
+require('../../../shared/consts/index.cjs');
+require('../../../../../_virtual/_tslib.cjs');
+require('@dynamic-labs/multi-wallet');
+require('react-international-phone');
+require('viem');
+require('viem/chains');
+var requiresPasswordForEmbeddedWallet = require('../requiresPasswordForEmbeddedWallet/requiresPasswordForEmbeddedWallet.cjs');
+require('i18next');
+require('../../../config/ApiEndpoint.cjs');
+
+const requiresPasswordForEmbeddedWalletOnSignup = (projectSettings) => {
+    const embeddedWalletsSettings = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk.embeddedWallets;
+    if (!embeddedWalletsSettings) {
+        return false;
+    }
+    return (requiresPasswordForEmbeddedWallet.requiresPasswordForEmbeddedWallet(projectSettings) &&
+        Boolean(embeddedWalletsSettings.forceAuthenticatorAtSignup));
+};
+
+exports.requiresPasswordForEmbeddedWalletOnSignup = requiresPasswordForEmbeddedWalletOnSignup;

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

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

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

@@ -0,0 +1,32 @@
+import '@dynamic-labs/wallet-connector-core';
+import '@dynamic-labs/sdk-api-core';
+import '../../../shared/logger.js';
+import '@dynamic-labs/iconic';
+import 'react/jsx-runtime';
+import '../../../context/ViewContext/ViewContext.js';
+import 'react';
+import '@dynamic-labs/wallet-book';
+import '../../constants/colors.js';
+import '../../constants/values.js';
+import '../../../shared/utils/classes/storage/localStorage.js';
+import '@dynamic-labs/utils';
+import '../../../shared/consts/index.js';
+import '../../../../../_virtual/_tslib.js';
+import '@dynamic-labs/multi-wallet';
+import 'react-international-phone';
+import 'viem';
+import 'viem/chains';
+import { requiresPasswordForEmbeddedWallet } from '../requiresPasswordForEmbeddedWallet/requiresPasswordForEmbeddedWallet.js';
+import 'i18next';
+import '../../../config/ApiEndpoint.js';
+
+const requiresPasswordForEmbeddedWalletOnSignup = (projectSettings) => {
+    const embeddedWalletsSettings = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk.embeddedWallets;
+    if (!embeddedWalletsSettings) {
+        return false;
+    }
+    return (requiresPasswordForEmbeddedWallet(projectSettings) &&
+        Boolean(embeddedWalletsSettings.forceAuthenticatorAtSignup));
+};
+
+export { requiresPasswordForEmbeddedWalletOnSignup };

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

@@ -2,7 +2,7 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-require('@dynamic-labs/sdk-api');
+require('@dynamic-labs/sdk-api-core');
 require('../../../shared/logger.cjs');
 require('@dynamic-labs/iconic');
 require('@dynamic-labs/wallet-connector-core');
@@ -14,12 +14,12 @@ var localStorage$1 = require('../../constants/localStorage.cjs');
 require('../../constants/colors.cjs');
 require('../../constants/values.cjs');
 var localStorage = require('../../../shared/utils/classes/storage/localStorage.cjs');
-require('viem');
 require('@dynamic-labs/utils');
 require('../../../shared/consts/index.cjs');
 
-const storeAuthToken = (jwt) => {
+const storeAuthToken = (jwt, minifiedJwt) => {
     localStorage.LocalStorage.setToLS(localStorage$1.AUTH_TOKEN, jwt, true);
+    localStorage.LocalStorage.setToLS(localStorage$1.AUTH_MIN_TOKEN, minifiedJwt, true);
 };
 
 exports.storeAuthToken = storeAuthToken;

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

@@ -1 +1 @@
-export declare const storeAuthToken: (jwt: string) => void;
+export declare const storeAuthToken: (jwt: string, minifiedJwt: string) => void;

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

@@ -1,4 +1,4 @@
-import '@dynamic-labs/sdk-api';
+import '@dynamic-labs/sdk-api-core';
 import '../../../shared/logger.js';
 import '@dynamic-labs/iconic';
 import '@dynamic-labs/wallet-connector-core';
@@ -6,16 +6,16 @@ import 'react/jsx-runtime';
 import '../../../context/ViewContext/ViewContext.js';
 import 'react';
 import '@dynamic-labs/wallet-book';
-import { AUTH_TOKEN } from '../../constants/localStorage.js';
+import { AUTH_TOKEN, AUTH_MIN_TOKEN } from '../../constants/localStorage.js';
 import '../../constants/colors.js';
 import '../../constants/values.js';
 import { LocalStorage } from '../../../shared/utils/classes/storage/localStorage.js';
-import 'viem';
 import '@dynamic-labs/utils';
 import '../../../shared/consts/index.js';
 
-const storeAuthToken = (jwt) => {
+const storeAuthToken = (jwt, minifiedJwt) => {
     LocalStorage.setToLS(AUTH_TOKEN, jwt, true);
+    LocalStorage.setToLS(AUTH_MIN_TOKEN, minifiedJwt, true);
 };
 
 export { storeAuthToken };

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

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

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

@@ -0,0 +1,19 @@
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+var utils = require('@dynamic-labs/utils');
+var decodeJwt = require('../../../shared/utils/functions/decodeJwt/decodeJwt.cjs');
+var createUserProfile = require('../createUserProfile/createUserProfile.cjs');
+var index = require('../storeAuthToken/index.cjs');
+
+const updateJWTAndCreateUserProfile = (jwt, minJwt) => {
+    const decodedJWT = decodeJwt.decodeJwt(jwt);
+    if (!jwt || !decodedJWT || !minJwt) {
+        throw new utils.DynamicError('Invalid session');
+    }
+    index.storeAuthToken(jwt, minJwt);
+    return createUserProfile.createUserProfile(decodedJWT);
+};
+
+exports.updateJWTAndCreateUserProfile = updateJWTAndCreateUserProfile;

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

@@ -0,0 +1 @@
+export declare const updateJWTAndCreateUserProfile: (jwt: string | undefined, minJwt: string | undefined) => import("../../../shared").UserProfile;

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

@@ -0,0 +1,15 @@
+import { DynamicError } from '@dynamic-labs/utils';
+import { decodeJwt } from '../../../shared/utils/functions/decodeJwt/decodeJwt.js';
+import { createUserProfile } from '../createUserProfile/createUserProfile.js';
+import { storeAuthToken } from '../storeAuthToken/index.js';
+
+const updateJWTAndCreateUserProfile = (jwt, minJwt) => {
+    const decodedJWT = decodeJwt(jwt);
+    if (!jwt || !decodedJWT || !minJwt) {
+        throw new DynamicError('Invalid session');
+    }
+    storeAuthToken(jwt, minJwt);
+    return createUserProfile(decodedJWT);
+};
+
+export { updateJWTAndCreateUserProfile };

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

@@ -0,0 +1 @@
+export * from './validatePhoneLength';

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

@@ -0,0 +1,15 @@
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+var reactInternationalPhone = require('react-international-phone');
+
+/** Whether phone number length matches the expectation for this country */
+const validatePhoneLength = (phone, country) => reactInternationalPhone.removeDialCode({ dialCode: country.dialCode, phone }).length ===
+    reactInternationalPhone.getActiveFormattingMask({
+        country,
+        disableFormatting: true,
+        phone,
+    }).length;
+
+exports.validatePhoneLength = validatePhoneLength;

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

@@ -0,0 +1,3 @@
+import { ParsedCountry } from 'react-international-phone';
+/** Whether phone number length matches the expectation for this country */
+export declare const validatePhoneLength: (phone: string, country: ParsedCountry) => boolean;

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

@@ -0,0 +1,11 @@
+import { removeDialCode, getActiveFormattingMask } from 'react-international-phone';
+
+/** Whether phone number length matches the expectation for this country */
+const validatePhoneLength = (phone, country) => removeDialCode({ dialCode: country.dialCode, phone }).length ===
+    getActiveFormattingMask({
+        country,
+        disableFormatting: true,
+        phone,
+    }).length;
+
+export { validatePhoneLength };

package/src/lib/utils/functions/walletListBuilder/utils/getCalculatedOffset/getCalculatedOffset.cjs

@@ -2,16 +2,21 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
+require('../../../../constants/colors.cjs');
+var values = require('../../../../constants/values.cjs');
 var findLastPriorityIndex = require('../findLastWalletIndex/findLastPriorityIndex.cjs');
 
 const getCalculatedOffset = ({ hasWalletFilter, defaultOffset, list, priorityList, }) => {
     const lastPriorityIndex = findLastPriorityIndex.findLastPriorityIndex(list, priorityList);
-    if (hasWalletFilter ||
-        list.length <= defaultOffset ||
-        lastPriorityIndex === -1) {
+    if (defaultOffset === values.DEFAULT_NUMBER_OF_WALLETS_TO_SHOW &&
+        !hasWalletFilter &&
+        list.length > defaultOffset &&
+        lastPriorityIndex !== -1) {
+        return lastPriorityIndex + 1;
+    }
+    else {
         return defaultOffset;
     }
-    return lastPriorityIndex + 1;
 };
 
 exports.getCalculatedOffset = getCalculatedOffset;

package/src/lib/utils/functions/walletListBuilder/utils/getCalculatedOffset/getCalculatedOffset.js

@@ -1,13 +1,18 @@
+import '../../../../constants/colors.js';
+import { DEFAULT_NUMBER_OF_WALLETS_TO_SHOW } from '../../../../constants/values.js';
 import { findLastPriorityIndex } from '../findLastWalletIndex/findLastPriorityIndex.js';
 
 const getCalculatedOffset = ({ hasWalletFilter, defaultOffset, list, priorityList, }) => {
     const lastPriorityIndex = findLastPriorityIndex(list, priorityList);
-    if (hasWalletFilter ||
-        list.length <= defaultOffset ||
-        lastPriorityIndex === -1) {
+    if (defaultOffset === DEFAULT_NUMBER_OF_WALLETS_TO_SHOW &&
+        !hasWalletFilter &&
+        list.length > defaultOffset &&
+        lastPriorityIndex !== -1) {
+        return lastPriorityIndex + 1;
+    }
+    else {
         return defaultOffset;
     }
-    return lastPriorityIndex + 1;
 };
 
 export { getCalculatedOffset };

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

@@ -13,7 +13,6 @@ const PRIORITY_WALLET_LIST = [
     'walletconnect',
     'phantom',
     'argentx',
-    'myalgo',
     'blocto',
     'solflare',
     'braavos',
@@ -107,8 +106,10 @@ const walletListBuilder = ({ authMode, connectedWallets, multiWallet, numberOfWa
     const finalizedWalletList = groupWallets
         ? groupWalletOptions.groupWalletOptions(walletBook, walletsList)
         : walletsList;
+    // If a filter has been applied we want to add an offset to the number of wallets
+    // to include the installed and last used wallets
     const updatedNumberOfWalletsToShow = showMoreWalletsWithFilter && hasWalletFilter
-        ? calculateWithFilterNumberOfWalletsToShow(orderedInputList, firstPriorityWallets.concat(installedWallets), numberOfWalletsToShow)
+        ? calculateWalletOffsetBasedOnInstalledAndLastUsedWallets(orderedInputList, firstPriorityWallets.concat(installedWallets), numberOfWalletsToShow)
         : numberOfWalletsToShow;
     return {
         numberOfWallets: walletsList.length,
@@ -126,14 +127,30 @@ const orderAndFilterList = (walletList, walletsFilter, isWalletConnectList, reco
         return sortedWalletList;
     }
 };
+const KEEP_WALLETS_NAME_LIST = ['wallet connect'];
 const applySearchFilterToWalletOptionList = (rawSearchFilter, walletOptionList) => {
     const searchFilter = rawSearchFilter.trim().toLowerCase();
+    const cleanName = (name) => {
+        const trimmedLowerName = name.trim().toLowerCase();
+        if (KEEP_WALLETS_NAME_LIST.includes(trimmedLowerName)) {
+            return trimmedLowerName;
+        }
+        else {
+            return trimmedLowerName
+                .replace('wallet', '')
+                .replace('evm', '')
+                .replace('starknet', '')
+                .replace('solana', '')
+                .replace('flow', '')
+                .replace('bitcoin', '');
+        }
+    };
     return walletOptionList.filter((walletOption) => {
         var _a;
-        return walletOption.name.trim().toLowerCase().includes(searchFilter) ||
+        return cleanName(walletOption.name).includes(searchFilter) ||
             (
             // Validate nested wallets
-            (_a = walletOption.groupedWallets) === null || _a === void 0 ? void 0 : _a.some((nestedWalletOption) => nestedWalletOption.name.trim().toLowerCase().includes(searchFilter)));
+            (_a = walletOption.groupedWallets) === null || _a === void 0 ? void 0 : _a.some((nestedWalletOption) => cleanName(nestedWalletOption.name).includes(searchFilter)));
     });
 };
 const listToDisplay = (finalizedList, searchFilter, isWalletConnectList, numberOfWalletsToShow, hasWalletFilter, loginWithEmail) => {
@@ -158,19 +175,18 @@ const listToDisplay = (finalizedList, searchFilter, isWalletConnectList, numberO
     }
 };
 /**
- * When a filter is applied we would like to show the installed + last used wallets
- * in addition to the wallets that the filter has specified.
  * This calculation adds an offset to numberOfWalletsToShow so we will show the
  * intended wallets + installed and last used.
+ * We should would only apply the additonal offset if the installed wallets was not in the original list.
  *
  * For example:
  * we want to show 4 wallets: ['metamask', 'rainbow', 'walletconnect', 'coinbase']
  * and someone is using brave with installed phantom he should see
  * [ 'brave injected', phantom ,'metamask', 'rainbow', 'walletconnect', 'coinbase',]
- *
- * note — this should only apply to the WalletList view!
+ * And when someone is using metamask and coinbase they should see
+ * [ 'metamask', 'coinbase', 'rainbow', 'walletconnect']
  */
-const calculateWithFilterNumberOfWalletsToShow = (allWalletsOrdered, installedOrUsedWallets, numberOfWalletsToShow) => {
+const calculateWalletOffsetBasedOnInstalledAndLastUsedWallets = (allWalletsOrdered, installedOrUsedWallets, numberOfWalletsToShow) => {
     const filteredWallets = allWalletsOrdered.slice(0, numberOfWalletsToShow);
     const offset = installedOrUsedWallets.filter((wallet) => !filteredWallets.includes(wallet)).length;
     return numberOfWalletsToShow + offset;
@@ -190,4 +206,5 @@ const getSignWithEmailWallet = (signWithEmailWalletName, inputList) => {
 
 exports.PRIORITY_WALLET_LIST = PRIORITY_WALLET_LIST;
 exports.SIGN_IN_WITH_EMAIL_WALLET_NAME = SIGN_IN_WITH_EMAIL_WALLET_NAME;
+exports.calculateWalletOffsetBasedOnInstalledAndLastUsedWallets = calculateWalletOffsetBasedOnInstalledAndLastUsedWallets;
 exports.walletListBuilder = walletListBuilder;

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

@@ -24,4 +24,17 @@ type BuilderResult = {
 export declare const PRIORITY_WALLET_LIST: string[];
 export declare const SIGN_IN_WITH_EMAIL_WALLET_NAME = "Sign In With Email";
 export declare const walletListBuilder: ({ authMode, connectedWallets, multiWallet, numberOfWalletsToShow, inputList, isWalletConnectList, lastUsedWalletKey, signWithEmailWalletName, searchFilter, walletsFilter, loginWithEmail, groupWallets, walletBook, showMoreWalletsWithFilter, recommendedWallets, }: BuilderParams) => BuilderResult;
+/**
+ * This calculation adds an offset to numberOfWalletsToShow so we will show the
+ * intended wallets + installed and last used.
+ * We should would only apply the additonal offset if the installed wallets was not in the original list.
+ *
+ * For example:
+ * we want to show 4 wallets: ['metamask', 'rainbow', 'walletconnect', 'coinbase']
+ * and someone is using brave with installed phantom he should see
+ * [ 'brave injected', phantom ,'metamask', 'rainbow', 'walletconnect', 'coinbase',]
+ * And when someone is using metamask and coinbase they should see
+ * [ 'metamask', 'coinbase', 'rainbow', 'walletconnect']
+ */
+export declare const calculateWalletOffsetBasedOnInstalledAndLastUsedWallets: (allWalletsOrdered: WalletOption[], installedOrUsedWallets: WalletOption[], numberOfWalletsToShow: number) => number;
 export {};

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

@@ -9,7 +9,6 @@ const PRIORITY_WALLET_LIST = [
     'walletconnect',
     'phantom',
     'argentx',
-    'myalgo',
     'blocto',
     'solflare',
     'braavos',
@@ -103,8 +102,10 @@ const walletListBuilder = ({ authMode, connectedWallets, multiWallet, numberOfWa
     const finalizedWalletList = groupWallets
         ? groupWalletOptions(walletBook, walletsList)
         : walletsList;
+    // If a filter has been applied we want to add an offset to the number of wallets
+    // to include the installed and last used wallets
     const updatedNumberOfWalletsToShow = showMoreWalletsWithFilter && hasWalletFilter
-        ? calculateWithFilterNumberOfWalletsToShow(orderedInputList, firstPriorityWallets.concat(installedWallets), numberOfWalletsToShow)
+        ? calculateWalletOffsetBasedOnInstalledAndLastUsedWallets(orderedInputList, firstPriorityWallets.concat(installedWallets), numberOfWalletsToShow)
         : numberOfWalletsToShow;
     return {
         numberOfWallets: walletsList.length,
@@ -122,14 +123,30 @@ const orderAndFilterList = (walletList, walletsFilter, isWalletConnectList, reco
         return sortedWalletList;
     }
 };
+const KEEP_WALLETS_NAME_LIST = ['wallet connect'];
 const applySearchFilterToWalletOptionList = (rawSearchFilter, walletOptionList) => {
     const searchFilter = rawSearchFilter.trim().toLowerCase();
+    const cleanName = (name) => {
+        const trimmedLowerName = name.trim().toLowerCase();
+        if (KEEP_WALLETS_NAME_LIST.includes(trimmedLowerName)) {
+            return trimmedLowerName;
+        }
+        else {
+            return trimmedLowerName
+                .replace('wallet', '')
+                .replace('evm', '')
+                .replace('starknet', '')
+                .replace('solana', '')
+                .replace('flow', '')
+                .replace('bitcoin', '');
+        }
+    };
     return walletOptionList.filter((walletOption) => {
         var _a;
-        return walletOption.name.trim().toLowerCase().includes(searchFilter) ||
+        return cleanName(walletOption.name).includes(searchFilter) ||
             (
             // Validate nested wallets
-            (_a = walletOption.groupedWallets) === null || _a === void 0 ? void 0 : _a.some((nestedWalletOption) => nestedWalletOption.name.trim().toLowerCase().includes(searchFilter)));
+            (_a = walletOption.groupedWallets) === null || _a === void 0 ? void 0 : _a.some((nestedWalletOption) => cleanName(nestedWalletOption.name).includes(searchFilter)));
     });
 };
 const listToDisplay = (finalizedList, searchFilter, isWalletConnectList, numberOfWalletsToShow, hasWalletFilter, loginWithEmail) => {
@@ -154,19 +171,18 @@ const listToDisplay = (finalizedList, searchFilter, isWalletConnectList, numberO
     }
 };
 /**
- * When a filter is applied we would like to show the installed + last used wallets
- * in addition to the wallets that the filter has specified.
  * This calculation adds an offset to numberOfWalletsToShow so we will show the
  * intended wallets + installed and last used.
+ * We should would only apply the additonal offset if the installed wallets was not in the original list.
  *
  * For example:
  * we want to show 4 wallets: ['metamask', 'rainbow', 'walletconnect', 'coinbase']
  * and someone is using brave with installed phantom he should see
  * [ 'brave injected', phantom ,'metamask', 'rainbow', 'walletconnect', 'coinbase',]
- *
- * note — this should only apply to the WalletList view!
+ * And when someone is using metamask and coinbase they should see
+ * [ 'metamask', 'coinbase', 'rainbow', 'walletconnect']
  */
-const calculateWithFilterNumberOfWalletsToShow = (allWalletsOrdered, installedOrUsedWallets, numberOfWalletsToShow) => {
+const calculateWalletOffsetBasedOnInstalledAndLastUsedWallets = (allWalletsOrdered, installedOrUsedWallets, numberOfWalletsToShow) => {
     const filteredWallets = allWalletsOrdered.slice(0, numberOfWalletsToShow);
     const offset = installedOrUsedWallets.filter((wallet) => !filteredWallets.includes(wallet)).length;
     return numberOfWalletsToShow + offset;
@@ -184,4 +200,4 @@ const getSignWithEmailWallet = (signWithEmailWalletName, inputList) => {
     return walletOverride;
 };
 
-export { PRIORITY_WALLET_LIST, SIGN_IN_WITH_EMAIL_WALLET_NAME, walletListBuilder };
+export { PRIORITY_WALLET_LIST, SIGN_IN_WITH_EMAIL_WALLET_NAME, calculateWalletOffsetBasedOnInstalledAndLastUsedWallets, walletListBuilder };

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', 'perawallet'];
+const specialCareWallets = ['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
@@ -15,7 +15,7 @@ const showPendingConnectView = (walletConnector, setView) => _tslib.__awaiter(vo
     }
     specialCareWallets.forEach((wallet) => {
         if (walletConnector.key === wallet) {
-            // Slope and some other wallets works different as Justin mentioned in this commit:
+            // bloctoevm and some other wallets works different as Justin mentioned in this commit:
             // https://github.com/dynamic-labs/DynamicAuth/commit/57233d3620611bc91439f3d4587b8516f8d16f99
             // It needs to show the connect view before getting connected accounts
             setView('pending-connect');

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', 'perawallet'];
+const specialCareWallets = ['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
@@ -11,7 +11,7 @@ const showPendingConnectView = (walletConnector, setView) => __awaiter(void 0, v
     }
     specialCareWallets.forEach((wallet) => {
         if (walletConnector.key === wallet) {
-            // Slope and some other wallets works different as Justin mentioned in this commit:
+            // bloctoevm and some other wallets works different as Justin mentioned in this commit:
             // https://github.com/dynamic-labs/DynamicAuth/commit/57233d3620611bc91439f3d4587b8516f8d16f99
             // It needs to show the connect view before getting connected accounts
             setView('pending-connect');

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

@@ -1,4 +1,4 @@
 export { useConnectAndSign } from './useConnectAndSign';
 export { useSignConnectOnlyUser } from './useSignConnectOnlyUser';
 export { useConnectAndSignSplitSteps } from './useConnectAndSignSplitSteps';
-export { type VerifyEmailCallback, useEmailVerificationRequest, } from './useEmailVerificationRequest';
+export { type VerifyOtp, useOtpVerificationRequest, } from './useOtpVerificationRequest';

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

@@ -7,7 +7,7 @@ var walletConnectorCore = require('@dynamic-labs/wallet-connector-core');
 var CaptchaContext = require('../../../../context/CaptchaContext/CaptchaContext.cjs');
 require('react');
 require('../../../../context/DynamicContext/DynamicContext.cjs');
-require('@dynamic-labs/sdk-api');
+require('@dynamic-labs/sdk-api-core');
 var logger = require('../../../../shared/logger.cjs');
 require('@dynamic-labs/iconic');
 require('react/jsx-runtime');
@@ -17,27 +17,31 @@ var localStorage$1 = require('../../../constants/localStorage.cjs');
 require('../../../constants/colors.cjs');
 require('../../../constants/values.cjs');
 var localStorage = require('../../../../shared/utils/classes/storage/localStorage.cjs');
-require('viem');
 require('@dynamic-labs/utils');
 require('../../../../shared/consts/index.cjs');
 require('../../../../events/dynamicEvents.cjs');
 var ErrorContext = require('../../../../context/ErrorContext/ErrorContext.cjs');
 require('@dynamic-labs/multi-wallet');
+require('react-international-phone');
 var isProgrammableNetworkSwitchSupported = require('../../../functions/isProgrammableNetworkSwitchSupported/isProgrammableNetworkSwitchSupported.cjs');
 var isSupportedNetwork = require('../../../functions/isSupportedNetwork/isSupportedNetwork.cjs');
+require('viem');
 require('viem/chains');
+require('i18next');
+require('../../../../config/ApiEndpoint.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');
-require('../../../../config/ApiEndpoint.cjs');
-require('../../../../context/EmailVerificationContext/EmailVerificationContext.cjs');
+require('../../../../context/VerificationContext/VerificationContext.cjs');
 require('react-dom');
+require('../../../../context/WalletContext/WalletContext.cjs');
 require('../../../../context/ThemeContext/ThemeContext.cjs');
 require('@dynamic-labs/types');
 require('../../../../context/AccountExistsContext/AccountExistsContext.cjs');
 require('yup');
 require('react-i18next');
+require('../../../../context/FieldsStateContext/FieldsStateContext.cjs');
 require('../../../../context/MockContext/MockContext.cjs');
 require('../../useUserUpdateRequest/useUpdateUser/useUpdateUser.cjs');
 require('../../../../context/UserFieldEditorContext/UserFieldEditorContext.cjs');
@@ -47,32 +51,32 @@ require('../../../../components/Alert/Alert.cjs');
 require('../../../../components/ShadowDOM/ShadowDOM.cjs');
 require('../../../../components/IconButton/IconButton.cjs');
 require('../../../../components/InlineWidget/InlineWidget.cjs');
+require('../../../../components/Input/Input.cjs');
 require('../../../../components/IsBrowser/IsBrowser.cjs');
 require('../../../../components/MenuList/Dropdown/Dropdown.cjs');
 require('../../../../components/Transition/ZoomTransition/ZoomTransition.cjs');
 require('../../../../components/Transition/SlideInUpTransition/SlideInUpTransition.cjs');
 require('../../../../components/Transition/OpacityTransition/OpacityTransition.cjs');
+require('../../../../components/OverlayCard/OverlayCardTarget/OverlayCardTarget.cjs');
+require('../../../../components/PasskeyCreatedSuccessBanner/PasskeyCreatedSuccessBanner.cjs');
 require('../../../../components/Popper/Popper/Popper.cjs');
 require('../../../../components/Popper/PopperContext/PopperContext.cjs');
 require('react-focus-lock');
+require('qrcode');
+require('../../../../context/AccessDeniedContext/AccessDeniedContext.cjs');
 require('formik');
-require('i18next');
-require('../../../../components/OverlayCard/OverlayCard.context.cjs');
-require('../../../../components/PasskeyCreatedSuccessBanner/PasskeyCreatedSuccessBanner.cjs');
-require('../../../../context/PasskeyContext/PasskeyContext.cjs');
 require('../../../../views/WalletList/WalletList.cjs');
-require('../../../../context/AccessDeniedContext/AccessDeniedContext.cjs');
-require('qrcode');
-require('@hcaptcha/react-hcaptcha');
-require('../../../../context/LoadingContext/LoadingContext.cjs');
 require('../../../../context/SocialRedirectContext/SocialRedirectContext.cjs');
-require('../../../../context/WalletGroupContext/WalletGroupContext.cjs');
 require('../../../../widgets/DynamicBridgeWidget/views/WalletsView/components/SecondaryWallets/SecondaryWallets.cjs');
+require('@hcaptcha/react-hcaptcha');
+require('../../../../context/LoadingContext/LoadingContext.cjs');
 require('../../../../context/FooterAnimationContext/index.cjs');
+require('../../../../views/LoginView/sections/PhoneNumberSignInSection/PhoneNumberSignInSection.cjs');
+require('../../../../context/WalletGroupContext/WalletGroupContext.cjs');
+require('../../../../context/PasskeyContext/PasskeyContext.cjs');
 require('../../../../widgets/DynamicWidget/components/DynamicWidgetHeader/DynamicWidgetHeader.cjs');
 require('../../../../widgets/DynamicWidget/context/DynamicWidgetContext.cjs');
-require('../../../../components/UserProfile/parts/UserProfileField/components/VerifiedEmailIcon/VerifiedEmailIcon.cjs');
-require('@dynamic-labs/viem-utils');
+require('../../../../views/TransactionConfirmationView/helpers/transactionErrorMessage.cjs');
 require('../../../../widgets/DynamicWidget/views/ManagePasskeysWidgetView/PasskeyCard/PasskeyCard.cjs');
 var useInternalDynamicContext = require('../../../../context/DynamicContext/useDynamicContext/useInternalDynamicContext.cjs');
 
@@ -80,7 +84,7 @@ const useConnectAndSign = ({ shouldUpdateWallets = true, shouldCallCallback = tr
     const { setView, goToInitialView } = ViewContext.useViewContext();
     const { engageCaptcha, getCaptchaToken } = CaptchaContext.useCaptchaContext();
     const { setErrorMessage } = ErrorContext.useErrorContext();
-    const { authMode, connectWallet, consumeNonce, displaySiweStatement, environmentId, projectSettings, setIsSingleWalletAccount, user, walletUiUtils, setIsVerificationInProgress, } = useInternalDynamicContext.useInternalDynamicContext();
+    const { authMode, connectWallet, consumeNonce, displaySiweStatement, environmentId, projectSettings, networkValidationMode, setIsSingleWalletAccount, user, walletUiUtils, } = useInternalDynamicContext.useInternalDynamicContext();
     const { handleWalletsToConnect } = useHandleWalletsToConnect.useHandleWalletsToConnect();
     const verifyWallet = useVerifyWallet.useVerifyWallet({
         consumeNonce,
@@ -110,16 +114,9 @@ const useConnectAndSign = ({ shouldUpdateWallets = true, shouldCallCallback = tr
             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* () {
+    return ({ walletConnector, getAddressOpts = undefined }) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
         var _a;
-        // Raise verification ongoing flag
-        setIsVerificationInProgress(true);
         try {
             yield showPendingConnectView.showPendingConnectView(walletConnector, setView);
             if (walletConnectorCore.isEmailWalletConnector(walletConnector)) {
@@ -130,9 +127,8 @@ const useConnectAndSign = ({ shouldUpdateWallets = true, shouldCallCallback = tr
                     setView('wait-for-email-confirmation-view');
                 }
             }
-            const connectionResult = yield connectWallet(walletConnector, fetchPublicAddressOpts, {
-                applyOnBeforeConnectSuccessConfirmation: shouldCallCallback,
-                raiseOnConnect: true,
+            const connectionResult = yield connectWallet(walletConnector, getAddressOpts, {
+                applyHandleConnectedWallet: shouldCallCallback,
             });
             if (!(connectionResult === null || connectionResult === void 0 ? void 0 : connectionResult.address)) {
                 return;
@@ -143,7 +139,9 @@ const useConnectAndSign = ({ shouldUpdateWallets = true, shouldCallCallback = tr
                 network: walletNetwork,
                 walletConnector,
             });
-            if (!usesSupportedNetwork) {
+            const isNetworkValidationEnabledForSignIn = networkValidationMode === 'always' ||
+                networkValidationMode === 'sign-in';
+            if (!usesSupportedNetwork && isNetworkValidationEnabledForSignIn) {
                 if (!isProgrammableNetworkSwitchSupported.isProgrammableNetworkSwitchSupported(walletConnector)) {
                     return setView('network-not-supported-manual');
                 }