@dynamic-labs/sdk-react-core 0.18.0-RC.0 → 0.18.0-RC.2

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

@@ -0,0 +1,26 @@
+/**
+ * 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.
+ */
+const groupBy = (items, keySelector) => {
+    const groupedItems = {};
+    for (const item of items) {
+        const itemKey = typeof keySelector === 'function'
+            ? keySelector(item)
+            : String(item[keySelector]);
+        if (groupedItems[itemKey]) {
+            groupedItems[itemKey].push(item);
+        }
+        else {
+            groupedItems[itemKey] = [item];
+        }
+    }
+    return groupedItems;
+};
+
+export { groupBy };

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,4 @@ export * from './shouldManuallyReconnectOnRefresh';
 export * from './isNetworkUnsupported';
 export * from './getReferencedAccount';
 export * from './getAppOrigin';
+export * from './groupBy';

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/walletListBuilder.cjs

@@ -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

@@ -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

@@ -11,25 +11,26 @@ 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');
 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');
 
 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, } = useInternalDynamicContext.useInternalDynamicContext();
+    const { handleWalletsToConnect } = useHandleWalletsToConnect.useHandleWalletsToConnect();
     const verifyWallet = useVerifyWallet.useVerifyWallet({
         consumeNonce,
         displayTermsOfService,
@@ -52,8 +53,8 @@ const useConnectAndSign = () => {
             const publicWalletAddress = yield connectWallet(walletConnector, fetchPublicAddressOpts);
             setCallback('connectSuccess');
             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) {
@@ -74,7 +75,7 @@ const useConnectAndSign = () => {
         }
         catch (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

@@ -7,8 +7,6 @@ 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 '@dynamic-labs/iconic';
 import 'react/jsx-runtime';
 import 'react';
@@ -16,16 +14,19 @@ 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';
 
 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, } = useInternalDynamicContext();
+    const { handleWalletsToConnect } = useHandleWalletsToConnect();
     const verifyWallet = useVerifyWallet({
         consumeNonce,
         displayTermsOfService,
@@ -48,8 +49,8 @@ const useConnectAndSign = () => {
             const publicWalletAddress = yield connectWallet(walletConnector, fetchPublicAddressOpts);
             setCallback('connectSuccess');
             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) {
@@ -70,7 +71,7 @@ const useConnectAndSign = () => {
         }
         catch (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/useConnectAndSignSplitSteps/useConnectAndSignSplitSteps.cjs

@@ -11,25 +11,26 @@ var showPendingConnectView = require('../helpers/showPendingConnectView.cjs');
 var isConnectOnly = require('../helpers/isConnectOnly.cjs');
 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');
 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 CaptchaContext = require('../../../../context/CaptchaContext/CaptchaContext.cjs');
+var useHandleWalletsToConnect = require('../../useHandleWalletsToConnect/useHandleWalletsToConnect.cjs');
 
 const useConnectAndSignSplitSteps = () => {
-    const { setView } = ViewContext.useViewContext();
+    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 { handleWalletsToConnect } = useHandleWalletsToConnect.useHandleWalletsToConnect();
     const verifyWallet = useVerifyWallet.useVerifyWallet({
         consumeNonce,
         displayTermsOfService,
@@ -48,8 +49,8 @@ const useConnectAndSignSplitSteps = () => {
             yield connectWallet(walletConnector, fetchPublicAddressOpts);
             setCallback('connectSuccess');
             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) {
@@ -61,7 +62,7 @@ const useConnectAndSignSplitSteps = () => {
         }
         catch (err) {
             setErrorMessage(err.toString());
-            setView('wallet-list');
+            goToInitialView();
             return;
         }
     });
@@ -78,7 +79,7 @@ const useConnectAndSignSplitSteps = () => {
         }
         catch (err) {
             setErrorMessage(err.toString());
-            setView('wallet-list');
+            goToInitialView();
             return;
         }
     });

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

@@ -7,8 +7,6 @@ import { showPendingConnectView } from '../helpers/showPendingConnectView.js';
 import { isConnectOnly } from '../helpers/isConnectOnly.js';
 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';
@@ -17,15 +15,18 @@ 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 { useCaptchaContext } from '../../../../context/CaptchaContext/CaptchaContext.js';
+import { useHandleWalletsToConnect } from '../../useHandleWalletsToConnect/useHandleWalletsToConnect.js';
 
 const useConnectAndSignSplitSteps = () => {
-    const { setView } = useViewContext();
+    const { setView, goToInitialView } = useViewContext();
     const { setErrorMessage } = useErrorContext();
     const { captchaToken } = useCaptchaContext();
     const { connectWallet, consumeNonce, displayTermsOfService, projectSettings, environmentId, setIsSingleWalletAccount, setShowAuthFlow, user, authMode, setCallback, } = useInternalDynamicContext();
+    const { handleWalletsToConnect } = useHandleWalletsToConnect();
     const verifyWallet = useVerifyWallet({
         consumeNonce,
         displayTermsOfService,
@@ -44,8 +45,8 @@ const useConnectAndSignSplitSteps = () => {
             yield connectWallet(walletConnector, fetchPublicAddressOpts);
             setCallback('connectSuccess');
             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) {
@@ -57,7 +58,7 @@ const useConnectAndSignSplitSteps = () => {
         }
         catch (err) {
             setErrorMessage(err.toString());
-            setView('wallet-list');
+            goToInitialView();
             return;
         }
     });
@@ -74,7 +75,7 @@ const useConnectAndSignSplitSteps = () => {
         }
         catch (err) {
             setErrorMessage(err.toString());
-            setView('wallet-list');
+            goToInitialView();
             return;
         }
     });

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

@@ -12,12 +12,12 @@ require('@dynamic-labs/utils');
 require('../../../constants/colors.cjs');
 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');
 require('../../../../context/ViewContext/ViewContext.cjs');
 require('@dynamic-labs/wallet-book');
+require('../../../../shared/utils/classes/storage/localStorage.cjs');
 require('ethers');
 require('../../../../shared/consts/index.cjs');
 var useUpdateUserProfileByJWTCallback = require('../../useUpdateUserProfileByJWTCallback/useUpdateUserProfileByJWTCallback.cjs');

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

@@ -8,12 +8,12 @@ import '@dynamic-labs/utils';
 import '../../../constants/colors.js';
 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';
 import '../../../../context/ViewContext/ViewContext.js';
 import '@dynamic-labs/wallet-book';
+import '../../../../shared/utils/classes/storage/localStorage.js';
 import 'ethers';
 import '../../../../shared/consts/index.js';
 import { useUpdateUserProfileByJWTCallback } from '../../useUpdateUserProfileByJWTCallback/useUpdateUserProfileByJWTCallback.js';

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

@@ -6,7 +6,6 @@ var React = require('react');
 var useInternalDynamicContext = require('../../../../context/DynamicContext/useInternalDynamicContext.cjs');
 require('@dynamic-labs/sdk-api');
 var logger = 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('../../../../context/ViewContext/ViewContext.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');
 require('@dynamic-labs/multi-wallet');

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

@@ -2,7 +2,6 @@ import { useEffect } from 'react';
 import { useInternalDynamicContext } from '../../../../context/DynamicContext/useInternalDynamicContext.js';
 import '@dynamic-labs/sdk-api';
 import { logger } from '../../../../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 '../../../../context/ViewContext/ViewContext.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';
 import '@dynamic-labs/multi-wallet';

package/src/lib/utils/hooks/useAuthenticateConnectedUser/useAuthenticateConnectedUser.cjs

@@ -11,11 +11,11 @@ require('../../../context/ViewContext/ViewContext.cjs');
 require('../../../context/ErrorContext/ErrorContext.cjs');
 require('@dynamic-labs/sdk-api');
 require('../../../shared/logger.cjs');
-require('../../../config/LSSuffix.cjs');
 require('@dynamic-labs/iconic');
 require('react/jsx-runtime');
 require('@dynamic-labs/wallet-book');
 require('../../constants/colors.cjs');
+require('../../../shared/utils/classes/storage/localStorage.cjs');
 require('ethers');
 require('../../../shared/consts/index.cjs');
 require('../../../config/ApiEndpoint.cjs');

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

@@ -7,11 +7,11 @@ import '../../../context/ViewContext/ViewContext.js';
 import '../../../context/ErrorContext/ErrorContext.js';
 import '@dynamic-labs/sdk-api';
 import '../../../shared/logger.js';
-import '../../../config/LSSuffix.js';
 import '@dynamic-labs/iconic';
 import 'react/jsx-runtime';
 import '@dynamic-labs/wallet-book';
 import '../../constants/colors.js';
+import '../../../shared/utils/classes/storage/localStorage.js';
 import 'ethers';
 import '../../../shared/consts/index.js';
 import '../../../config/ApiEndpoint.js';