@dynamic-labs/sdk-react-core 3.0.0-alpha.1 → 3.0.0-alpha.3

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

@@ -0,0 +1,49 @@
+'use client'
+import { __awaiter } from '../../../../../_virtual/_tslib.js';
+import '@dynamic-labs/utils';
+import '@dynamic-labs/sdk-api-core';
+import '../../../shared/logger.js';
+import '@dynamic-labs/iconic';
+import '@dynamic-labs/wallet-connector-core';
+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 '../../../shared/utils/classes/storage/sessionStorage.js';
+import '../../../shared/consts/index.js';
+import '../../../config/ApiEndpoint.js';
+import '@dynamic-labs/multi-wallet';
+import 'react-international-phone';
+import { p256Keygen } from '../../hooks/useEmbeddedWallet/useSecureEnclaveEmbeddedWallet/utils.js';
+import 'viem';
+import 'viem/chains';
+import { registerSessionKey } from '../../../data/api/embeddedWallets/embeddedWallets.js';
+import '@dynamic-labs/store';
+import '../../../locale/locale.js';
+
+const getSessionKeyCompatibleConnectorFetchers = ({ environmentId, sessionKeys, setSessionKeySessionStorage, }) => {
+    const registerEmbeddedWalletSessionKey = () => __awaiter(void 0, void 0, void 0, function* () {
+        // check if session keys are already stored in session storage
+        if (sessionKeys) {
+            const sessionKeysSS = JSON.parse(Buffer.from(sessionKeys, 'base64').toString());
+            return sessionKeysSS;
+        }
+        const { private: privateKey, public: publicKey } = yield p256Keygen();
+        yield registerSessionKey({
+            environmentId,
+            publicKey,
+        });
+        // convert to base64 and store the session keys in session storage
+        const newSessionKeys = { privateKey, publicKey };
+        const sessionKeysString = JSON.stringify(newSessionKeys);
+        const sessionKeysBase64 = Buffer.from(sessionKeysString).toString('base64');
+        setSessionKeySessionStorage(sessionKeysBase64);
+        return { privateKey, publicKey };
+    });
+    return { registerEmbeddedWalletSessionKey };
+};
+
+export { getSessionKeyCompatibleConnectorFetchers };

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

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

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

@@ -18,15 +18,16 @@ require('react');
 require('@dynamic-labs/wallet-book');
 require('../../constants/colors.cjs');
 require('../../../shared/utils/classes/storage/localStorage.cjs');
+require('../../../shared/utils/classes/storage/sessionStorage.cjs');
 require('../../../shared/consts/index.cjs');
 require('react-international-phone');
 var shortenEmail = require('../../../shared/utils/functions/shortenEmail/shortenEmail.cjs');
 var formatPhone = require('../formatPhone/formatPhone.cjs');
-require('viem');
-require('viem/chains');
 require('../../../config/ApiEndpoint.cjs');
 require('@dynamic-labs/store');
 require('../../../locale/locale.cjs');
