@dynamic-labs/sdk-react-core 0.18.0-RC.1 → 0.18.0-RC.10

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

@@ -1,18 +1,5 @@
-import { jsx, jsxs, Fragment } from 'react/jsx-runtime';
+import { jsxs, Fragment, jsx } from 'react/jsx-runtime';
 import { WalletConnectIcon } from '@dynamic-labs/iconic';
-import '@dynamic-labs/sdk-api';
-import '../../../shared/logger.js';
-import '../../../config/LSSuffix.js';
-import '@dynamic-labs/wallet-connector-core';
-import '../../../context/ViewContext/ViewContext.js';
-import 'react';
-import { ReactComponent as SvgWalletOutline } from '../../../shared/assets/wallet-outline.js';
-import { ReactComponent as SvgFooterInfoIcon } from '../../../shared/assets/footer-info-icon.js';
-import '@dynamic-labs/wallet-book';
-import '@dynamic-labs/utils';
-import '../../constants/colors.js';
-import 'ethers';
-import '../../../shared/consts/index.js';
 
 const getDynamicLayoutData = ({ view }) => {
     if (view === 'no-access') {
@@ -21,34 +8,27 @@ const getDynamicLayoutData = ({ view }) => {
         };
         return { headerData };
     }
-    const footerMap = {
+    const helpHeaderMap = {
         'login-with-email-or-wallet-full-wallet-list': {
             heading: 'Get your first wallet',
-            icon: jsx(SvgWalletOutline, {}),
         },
         'pending-connect': {
-            heading: 'Learn about connecting your wallet',
-            icon: jsx(SvgFooterInfoIcon, {}),
+            heading: 'Connecting a wallet',
         },
         'pending-signature': {
-            heading: 'Learn about signing / logging in',
-            icon: jsx(SvgFooterInfoIcon, {}),
+            heading: 'Signing a wallet',
         },
         'pending-signature-without-back-button': {
-            heading: 'Learn about signing / logging in',
-            icon: jsx(SvgFooterInfoIcon, {}),
+            heading: 'Signing a wallet',
         },
         'qr-code': {
-            heading: 'Learn about connecting your wallet',
-            icon: jsx(SvgFooterInfoIcon, {}),
+            heading: 'Connecting a wallet',
         },
         'wallet-connect-mobile-wallets-list': {
             heading: 'Get your first wallet',
-            icon: jsx(SvgWalletOutline, {}),
         },
         'wallet-list': {
             heading: 'Get your first wallet',
-            icon: jsx(SvgWalletOutline, {}),
         },
     };
     const headerMap = {
@@ -65,11 +45,11 @@ const getDynamicLayoutData = ({ view }) => {
         'wallet-list': { heading: 'Select your wallet' },
         'wallet-sign': { heading: 'Sign to confirm transfer' },
     };
-    const footerData = footerMap[view];
+    const helpHeaderData = helpHeaderMap[view];
     const headerData = headerMap[view];
     return {
-        footerData,
         headerData,
+        helpHeaderData,
     };
 };
 

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

@@ -0,0 +1,16 @@
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+const getMissingChains = (arr1, arr2) => {
+    if (!arr1 || !arr2) {
+        return;
+    }
+    // create a Set of all 'chain' values from the second array
+    const chainSet = new Set(arr2.map((obj) => obj.chain));
+    // 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;
+};
+
+exports.getMissingChains = getMissingChains;

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

@@ -0,0 +1,3 @@
+import { ChainsToConnect } from '../../../context/DynamicContext';
+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

@@ -0,0 +1,12 @@
+const getMissingChains = (arr1, arr2) => {
+    if (!arr1 || !arr2) {
+        return;
+    }
+    // create a Set of all 'chain' values from the second array
+    const chainSet = new Set(arr2.map((obj) => obj.chain));
+    // 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;
+};
+
+export { getMissingChains };

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

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

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

@@ -3,16 +3,16 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 var decodeJwt = require('../../../shared/utils/functions/decodeJwt/decodeJwt.cjs');
-require('../../../shared/logger.cjs');
-require('../../../config/LSSuffix.cjs');
 require('@dynamic-labs/iconic');
 require('@dynamic-labs/wallet-connector-core');
 require('react/jsx-runtime');
 require('../../../context/ViewContext/ViewContext.cjs');
 require('react');
+require('../../../shared/logger.cjs');
 require('@dynamic-labs/wallet-book');
 require('@dynamic-labs/utils');
 require('../../constants/colors.cjs');
+require('../../../shared/utils/classes/storage/localStorage.cjs');
 require('ethers');
 require('../../../shared/consts/index.cjs');
 

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

@@ -1,14 +1,14 @@
 import { decodeJwt } from '../../../shared/utils/functions/decodeJwt/decodeJwt.js';
-import '../../../shared/logger.js';
-import '../../../config/LSSuffix.js';
 import '@dynamic-labs/iconic';
 import '@dynamic-labs/wallet-connector-core';
 import 'react/jsx-runtime';
 import '../../../context/ViewContext/ViewContext.js';
 import 'react';
+import '../../../shared/logger.js';
 import '@dynamic-labs/wallet-book';
 import '@dynamic-labs/utils';
 import '../../constants/colors.js';
+import '../../../shared/utils/classes/storage/localStorage.js';
 import 'ethers';
 import '../../../shared/consts/index.js';
 

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

@@ -0,0 +1,12 @@
+/**
+ * Groups an array of items based on a specified key.
+ * @template T - The type of items in the array.
+ * @param {T[]} items - The array of items to be grouped.
+ * @param {keyof T | ((item: T) => string)} keySelector - The key to group the items by.
+ *        Can be either a property key of the items or a function that extracts the key from an item.
+ * @returns {Object.<string, T[]>} - An object where the keys represent the grouped values,
+ *          and the values are arrays of items belonging to that group.
+ */
+export declare const groupBy: <T>(items: T[], keySelector: keyof T | ((item: T) => string)) => {
+    [key: string]: T[];
+};

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

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

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

@@ -6,15 +6,15 @@ var _tslib = require('../../../../../_virtual/_tslib.cjs');
 var utils = require('@dynamic-labs/utils');
 var api = require('../../../data/api.cjs');
 var decodeJwt = require('../../../shared/utils/functions/decodeJwt/decodeJwt.cjs');
-require('../../../shared/logger.cjs');
-require('../../../config/LSSuffix.cjs');
 require('@dynamic-labs/iconic');
 require('@dynamic-labs/wallet-connector-core');
 require('react/jsx-runtime');
 require('../../../context/ViewContext/ViewContext.cjs');
 require('react');
+require('../../../shared/logger.cjs');
 require('@dynamic-labs/wallet-book');
 require('../../constants/colors.cjs');
+require('../../../shared/utils/classes/storage/localStorage.cjs');
 require('ethers');
 require('../../../shared/consts/index.cjs');
 var index = require('../storeAuthToken/index.cjs');

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

@@ -2,15 +2,15 @@ import { __awaiter } from '../../../../../_virtual/_tslib.js';
 import { DynamicError } from '@dynamic-labs/utils';
 import { unlinkWallet } from '../../../data/api.js';
 import { decodeJwt } from '../../../shared/utils/functions/decodeJwt/decodeJwt.js';
-import '../../../shared/logger.js';
-import '../../../config/LSSuffix.js';
 import '@dynamic-labs/iconic';
 import '@dynamic-labs/wallet-connector-core';
 import 'react/jsx-runtime';
 import '../../../context/ViewContext/ViewContext.js';
 import 'react';
+import '../../../shared/logger.js';
 import '@dynamic-labs/wallet-book';
 import '../../constants/colors.js';
+import '../../../shared/utils/classes/storage/localStorage.js';
 import 'ethers';
 import '../../../shared/consts/index.js';
 import { storeAuthToken } from '../storeAuthToken/index.js';

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

@@ -16,3 +16,5 @@ export * from './shouldManuallyReconnectOnRefresh';
 export * from './isNetworkUnsupported';
 export * from './getReferencedAccount';
 export * from './getAppOrigin';
+export * from './groupBy';
+export * from './isProviderEnabled';

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

@@ -3,8 +3,9 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 var sdkApi = require('@dynamic-labs/sdk-api');
+var isProviderEnabled = require('../isProviderEnabled/isProviderEnabled.cjs');
 
-const isEmailProviderEnabled = (providers) => providers.some(({ provider, enabledAt }) => [sdkApi.ProviderEnum.EmailOnly, sdkApi.ProviderEnum.MagicLink].includes(provider) &&
-    Boolean(enabledAt));
+const isEmailProviderEnabled = (providers) => isProviderEnabled.isProviderEnabled(providers, sdkApi.ProviderEnum.EmailOnly) ||
+    isProviderEnabled.isProviderEnabled(providers, sdkApi.ProviderEnum.MagicLink);
 
 exports.isEmailProviderEnabled = isEmailProviderEnabled;

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

@@ -1,6 +1,7 @@
 import { ProviderEnum } from '@dynamic-labs/sdk-api';
+import { isProviderEnabled } from '../isProviderEnabled/isProviderEnabled.js';
 
-const isEmailProviderEnabled = (providers) => providers.some(({ provider, enabledAt }) => [ProviderEnum.EmailOnly, ProviderEnum.MagicLink].includes(provider) &&
-    Boolean(enabledAt));
+const isEmailProviderEnabled = (providers) => isProviderEnabled(providers, ProviderEnum.EmailOnly) ||
+    isProviderEnabled(providers, ProviderEnum.MagicLink);
 
 export { isEmailProviderEnabled };

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

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

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

@@ -0,0 +1,7 @@
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+const isProviderEnabled = (providers, provider) => providers.some((providerItem) => providerItem.provider === provider && Boolean(providerItem.enabledAt));
+
+exports.isProviderEnabled = isProviderEnabled;

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

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

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

@@ -0,0 +1,3 @@
+const isProviderEnabled = (providers, provider) => providers.some((providerItem) => providerItem.provider === provider && Boolean(providerItem.enabledAt));
+
+export { isProviderEnabled };

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

@@ -5,7 +5,6 @@ Object.defineProperty(exports, '__esModule', { value: true });
 var utils = require('@dynamic-labs/utils');
 require('@dynamic-labs/sdk-api');
 require('../../../shared/logger.cjs');
-require('../../../config/LSSuffix.cjs');
 require('@dynamic-labs/iconic');
 require('@dynamic-labs/wallet-connector-core');
 require('react/jsx-runtime');
@@ -14,6 +13,7 @@ require('react');
 require('@dynamic-labs/wallet-book');
 var detectBrowser = require('../../../shared/utils/functions/detectBrowser/detectBrowser.cjs');
 require('../../constants/colors.cjs');
+require('../../../shared/utils/classes/storage/localStorage.cjs');
 require('ethers');
 require('../../../shared/consts/index.cjs');
 

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

@@ -1,7 +1,6 @@
 import { isIPhone, isIPad, isMobile } from '@dynamic-labs/utils';
 import '@dynamic-labs/sdk-api';
 import '../../../shared/logger.js';
-import '../../../config/LSSuffix.js';
 import '@dynamic-labs/iconic';
 import '@dynamic-labs/wallet-connector-core';
 import 'react/jsx-runtime';
@@ -10,6 +9,7 @@ import 'react';
 import '@dynamic-labs/wallet-book';
 import { detectBrowserName } from '../../../shared/utils/functions/detectBrowser/detectBrowser.js';
 import '../../constants/colors.js';
+import '../../../shared/utils/classes/storage/localStorage.js';
 import 'ethers';
 import '../../../shared/consts/index.js';
 

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

@@ -4,8 +4,6 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 require('@dynamic-labs/sdk-api');
 require('../../../shared/logger.cjs');
-require('../../../config/LSSuffix.cjs');
-var setToLS = require('../../../shared/utils/functions/storage/setToLS.cjs');
 require('@dynamic-labs/iconic');
 require('@dynamic-labs/wallet-connector-core');
 require('react/jsx-runtime');
@@ -13,15 +11,16 @@ require('../../../context/ViewContext/ViewContext.cjs');
 require('react');
 require('@dynamic-labs/wallet-book');
 require('@dynamic-labs/utils');
-var localStorage = require('../../constants/localStorage.cjs');
+var localStorage$1 = require('../../constants/localStorage.cjs');
 require('../../constants/colors.cjs');
+var localStorage = require('../../../shared/utils/classes/storage/localStorage.cjs');
 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
-    setToLS.setToLS(localStorage.AUTH_TOKEN, jwt);
+    localStorage.LocalStorage.setToLS(localStorage$1.AUTH_TOKEN, jwt);
 };
 
 exports.storeAuthToken = storeAuthToken;

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

@@ -1,7 +1,5 @@
 import '@dynamic-labs/sdk-api';
 import '../../../shared/logger.js';
-import '../../../config/LSSuffix.js';
-import { setToLS } from '../../../shared/utils/functions/storage/setToLS.js';
 import '@dynamic-labs/iconic';
 import '@dynamic-labs/wallet-connector-core';
 import 'react/jsx-runtime';
@@ -11,13 +9,14 @@ 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 '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
-    setToLS(AUTH_TOKEN, jwt);
+    LocalStorage.setToLS(AUTH_TOKEN, jwt);
 };
 
 export { storeAuthToken };

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