+require('viem');
+require('viem/chains');
 
 /**
  * This will return a string which we can present to the user as his identifier, such as

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

@@ -14,15 +14,16 @@ import 'react';
 import '@dynamic-labs/wallet-book';
 import '../../constants/colors.js';
 import '../../../shared/utils/classes/storage/localStorage.js';
+import '../../../shared/utils/classes/storage/sessionStorage.js';
 import '../../../shared/consts/index.js';
 import 'react-international-phone';
 import { shortenEmail } from '../../../shared/utils/functions/shortenEmail/shortenEmail.js';
 import { formatPhone } from '../formatPhone/formatPhone.js';
-import 'viem';
-import 'viem/chains';
 import '../../../config/ApiEndpoint.js';
 import '@dynamic-labs/store';
 import '../../../locale/locale.js';
+import 'viem';
+import 'viem/chains';
 
 /**
  * This will return a string which we can present to the user as his identifier, such as

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

@@ -25,6 +25,7 @@ export * from './getProviderByType';
 export * from './getProviderEnumForSocialSignInProvider';
 export * from './getRedirectURIOrigin';
 export * from './getReferencedAccount';
+export * from './getSessionKeyCompatibleConnectorFetchers';
 export * from './getSocialSignInProviderForProviderEnum';
 export * from './getSocialSignInProviderFromString';
 export * from './getUserProfileFields';

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

@@ -17,13 +17,14 @@ require('react');
 require('@dynamic-labs/wallet-book');
 require('../../constants/colors.cjs');
 require('../../../shared/utils/classes/storage/localStorage.cjs');
+require('../../../shared/utils/classes/storage/sessionStorage.cjs');
 require('../../../shared/consts/index.cjs');
 require('react-international-phone');
-require('viem');
-require('viem/chains');
 require('../../../config/ApiEndpoint.cjs');
 require('@dynamic-labs/store');
 require('../../../locale/locale.cjs');
+require('viem');
+require('viem/chains');
 var getEnabledEmbeddedWalletProviders = require('../getEnabledEmbeddedWalletProviders/getEnabledEmbeddedWalletProviders.cjs');
 
 const isAllowedToLinkWallet = (projectSettings, verifiedCredentials, multiWallet) => {

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

@@ -13,13 +13,14 @@ import 'react';
 import '@dynamic-labs/wallet-book';
 import '../../constants/colors.js';
 import '../../../shared/utils/classes/storage/localStorage.js';
+import '../../../shared/utils/classes/storage/sessionStorage.js';
 import '../../../shared/consts/index.js';
 import 'react-international-phone';
-import 'viem';
-import 'viem/chains';
 import '../../../config/ApiEndpoint.js';
 import '@dynamic-labs/store';
 import '../../../locale/locale.js';
+import 'viem';
+import 'viem/chains';
 import { getEnabledEmbeddedWalletProviders } from '../getEnabledEmbeddedWalletProviders/getEnabledEmbeddedWalletProviders.js';
 
 const isAllowedToLinkWallet = (projectSettings, verifiedCredentials, multiWallet) => {

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

@@ -15,6 +15,7 @@ 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('../../../shared/utils/classes/storage/sessionStorage.cjs');
 require('@dynamic-labs/utils');
 
 const isCookieEnabled = () => { var _a; return (_a = localStorage.LocalStorage.getFromLS(localStorage$1.COOKIE_ENABLED_KEY)) !== null && _a !== void 0 ? _a : false; };

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

@@ -11,6 +11,7 @@ import { COOKIE_ENABLED_KEY } from '../../constants/localStorage.js';
 import '../../constants/colors.js';
 import '../../constants/values.js';
 import { LocalStorage } from '../../../shared/utils/classes/storage/localStorage.js';
+import '../../../shared/utils/classes/storage/sessionStorage.js';
 import '@dynamic-labs/utils';
 
 const isCookieEnabled = () => { var _a; return (_a = LocalStorage.getFromLS(COOKIE_ENABLED_KEY)) !== null && _a !== void 0 ? _a : false; };

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

@@ -17,14 +17,15 @@ require('react');
 require('@dynamic-labs/wallet-book');
 require('../../constants/colors.cjs');
 require('../../../shared/utils/classes/storage/localStorage.cjs');
+require('../../../shared/utils/classes/storage/sessionStorage.cjs');
 require('../../../shared/consts/index.cjs');
 require('react-international-phone');
-var isProviderEnabled = require('../isProviderEnabled/isProviderEnabled.cjs');
-require('viem');
-require('viem/chains');
 require('../../../config/ApiEndpoint.cjs');
 require('@dynamic-labs/store');
 require('../../../locale/locale.cjs');
+var isProviderEnabled = require('../isProviderEnabled/isProviderEnabled.cjs');
+require('viem');
+require('viem/chains');
 
 const isPhoneNumberProviderEnabled = (providers) => Boolean(providers && isProviderEnabled.isProviderEnabled(providers, sdkApiCore.ProviderEnum.Sms));
 

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

@@ -13,14 +13,15 @@ import 'react';
 import '@dynamic-labs/wallet-book';
 import '../../constants/colors.js';
 import '../../../shared/utils/classes/storage/localStorage.js';
+import '../../../shared/utils/classes/storage/sessionStorage.js';
 import '../../../shared/consts/index.js';
 import 'react-international-phone';
-import { isProviderEnabled } from '../isProviderEnabled/isProviderEnabled.js';
-import 'viem';
-import 'viem/chains';
 import '../../../config/ApiEndpoint.js';
 import '@dynamic-labs/store';
 import '../../../locale/locale.js';
+import { isProviderEnabled } from '../isProviderEnabled/isProviderEnabled.js';
+import 'viem';
+import 'viem/chains';
 
 const isPhoneNumberProviderEnabled = (providers) => Boolean(providers && isProviderEnabled(providers, ProviderEnum.Sms));
 

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

@@ -16,6 +16,7 @@ var detectBrowser = require('../../../shared/utils/functions/detectBrowser/detec
 require('../../constants/colors.cjs');
 require('../../constants/values.cjs');
 require('../../../shared/utils/classes/storage/localStorage.cjs');
+require('../../../shared/utils/classes/storage/sessionStorage.cjs');
 require('../../../shared/consts/index.cjs');
 
 const parseWalletLinks = (links) => {

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

@@ -12,6 +12,7 @@ import { detectBrowserName } from '../../../shared/utils/functions/detectBrowser
 import '../../constants/colors.js';
 import '../../constants/values.js';
 import '../../../shared/utils/classes/storage/localStorage.js';
+import '../../../shared/utils/classes/storage/sessionStorage.js';
 import '../../../shared/consts/index.js';
 
 const parseWalletLinks = (links) => {

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

@@ -17,14 +17,15 @@ require('react');
 require('@dynamic-labs/wallet-book');
 require('../../constants/colors.cjs');
 require('../../../shared/utils/classes/storage/localStorage.cjs');
+require('../../../shared/utils/classes/storage/sessionStorage.cjs');
 require('../../../shared/consts/index.cjs');
 require('react-international-phone');
-require('viem');
-require('viem/chains');
-var requiresPasswordForEmbeddedWallet = require('../requiresPasswordForEmbeddedWallet/requiresPasswordForEmbeddedWallet.cjs');
 require('../../../config/ApiEndpoint.cjs');
 require('@dynamic-labs/store');
 require('../../../locale/locale.cjs');
+require('viem');
+require('viem/chains');
+var requiresPasswordForEmbeddedWallet = require('../requiresPasswordForEmbeddedWallet/requiresPasswordForEmbeddedWallet.cjs');
 
 const requiresPasswordForEmbeddedWalletOnSignup = (projectSettings) => {
     const embeddedWalletsSettings = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk.embeddedWallets;

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

@@ -13,14 +13,15 @@ import 'react';
 import '@dynamic-labs/wallet-book';
 import '../../constants/colors.js';
 import '../../../shared/utils/classes/storage/localStorage.js';
+import '../../../shared/utils/classes/storage/sessionStorage.js';
 import '../../../shared/consts/index.js';
 import 'react-international-phone';
-import 'viem';
-import 'viem/chains';
-import { requiresPasswordForEmbeddedWallet } from '../requiresPasswordForEmbeddedWallet/requiresPasswordForEmbeddedWallet.js';
 import '../../../config/ApiEndpoint.js';
 import '@dynamic-labs/store';
 import '../../../locale/locale.js';
+import 'viem';
+import 'viem/chains';
+import { requiresPasswordForEmbeddedWallet } from '../requiresPasswordForEmbeddedWallet/requiresPasswordForEmbeddedWallet.js';
 
 const requiresPasswordForEmbeddedWalletOnSignup = (projectSettings) => {
     const embeddedWalletsSettings = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk.embeddedWallets;

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

@@ -14,6 +14,7 @@ require('@dynamic-labs/wallet-book');
 require('../../constants/colors.cjs');
 require('../../constants/values.cjs');
 require('../../../shared/utils/classes/storage/localStorage.cjs');
+require('../../../shared/utils/classes/storage/sessionStorage.cjs');
 require('@dynamic-labs/utils');
 require('../../../shared/consts/index.cjs');
 

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

@@ -10,6 +10,7 @@ import '@dynamic-labs/wallet-book';
 import '../../constants/colors.js';
 import '../../constants/values.js';
 import '../../../shared/utils/classes/storage/localStorage.js';
+import '../../../shared/utils/classes/storage/sessionStorage.js';
 import '@dynamic-labs/utils';
 import '../../../shared/consts/index.js';
 

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

@@ -15,6 +15,7 @@ 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('../../../shared/utils/classes/storage/sessionStorage.cjs');
 require('@dynamic-labs/utils');
 require('../../../shared/consts/index.cjs');
 

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

@@ -11,6 +11,7 @@ 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 '../../../shared/utils/classes/storage/sessionStorage.js';
 import '@dynamic-labs/utils';
 import '../../../shared/consts/index.js';
 

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

@@ -15,6 +15,7 @@ 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('../../../shared/utils/classes/storage/sessionStorage.cjs');
 require('@dynamic-labs/utils');
 require('../../../shared/consts/index.cjs');
 

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

@@ -11,6 +11,7 @@ import { AUTH_EXPIRES_AT } from '../../constants/localStorage.js';
 import '../../constants/colors.js';
 import '../../constants/values.js';
 import { LocalStorage } from '../../../shared/utils/classes/storage/localStorage.js';
+import '../../../shared/utils/classes/storage/sessionStorage.js';
 import '@dynamic-labs/utils';
 import '../../../shared/consts/index.js';
 

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

@@ -0,0 +1,24 @@
+'use client'
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+var filterConnectedWallets = require('../filterConnectedWallets/filterConnectedWallets.cjs');
+var staticLinkedWalletFilter = require('../staticLinkedWalletFilter/staticLinkedWalletFilter.cjs');
+var filterWalletConnectWallets = require('../filterWalletConnectWallets/filterWalletConnectWallets.cjs');
+
+const applyMultiWalletFilters = ({ authMode, userWallets, walletOptions, }) => {
+    const walletList = filterWalletConnectWallets.filterWalletConnectWallets({
+        userWallets,
+        walletOptions,
+    });
+    if (authMode === 'connect-only') {
+        return filterConnectedWallets.filterConnectedWallets({
+            userWallets,
+            walletOptions: walletList,
+        });
+    }
+    return staticLinkedWalletFilter.staticWalletFilter(userWallets, walletList);
+};
+
+exports.applyMultiWalletFilters = applyMultiWalletFilters;

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

@@ -0,0 +1,6 @@
+import { AuthModeType, Wallet, WalletOption } from '../../../../../shared';
+export declare const applyMultiWalletFilters: ({ authMode, userWallets, walletOptions, }: {
+    authMode: AuthModeType;
+    userWallets: Wallet[];
+    walletOptions: WalletOption[];
+}) => WalletOption[];

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

@@ -0,0 +1,20 @@
+'use client'
+import { filterConnectedWallets } from '../filterConnectedWallets/filterConnectedWallets.js';
+import { staticWalletFilter } from '../staticLinkedWalletFilter/staticLinkedWalletFilter.js';
+import { filterWalletConnectWallets } from '../filterWalletConnectWallets/filterWalletConnectWallets.js';
+
+const applyMultiWalletFilters = ({ authMode, userWallets, walletOptions, }) => {
+    const walletList = filterWalletConnectWallets({
+        userWallets,
+        walletOptions,
+    });
+    if (authMode === 'connect-only') {
+        return filterConnectedWallets({
+            userWallets,
+            walletOptions: walletList,
+        });
+    }
+    return staticWalletFilter(userWallets, walletList);
+};
+
+export { applyMultiWalletFilters };

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

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

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

@@ -8,8 +8,8 @@ Object.defineProperty(exports, '__esModule', { value: true });
  * This is useful for connect-only multi-wallet, where we want users to only connect new wallets,
  * not additional accounts from the same wallet
  */
-const filterConnectedWallets = ({ walletOptions, connectedWallets, }) => {
-    const connectedWalletKeys = new Set(connectedWallets.map((connectedWallet) => connectedWallet.connector.key));
+const filterConnectedWallets = ({ walletOptions, userWallets, }) => {
+    const connectedWalletKeys = new Set(userWallets.map((connectedWallet) => connectedWallet.connector.key));
     /**
      * Phantom and Phantom Ledger are the same wallet, so we have to filter both of them
      * if one is present, because the next connection will not work, it will just connect the

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

@@ -4,7 +4,7 @@ import { Wallet, WalletOption } from '../../../../../shared';
  * This is useful for connect-only multi-wallet, where we want users to only connect new wallets,
  * not additional accounts from the same wallet
  */
-export declare const filterConnectedWallets: ({ walletOptions, connectedWallets, }: {
+export declare const filterConnectedWallets: ({ walletOptions, userWallets, }: {
     walletOptions: WalletOption[];
-    connectedWallets: Wallet[];
+    userWallets: Wallet[];
 }) => WalletOption[];

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

@@ -4,8 +4,8 @@
  * This is useful for connect-only multi-wallet, where we want users to only connect new wallets,
  * not additional accounts from the same wallet
  */
-const filterConnectedWallets = ({ walletOptions, connectedWallets, }) => {
-    const connectedWalletKeys = new Set(connectedWallets.map((connectedWallet) => connectedWallet.connector.key));
+const filterConnectedWallets = ({ walletOptions, userWallets, }) => {
+    const connectedWalletKeys = new Set(userWallets.map((connectedWallet) => connectedWallet.connector.key));
     /**
      * Phantom and Phantom Ledger are the same wallet, so we have to filter both of them
      * if one is present, because the next connection will not work, it will just connect the

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

@@ -0,0 +1,20 @@
+'use client'
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+/**
+ * Used to filter out WalletConnect wallets if user has already a WalletConnect wallet connected/linked
+ * This is useful for multi-wallet on mobile, since WalletConnect doesn't work very well with multiwallet
+ */
+const filterWalletConnectWallets = ({ walletOptions, userWallets, }) => {
+    const hasWCWallet = userWallets.some((wallet) => wallet.connector.isWalletConnect);
+    // user doesn't have any WalletConnect wallet connected/linked, so we don't need to filter anything
+    if (!hasWCWallet) {
+        return walletOptions;
+    }
+    // filter out WalletConnect wallets
+    return walletOptions.filter((walletOption) => !walletOption.walletConnector.isWalletConnect);
+};
+
+exports.filterWalletConnectWallets = filterWalletConnectWallets;

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

@@ -0,0 +1,9 @@
+import { Wallet, WalletOption } from '../../../../../shared';
+/**
+ * Used to filter out WalletConnect wallets if user has already a WalletConnect wallet connected/linked
+ * This is useful for multi-wallet on mobile, since WalletConnect doesn't work very well with multiwallet
+ */
+export declare const filterWalletConnectWallets: ({ walletOptions, userWallets, }: {
+    walletOptions: WalletOption[];
+    userWallets: Wallet[];
+}) => WalletOption[];

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

@@ -0,0 +1,16 @@
+'use client'
+/**
+ * Used to filter out WalletConnect wallets if user has already a WalletConnect wallet connected/linked
+ * This is useful for multi-wallet on mobile, since WalletConnect doesn't work very well with multiwallet
+ */
+const filterWalletConnectWallets = ({ walletOptions, userWallets, }) => {
+    const hasWCWallet = userWallets.some((wallet) => wallet.connector.isWalletConnect);
+    // user doesn't have any WalletConnect wallet connected/linked, so we don't need to filter anything
+    if (!hasWCWallet) {
+        return walletOptions;
+    }
+    // filter out WalletConnect wallets
+    return walletOptions.filter((walletOption) => !walletOption.walletConnector.isWalletConnect);
+};
+
+export { filterWalletConnectWallets };

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

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

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

@@ -6,8 +6,7 @@ Object.defineProperty(exports, '__esModule', { value: true });
 var walletConnectorCore = require('@dynamic-labs/wallet-connector-core');
 var getCalculatedOffset = require('./utils/getCalculatedOffset/getCalculatedOffset.cjs');
 var groupWalletOptions = require('./utils/groupWalletOptions/groupWalletOptions.cjs');
-var filterConnectedWallets = require('./utils/filterConnectedWallets/filterConnectedWallets.cjs');
-var staticLinkedWalletFilter = require('./utils/staticLinkedWalletFilter/staticLinkedWalletFilter.cjs');
+var applyMultiWalletFilters = require('./utils/applyMultiWalletFilters/applyMultiWalletFilters.cjs');
 
 const PRIORITY_WALLET_LIST = [
     'metamask',
@@ -57,21 +56,19 @@ const sortedInputList = (inputList, recommendedWalletKeys) => {
         ...unsortedOtherWallets,
     ];
 };
-const walletListBuilder = ({ authMode, connectedWallets, linkedWallets, multiWallet, numberOfWalletsToShow, inputList, isWalletConnectList, lastUsedWalletKey, signWithEmailWalletName, searchFilter, walletsFilter, loginWithEmail, groupWallets, walletBook, showMoreWalletsWithFilter, recommendedWallets, }) => {
+const walletListBuilder = ({ authMode, userWallets, multiWallet, numberOfWalletsToShow, inputList, isWalletConnectList, lastUsedWalletKey, signWithEmailWalletName, searchFilter, walletsFilter, loginWithEmail, groupWallets, walletBook, showMoreWalletsWithFilter, recommendedWallets, }) => {
     let walletList = inputList;
     if (isWalletConnectList) {
         walletList = inputList.filter((wallet) => wallet.walletConnector.isWalletConnect &&
             wallet.key !== 'walletconnect');
     }
-    if (authMode === 'connect-only' && multiWallet) {
-        walletList = filterConnectedWallets.filterConnectedWallets({
-            connectedWallets,
+    if (multiWallet) {
+        walletList = applyMultiWalletFilters.applyMultiWalletFilters({
+            authMode,
+            userWallets,
             walletOptions: walletList,
         });
     }
-    if (authMode === 'connect-and-sign' && multiWallet) {
-        walletList = staticLinkedWalletFilter.staticWalletFilter(linkedWallets, walletList);
-    }
     let lastUsedWallet;
     const hasWalletFilter = Boolean(walletsFilter);
     const signWithEmailWallet = getSignWithEmailWallet(signWithEmailWalletName, walletList);

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

@@ -2,8 +2,7 @@ import { WalletBookSchema } from '@dynamic-labs/wallet-book';
 import { AuthModeType, RecommendedWallet, Wallet, WalletOption } from '../../../shared/types';
 type BuilderParams = {
     authMode: AuthModeType;
-    connectedWallets: Wallet[];
-    linkedWallets: Wallet[];
+    userWallets: Wallet[];
     multiWallet: boolean;
     inputList: WalletOption[];
     isWalletConnectList: boolean;
@@ -24,7 +23,7 @@ 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, linkedWallets, multiWallet, numberOfWalletsToShow, inputList, isWalletConnectList, lastUsedWalletKey, signWithEmailWalletName, searchFilter, walletsFilter, loginWithEmail, groupWallets, walletBook, showMoreWalletsWithFilter, recommendedWallets, }: BuilderParams) => BuilderResult;
+export declare const walletListBuilder: ({ authMode, userWallets, 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.

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

@@ -2,8 +2,7 @@
 import { isEmbeddedConnector } from '@dynamic-labs/wallet-connector-core';
 import { getCalculatedOffset } from './utils/getCalculatedOffset/getCalculatedOffset.js';
 import { groupWalletOptions } from './utils/groupWalletOptions/groupWalletOptions.js';
-import { filterConnectedWallets } from './utils/filterConnectedWallets/filterConnectedWallets.js';
-import { staticWalletFilter } from './utils/staticLinkedWalletFilter/staticLinkedWalletFilter.js';
+import { applyMultiWalletFilters } from './utils/applyMultiWalletFilters/applyMultiWalletFilters.js';
 
 const PRIORITY_WALLET_LIST = [
     'metamask',
@@ -53,21 +52,19 @@ const sortedInputList = (inputList, recommendedWalletKeys) => {
         ...unsortedOtherWallets,
     ];
 };
-const walletListBuilder = ({ authMode, connectedWallets, linkedWallets, multiWallet, numberOfWalletsToShow, inputList, isWalletConnectList, lastUsedWalletKey, signWithEmailWalletName, searchFilter, walletsFilter, loginWithEmail, groupWallets, walletBook, showMoreWalletsWithFilter, recommendedWallets, }) => {
+const walletListBuilder = ({ authMode, userWallets, multiWallet, numberOfWalletsToShow, inputList, isWalletConnectList, lastUsedWalletKey, signWithEmailWalletName, searchFilter, walletsFilter, loginWithEmail, groupWallets, walletBook, showMoreWalletsWithFilter, recommendedWallets, }) => {
     let walletList = inputList;
     if (isWalletConnectList) {
         walletList = inputList.filter((wallet) => wallet.walletConnector.isWalletConnect &&
             wallet.key !== 'walletconnect');
     }
-    if (authMode === 'connect-only' && multiWallet) {
-        walletList = filterConnectedWallets({
-            connectedWallets,
+    if (multiWallet) {
+        walletList = applyMultiWalletFilters({
+            authMode,
+            userWallets,
             walletOptions: walletList,
         });
     }
-    if (authMode === 'connect-and-sign' && multiWallet) {
-        walletList = staticWalletFilter(linkedWallets, walletList);
-    }
     let lastUsedWallet;
     const hasWalletFilter = Boolean(walletsFilter);
     const signWithEmailWallet = getSignWithEmailWallet(signWithEmailWalletName, walletList);

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

@@ -18,19 +18,20 @@ 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('../../../../shared/utils/classes/storage/sessionStorage.cjs');
 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');
+require('../../../../config/ApiEndpoint.cjs');
+require('@dynamic-labs/store');
+require('../../../../locale/locale.cjs');
 var isProgrammableNetworkSwitchSupported = require('../../../functions/isProgrammableNetworkSwitchSupported/isProgrammableNetworkSwitchSupported.cjs');
 var isSupportedNetwork = require('../../../functions/isSupportedNetwork/isSupportedNetwork.cjs');
 require('viem');
 require('viem/chains');
-require('../../../../config/ApiEndpoint.cjs');
-require('@dynamic-labs/store');
-require('../../../../locale/locale.cjs');
 var useHandleWalletsToConnect = require('../../useHandleWalletsToConnect/useHandleWalletsToConnect.cjs');
 var useVerifyWallet = require('../../useVerifyWallet/useVerifyWallet.cjs');
 var showPendingConnectView = require('../helpers/showPendingConnectView.cjs');

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

@@ -14,19 +14,20 @@ import { LAST_USED_WALLET } from '../../../constants/localStorage.js';
 import '../../../constants/colors.js';
 import '../../../constants/values.js';
 import { LocalStorage } from '../../../../shared/utils/classes/storage/localStorage.js';
+import '../../../../shared/utils/classes/storage/sessionStorage.js';
 import '@dynamic-labs/utils';
 import '../../../../shared/consts/index.js';
 import '../../../../events/dynamicEvents.js';
 import { useErrorContext } from '../../../../context/ErrorContext/ErrorContext.js';
 import '@dynamic-labs/multi-wallet';
 import 'react-international-phone';
+import '../../../../config/ApiEndpoint.js';
+import '@dynamic-labs/store';
+import '../../../../locale/locale.js';
 import { isProgrammableNetworkSwitchSupported } from '../../../functions/isProgrammableNetworkSwitchSupported/isProgrammableNetworkSwitchSupported.js';
 import { isSupportedNetwork } from '../../../functions/isSupportedNetwork/isSupportedNetwork.js';
 import 'viem';
 import 'viem/chains';
-import '../../../../config/ApiEndpoint.js';
-import '@dynamic-labs/store';
-import '../../../../locale/locale.js';
 import { useHandleWalletsToConnect } from '../../useHandleWalletsToConnect/useHandleWalletsToConnect.js';
 import { useVerifyWallet } from '../../useVerifyWallet/useVerifyWallet.js';
 import { showPendingConnectView } from '../helpers/showPendingConnectView.js';