@@ -12,7 +12,7 @@ const findGroupIndex = (groupKey, workingArray) => workingArray.findIndex((walle
  * @param {WalletOption[]} walletOptionList - WalletOption list
  * @returns {WalletOption[]} the wallet options list with groups
  */
-const groupWalletOptions = (walletOptionList) => {
+const groupWalletOptions = (walletBook$1, walletOptionList) => {
     const output = [];
     walletOptionList.forEach((currentWalletOption) => {
         var _a;
@@ -32,7 +32,7 @@ const groupWalletOptions = (walletOptionList) => {
         if (!isThereWalletOptionWithSameGroup) {
             return output.push(currentWalletOption);
         }
-        const walletBookData = walletBook.getWalletGroup(currentWalletOption.group);
+        const walletBookData = walletBook.getWalletGroup(walletBook$1, currentWalletOption.group);
         const walletGroup = {
             groupedWallets: [currentWalletOption],
             key: walletBookData.key,

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

@@ -1,3 +1,4 @@
+import { WalletBookSchema } from '@dynamic-labs/wallet-book';
 import { WalletOption } from '../../../../../shared';
 /**
  *  Group wallets by `group` property
@@ -5,4 +6,4 @@ import { WalletOption } from '../../../../../shared';
  * @param {WalletOption[]} walletOptionList - WalletOption list
  * @returns {WalletOption[]} the wallet options list with groups
  */
-export declare const groupWalletOptions: (walletOptionList: WalletOption[]) => WalletOption[];
+export declare const groupWalletOptions: (walletBook: WalletBookSchema, walletOptionList: WalletOption[]) => WalletOption[];

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

@@ -8,7 +8,7 @@ const findGroupIndex = (groupKey, workingArray) => workingArray.findIndex((walle
  * @param {WalletOption[]} walletOptionList - WalletOption list
  * @returns {WalletOption[]} the wallet options list with groups
  */
-const groupWalletOptions = (walletOptionList) => {
+const groupWalletOptions = (walletBook, walletOptionList) => {
     const output = [];
     walletOptionList.forEach((currentWalletOption) => {
         var _a;
@@ -28,7 +28,7 @@ const groupWalletOptions = (walletOptionList) => {
         if (!isThereWalletOptionWithSameGroup) {
             return output.push(currentWalletOption);
         }
-        const walletBookData = getWalletGroup(currentWalletOption.group);
+        const walletBookData = getWalletGroup(walletBook, currentWalletOption.group);
         const walletGroup = {
             groupedWallets: [currentWalletOption],
             key: walletBookData.key,

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

@@ -1,10 +1,8 @@
-import { WalletOption } from '../../../../../shared';
+import { WalletGroupOption, WalletOption } from '../../../../../shared';
 /**
  *  Check if given WalletOption is defined as a group
  *
  * @param {WalletOption} walletOption - Wallet Option
  * @returns {Boolean} - boolean value
  */
-export declare const isWalletGroup: (walletOption: WalletOption) => walletOption is WalletOption & {
-    groupedWallets: WalletOption[];
-};
+export declare const isWalletGroup: (walletOption: WalletOption) => walletOption is WalletGroupOption;

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

@@ -9,8 +9,8 @@ var groupWalletOptions = require('./utils/groupWalletOptions/groupWalletOptions.
 const PRIORITY_WALLET_LIST = [
     'metamask',
     'coinbase',
-    'phantom',
     'walletconnect',
+    'phantom',
     'argentx',
     'myalgo',
     'blocto',
@@ -41,7 +41,7 @@ const sortedInputList = (inputList) => {
         PRIORITY_WALLET_LIST.indexOf(walletConnectorCore.normalizeWalletName(b.name)));
     return [...sortedPriorityWallets, ...unsortedOtherWallets];
 };
-const walletListBuilder = ({ numberOfWalletsToShow, inputList, isWalletConnectList, lastUsedWalletName, signWithEmailWalletName, searchFilter, walletsFilter, loginWithEmail, groupWallets, }) => {
+const walletListBuilder = ({ numberOfWalletsToShow, inputList, isWalletConnectList, lastUsedWalletName, signWithEmailWalletName, searchFilter, walletsFilter, loginWithEmail, groupWallets, walletBook, }) => {
     let lastUsedWallet;
     const hasWalletFilter = Boolean(walletsFilter);
     const walletList = isWalletConnectList
@@ -77,7 +77,7 @@ const walletListBuilder = ({ numberOfWalletsToShow, inputList, isWalletConnectLi
         ...otherWallets,
     ];
     const finalizedWalletList = groupWallets
-        ? groupWalletOptions.groupWalletOptions(walletsList)
+        ? groupWalletOptions.groupWalletOptions(walletBook, walletsList)
         : walletsList;
     const updatedNumberOfWalletsToShow = !hasWalletFilter
         ? numberOfWalletsToShow

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

@@ -1,3 +1,4 @@
+import { WalletBookSchema } from '@dynamic-labs/wallet-book';
 import { WalletOption } from '../../../shared/types';
 type BuilderParams = {
     inputList: WalletOption[];
@@ -9,6 +10,7 @@ type BuilderParams = {
     signWithEmailWalletName: string | undefined;
     walletsFilter: ((options: WalletOption[]) => WalletOption[]) | undefined;
     groupWallets?: boolean;
+    walletBook: WalletBookSchema;
 };
 type BuilderResult = {
     numberOfWallets: number;
@@ -16,5 +18,5 @@ 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: ({ numberOfWalletsToShow, inputList, isWalletConnectList, lastUsedWalletName, signWithEmailWalletName, searchFilter, walletsFilter, loginWithEmail, groupWallets, }: BuilderParams) => BuilderResult;
+export declare const walletListBuilder: ({ numberOfWalletsToShow, inputList, isWalletConnectList, lastUsedWalletName, signWithEmailWalletName, searchFilter, walletsFilter, loginWithEmail, groupWallets, walletBook, }: BuilderParams) => BuilderResult;
 export {};

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

@@ -5,8 +5,8 @@ import { groupWalletOptions } from './utils/groupWalletOptions/groupWalletOption
 const PRIORITY_WALLET_LIST = [
     'metamask',
     'coinbase',
-    'phantom',
     'walletconnect',
+    'phantom',
     'argentx',
     'myalgo',
     'blocto',
@@ -37,7 +37,7 @@ const sortedInputList = (inputList) => {
         PRIORITY_WALLET_LIST.indexOf(normalizeWalletName(b.name)));
     return [...sortedPriorityWallets, ...unsortedOtherWallets];
 };
-const walletListBuilder = ({ numberOfWalletsToShow, inputList, isWalletConnectList, lastUsedWalletName, signWithEmailWalletName, searchFilter, walletsFilter, loginWithEmail, groupWallets, }) => {
+const walletListBuilder = ({ numberOfWalletsToShow, inputList, isWalletConnectList, lastUsedWalletName, signWithEmailWalletName, searchFilter, walletsFilter, loginWithEmail, groupWallets, walletBook, }) => {
     let lastUsedWallet;
     const hasWalletFilter = Boolean(walletsFilter);
     const walletList = isWalletConnectList
@@ -73,7 +73,7 @@ const walletListBuilder = ({ numberOfWalletsToShow, inputList, isWalletConnectLi
         ...otherWallets,
     ];
     const finalizedWalletList = groupWallets
-        ? groupWalletOptions(walletsList)
+        ? groupWalletOptions(walletBook, walletsList)
         : walletsList;
     const updatedNumberOfWalletsToShow = !hasWalletFilter
         ? numberOfWalletsToShow

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

@@ -10,26 +10,30 @@ var useInternalDynamicContext = require('../../../../context/DynamicContext/useI
 var ViewContext = require('../../../../context/ViewContext/ViewContext.cjs');
 var ErrorContext = require('../../../../context/ErrorContext/ErrorContext.cjs');
 require('@dynamic-labs/sdk-api');
-require('../../../../shared/logger.cjs');
-require('../../../../config/LSSuffix.cjs');
-var setToLS = require('../../../../shared/utils/functions/storage/setToLS.cjs');
+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 = require('../../../constants/localStorage.cjs');
+var localStorage$1 = require('../../../constants/localStorage.cjs');
 require('../../../constants/colors.cjs');
+var localStorage = require('../../../../shared/utils/classes/storage/localStorage.cjs');
 require('ethers');
 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');
 
 const useConnectAndSign = () => {
-    const { setView } = ViewContext.useViewContext();
+    const { setView, goToInitialView } = ViewContext.useViewContext();
     const { setErrorMessage } = ErrorContext.useErrorContext();
     const { captchaToken } = CaptchaContext.useCaptchaContext();
-    const { authMode, connectWallet, consumeNonce, displayTermsOfService, environmentId, projectSettings, setIsSingleWalletAccount, setShowAuthFlow, user, walletUiUtils, setCallback, } = useInternalDynamicContext.useInternalDynamicContext();
+    const { authMode, connectWallet, consumeNonce, displayTermsOfService, environmentId, projectSettings, setIsSingleWalletAccount, user, walletUiUtils, setCallback, setNetwork, } = useInternalDynamicContext.useInternalDynamicContext();
+    const { handleWalletsToConnect } = useHandleWalletsToConnect.useHandleWalletsToConnect();
     const verifyWallet = useVerifyWallet.useVerifyWallet({
         consumeNonce,
         displayTermsOfService,
@@ -51,9 +55,21 @@ const useConnectAndSign = () => {
             }
             const publicWalletAddress = yield connectWallet(walletConnector, fetchPublicAddressOpts);
             setCallback('connectSuccess');
+            const walletNetwork = yield walletConnector.getNetwork();
+            setNetwork(walletNetwork);
+            const usesSupportedNetwork = isSupportedNetwork.isSupportedNetwork({
+                network: walletNetwork,
+                walletConnector,
+            });
+            if (!usesSupportedNetwork) {
+                if (isProgrammableNetworkSwitchSupported.isProgrammableNetworkSwitchSupported(walletConnector)) {
+                    return setView('network-not-supported');
+                }
+                return setView('network-not-supported-manual');
+            }
             if (isConnectOnly.isConnectOnly(user, authMode)) {
-                setToLS.setToLS(localStorage.LAST_USED_WALLET, walletConnector.name);
-                setShowAuthFlow(false);
+                localStorage.LocalStorage.setToLS(localStorage$1.LAST_USED_WALLET, walletConnector.name);
+                handleWalletsToConnect();
                 return;
             }
             if ((_a = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.security.hCaptcha) === null || _a === void 0 ? void 0 : _a.enabled) {
@@ -73,8 +89,9 @@ const useConnectAndSign = () => {
             });
         }
         catch (err) {
+            logger.logger.debug(err);
             setErrorMessage((_b = err === null || err === void 0 ? void 0 : err.code) === null || _b === void 0 ? void 0 : _b.toString());
-            setView('wallet-list');
+            goToInitialView();
             return;
         }
     });

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

@@ -6,9 +6,7 @@ import { useInternalDynamicContext } from '../../../../context/DynamicContext/us
 import { useViewContext } from '../../../../context/ViewContext/ViewContext.js';
 import { useErrorContext } from '../../../../context/ErrorContext/ErrorContext.js';
 import '@dynamic-labs/sdk-api';
-import '../../../../shared/logger.js';
-import '../../../../config/LSSuffix.js';
-import { setToLS } from '../../../../shared/utils/functions/storage/setToLS.js';
+import { logger } from '../../../../shared/logger.js';
 import '@dynamic-labs/iconic';
 import 'react/jsx-runtime';
 import 'react';
@@ -16,16 +14,22 @@ 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 'ethers';
 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';
 
 const useConnectAndSign = () => {
-    const { setView } = useViewContext();
+    const { setView, goToInitialView } = useViewContext();
     const { setErrorMessage } = useErrorContext();
     const { captchaToken } = useCaptchaContext();
-    const { authMode, connectWallet, consumeNonce, displayTermsOfService, environmentId, projectSettings, setIsSingleWalletAccount, setShowAuthFlow, user, walletUiUtils, setCallback, } = useInternalDynamicContext();
+    const { authMode, connectWallet, consumeNonce, displayTermsOfService, environmentId, projectSettings, setIsSingleWalletAccount, user, walletUiUtils, setCallback, setNetwork, } = useInternalDynamicContext();
+    const { handleWalletsToConnect } = useHandleWalletsToConnect();
     const verifyWallet = useVerifyWallet({
         consumeNonce,
         displayTermsOfService,
@@ -47,9 +51,21 @@ const useConnectAndSign = () => {
             }
             const publicWalletAddress = yield connectWallet(walletConnector, fetchPublicAddressOpts);
             setCallback('connectSuccess');
+            const walletNetwork = yield walletConnector.getNetwork();
+            setNetwork(walletNetwork);
+            const usesSupportedNetwork = isSupportedNetwork({
+                network: walletNetwork,
+                walletConnector,
+            });
+            if (!usesSupportedNetwork) {
+                if (isProgrammableNetworkSwitchSupported(walletConnector)) {
+                    return setView('network-not-supported');
+                }
+                return setView('network-not-supported-manual');
+            }
             if (isConnectOnly(user, authMode)) {
-                setToLS(LAST_USED_WALLET, walletConnector.name);
-                setShowAuthFlow(false);
+                LocalStorage.setToLS(LAST_USED_WALLET, walletConnector.name);
+                handleWalletsToConnect();
                 return;
             }
             if ((_a = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.security.hCaptcha) === null || _a === void 0 ? void 0 : _a.enabled) {
@@ -69,8 +85,9 @@ const useConnectAndSign = () => {
             });
         }
         catch (err) {
+            logger.debug(err);
             setErrorMessage((_b = err === null || err === void 0 ? void 0 : err.code) === null || _b === void 0 ? void 0 : _b.toString());
-            setView('wallet-list');
+            goToInitialView();
             return;
         }
     });