@dynamic-labs/sdk-react-core 1.4.3 → 1.4.4

package/CHANGELOG.md

@@ -1,4 +1,16 @@
 
+### [1.4.4](https://github.com/dynamic-labs/DynamicAuth/compare/v1.4.3...v1.4.4) (2024-04-01)
+
+
+### Bug Fixes
+
+* Multiple WC bug fixes ([#5132](https://github.com/dynamic-labs/DynamicAuth/issues/5132)) ([#5133](https://github.com/dynamic-labs/DynamicAuth/issues/5133)) ([88affaf](https://github.com/dynamic-labs/DynamicAuth/commit/88affaff291391f5f633f7f3bb1ecd5219705117))
+* apply network validation in mobile auth flow ([#5142](https://github.com/dynamic-labs/DynamicAuth/issues/5142)) ([#5159](https://github.com/dynamic-labs/DynamicAuth/issues/5159)) ([f8a6202](https://github.com/dynamic-labs/DynamicAuth/commit/f8a6202f9af8f234c723cfd05f4438536eb30fd0))
+* Better handling of empty callback queue ([#5147](https://github.com/dynamic-labs/DynamicAuth/issues/5147)) ([#5149](https://github.com/dynamic-labs/DynamicAuth/issues/5149)) ([f520f25](https://github.com/dynamic-labs/DynamicAuth/commit/f520f25f2a0faf12567db29f6712cc2f8e421cff))
+* multiple improvements to the wallet list ([#5155](https://github.com/dynamic-labs/DynamicAuth/issues/5155)) ([582ac0e](https://github.com/dynamic-labs/DynamicAuth/commit/582ac0e8baf0fd0eec1246219a5eda730c99f290)), closes [#5112](https://github.com/dynamic-labs/DynamicAuth/issues/5112)
+* Improved scroll experience on ios [48873da](https://github.com/dynamic-labs/DynamicAuth/commit/48873da25bafd07104cebf3bcbb8e2a787c8092c))
+* better handling of multiwallet state ([#5146](https://github.com/dynamic-labs/DynamicAuth/issues/5146)) ([#5148](https://github.com/dynamic-labs/DynamicAuth/issues/5148)) ([dabb780](https://github.com/dynamic-labs/DynamicAuth/commit/dabb7808c94cfa4da7d0c7a058f04d69ffdb301a))
+
 ### [1.4.3](https://github.com/dynamic-labs/DynamicAuth/compare/v1.4.2...v1.4.3) (2024-03-28)
 
 

package/package.cjs

@@ -2,7 +2,7 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var version = "1.4.3";
+var version = "1.4.4";
 var dependencies = {
 	"@dynamic-labs/sdk-api": "0.0.387",
 	"@hcaptcha/react-hcaptcha": "1.4.4",

package/package.js

@@ -1,4 +1,4 @@
-var version = "1.4.3";
+var version = "1.4.4";
 var dependencies = {
 	"@dynamic-labs/sdk-api": "0.0.387",
 	"@hcaptcha/react-hcaptcha": "1.4.4",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dynamic-labs/sdk-react-core",
-  "version": "1.4.3",
+  "version": "1.4.4",
   "repository": {
     "type": "git",
     "url": "https://github.com/dynamic-labs/DynamicAuth.git",
@@ -16,16 +16,16 @@
     "react-focus-lock": "2.9.2",
     "react-i18next": "^13.2.0",
     "yup": "0.32.11",
-    "@dynamic-labs/ethereum": "1.4.3",
-    "@dynamic-labs/iconic": "1.4.3",
-    "@dynamic-labs/logger": "1.4.3",
-    "@dynamic-labs/multi-wallet": "1.4.3",
-    "@dynamic-labs/rpc-providers": "1.4.3",
-    "@dynamic-labs/types": "1.4.3",
-    "@dynamic-labs/utils": "1.4.3",
-    "@dynamic-labs/viem-utils": "1.4.3",
-    "@dynamic-labs/wallet-book": "1.4.3",
-    "@dynamic-labs/wallet-connector-core": "1.4.3",
+    "@dynamic-labs/ethereum": "1.4.4",
+    "@dynamic-labs/iconic": "1.4.4",
+    "@dynamic-labs/logger": "1.4.4",
+    "@dynamic-labs/multi-wallet": "1.4.4",
+    "@dynamic-labs/rpc-providers": "1.4.4",
+    "@dynamic-labs/types": "1.4.4",
+    "@dynamic-labs/utils": "1.4.4",
+    "@dynamic-labs/viem-utils": "1.4.4",
+    "@dynamic-labs/wallet-book": "1.4.4",
+    "@dynamic-labs/wallet-connector-core": "1.4.4",
     "eventemitter3": "5.0.1"
   },
   "devDependencies": {

package/src/lib/components/DynamicFooter/DynamicFooter.cjs

@@ -4,7 +4,14 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var jsxRuntime = require('react/jsx-runtime');
 var PoweredByDynamic = require('../PoweredByDynamic/PoweredByDynamic.cjs');
+var classNames = require('../../utils/functions/classNames/classNames.cjs');
+var useAuthLayoutChecks = require('../../utils/hooks/useAuthLayoutChecks/useAuthLayoutChecks.cjs');
 
-const DynamicFooter = () => (jsxRuntime.jsx("div", { className: 'dynamic-footer', children: jsxRuntime.jsx(PoweredByDynamic.PoweredByDynamic, {}) }));
+const DynamicFooter = () => {
+    const { shouldHideDynamicFooterSeparator } = useAuthLayoutChecks.useAuthLayoutChecks();
+    return (jsxRuntime.jsx("div", { "data-testid": 'dynamic-footer', className: classNames.classNames('dynamic-footer', {
+            'dynamic-footer__top-border': !shouldHideDynamicFooterSeparator,
+        }), children: jsxRuntime.jsx(PoweredByDynamic.PoweredByDynamic, {}) }));
+};
 
 exports.DynamicFooter = DynamicFooter;

package/src/lib/components/DynamicFooter/DynamicFooter.js

@@ -1,6 +1,13 @@
 import { jsx } from 'react/jsx-runtime';
 import { PoweredByDynamic } from '../PoweredByDynamic/PoweredByDynamic.js';
+import { classNames } from '../../utils/functions/classNames/classNames.js';
+import { useAuthLayoutChecks } from '../../utils/hooks/useAuthLayoutChecks/useAuthLayoutChecks.js';
 
-const DynamicFooter = () => (jsx("div", { className: 'dynamic-footer', children: jsx(PoweredByDynamic, {}) }));
+const DynamicFooter = () => {
+    const { shouldHideDynamicFooterSeparator } = useAuthLayoutChecks();
+    return (jsx("div", { "data-testid": 'dynamic-footer', className: classNames('dynamic-footer', {
+            'dynamic-footer__top-border': !shouldHideDynamicFooterSeparator,
+        }), children: jsx(PoweredByDynamic, {}) }));
+};
 
 export { DynamicFooter };

package/src/lib/components/Toolkit/Toolkit.cjs

@@ -61,7 +61,6 @@ var AuthModeSwitch = require('./components/AuthModeSwitch.cjs');
 var LoginWithEmailSwitch = require('./components/LoginWithEmailSwitch.cjs');
 var LoginWithEmailViewDisplayPriorityOrderSwitch = require('./components/LoginWithEmailViewDisplayPriorityOrderSwitch.cjs');
 var TemplateSelect = require('./components/TemplateSelect.cjs');
-var MultiWalletSwitch = require('./components/MultiWalletSwitch.cjs');
 require('../PasskeyCreatedSuccessBanner/PasskeyCreatedSuccessBanner.cjs');
 require('../../context/PasskeyContext/PasskeyContext.cjs');
 require('../../views/WalletList/WalletList.cjs');
@@ -81,7 +80,7 @@ require('../../widgets/DynamicWidget/views/ManagePasskeysWidgetView/PasskeyCard/
 var useInternalDynamicContext = require('../../context/DynamicContext/useDynamicContext/useInternalDynamicContext.cjs');
 
 const Toolkit = () => {
-    const { projectSettings, user, showAuthFlow, showDynamicUserProfile, toolkitEnabled, authMode, setAuthMode, multiWallet, setMultiWallet, } = useInternalDynamicContext.useInternalDynamicContext();
+    const { projectSettings, user, showAuthFlow, showDynamicUserProfile, toolkitEnabled, authMode, setAuthMode, } = useInternalDynamicContext.useInternalDynamicContext();
     const isToolkitVisible = React.useMemo(() => {
         if (!toolkitEnabled)
             return false;
@@ -89,7 +88,7 @@ const Toolkit = () => {
     }, [showAuthFlow, showDynamicUserProfile, toolkitEnabled]);
     if (!isToolkitVisible)
         return null;
-    return (jsxRuntime.jsx(ShadowDOM.ShadowDOM, { dataTestId: 'toolkit-shadowdom', className: 'toolkit-shadowdom', zIndex: index.toolkitZIndex, children: jsxRuntime.jsxs("div", { className: 'toolkit__container', children: [jsxRuntime.jsxs("div", { className: 'toolkit__switcher', children: [jsxRuntime.jsx(Typography.Typography, { className: 'switcher__copy', as: 'h2', variant: 'body_normal', children: "Theme" }), jsxRuntime.jsx(ThemeSwitch.ThemeSwitch, {})] }), jsxRuntime.jsxs("div", { className: 'toolkit__switcher', children: [jsxRuntime.jsx(Typography.Typography, { className: 'switcher__copy', as: 'h2', variant: 'body_normal', children: "Template" }), jsxRuntime.jsx(TemplateSelect.TemplateSelect, {})] }), jsxRuntime.jsxs("div", { className: 'toolkit__switcher', children: [jsxRuntime.jsx(Typography.Typography, { className: 'switcher__copy', as: 'h2', variant: 'body_normal', children: "Primary Color" }), jsxRuntime.jsx(PrimaryColorInput.PrimaryColorInput, {})] }), !user && (jsxRuntime.jsxs(jsxRuntime.Fragment, { children: [jsxRuntime.jsxs("div", { className: 'toolkit__switcher', children: [jsxRuntime.jsx(Typography.Typography, { className: 'switcher__copy', as: 'h2', variant: 'body_normal', children: "Auth mode" }), jsxRuntime.jsx(AuthModeSwitch.AuthModeSwitch, { authMode: authMode, setAuthMode: setAuthMode })] }), jsxRuntime.jsxs("div", { className: 'toolkit__switcher', children: [jsxRuntime.jsx(Typography.Typography, { className: 'switcher__copy', as: 'h2', variant: 'body_normal', children: "Multi Wallet" }), jsxRuntime.jsx(MultiWalletSwitch.MultiWalletSwitch, { multiWallet: multiWallet, setMultiWallet: setMultiWallet })] })] })), isEmailProviderEnabled.isEmailProviderEnabled((projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.providers) || []) && !user && (jsxRuntime.jsxs(jsxRuntime.Fragment, { children: [jsxRuntime.jsxs("div", { className: 'toolkit__switcher', children: [jsxRuntime.jsx(Typography.Typography, { className: 'switcher__copy', as: 'h2', variant: 'body_normal', children: "Log in with Email" }), jsxRuntime.jsx(LoginWithEmailSwitch.LoginWithEmailSwitch, {})] }), jsxRuntime.jsxs("div", { className: 'toolkit__switcher', children: [jsxRuntime.jsx(Typography.Typography, { className: 'switcher__copy', as: 'h2', variant: 'body_normal', children: "Email vs Wallet priority" }), jsxRuntime.jsx(LoginWithEmailViewDisplayPriorityOrderSwitch.LoginWithEmailViewDisplayPriorityOrderSwitch, {})] })] }))] }) }));
+    return (jsxRuntime.jsx(ShadowDOM.ShadowDOM, { dataTestId: 'toolkit-shadowdom', className: 'toolkit-shadowdom', zIndex: index.toolkitZIndex, children: jsxRuntime.jsxs("div", { className: 'toolkit__container', children: [jsxRuntime.jsxs("div", { className: 'toolkit__switcher', children: [jsxRuntime.jsx(Typography.Typography, { className: 'switcher__copy', as: 'h2', variant: 'body_normal', children: "Theme" }), jsxRuntime.jsx(ThemeSwitch.ThemeSwitch, {})] }), jsxRuntime.jsxs("div", { className: 'toolkit__switcher', children: [jsxRuntime.jsx(Typography.Typography, { className: 'switcher__copy', as: 'h2', variant: 'body_normal', children: "Template" }), jsxRuntime.jsx(TemplateSelect.TemplateSelect, {})] }), jsxRuntime.jsxs("div", { className: 'toolkit__switcher', children: [jsxRuntime.jsx(Typography.Typography, { className: 'switcher__copy', as: 'h2', variant: 'body_normal', children: "Primary Color" }), jsxRuntime.jsx(PrimaryColorInput.PrimaryColorInput, {})] }), !user && (jsxRuntime.jsxs("div", { className: 'toolkit__switcher', children: [jsxRuntime.jsx(Typography.Typography, { className: 'switcher__copy', as: 'h2', variant: 'body_normal', children: "Auth mode" }), jsxRuntime.jsx(AuthModeSwitch.AuthModeSwitch, { authMode: authMode, setAuthMode: setAuthMode })] })), isEmailProviderEnabled.isEmailProviderEnabled((projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.providers) || []) && !user && (jsxRuntime.jsxs(jsxRuntime.Fragment, { children: [jsxRuntime.jsxs("div", { className: 'toolkit__switcher', children: [jsxRuntime.jsx(Typography.Typography, { className: 'switcher__copy', as: 'h2', variant: 'body_normal', children: "Log in with Email" }), jsxRuntime.jsx(LoginWithEmailSwitch.LoginWithEmailSwitch, {})] }), jsxRuntime.jsxs("div", { className: 'toolkit__switcher', children: [jsxRuntime.jsx(Typography.Typography, { className: 'switcher__copy', as: 'h2', variant: 'body_normal', children: "Email vs Wallet priority" }), jsxRuntime.jsx(LoginWithEmailViewDisplayPriorityOrderSwitch.LoginWithEmailViewDisplayPriorityOrderSwitch, {})] })] }))] }) }));
 };
 
 exports.Toolkit = Toolkit;

package/src/lib/components/Toolkit/Toolkit.js

@@ -57,7 +57,6 @@ import { AuthModeSwitch } from './components/AuthModeSwitch.js';
 import { LoginWithEmailSwitch } from './components/LoginWithEmailSwitch.js';
 import { LoginWithEmailViewDisplayPriorityOrderSwitch } from './components/LoginWithEmailViewDisplayPriorityOrderSwitch.js';
 import { TemplateSelect } from './components/TemplateSelect.js';
-import { MultiWalletSwitch } from './components/MultiWalletSwitch.js';
 import '../PasskeyCreatedSuccessBanner/PasskeyCreatedSuccessBanner.js';
 import '../../context/PasskeyContext/PasskeyContext.js';
 import '../../views/WalletList/WalletList.js';
@@ -77,7 +76,7 @@ import '../../widgets/DynamicWidget/views/ManagePasskeysWidgetView/PasskeyCard/P
 import { useInternalDynamicContext } from '../../context/DynamicContext/useDynamicContext/useInternalDynamicContext.js';
 
 const Toolkit = () => {
-    const { projectSettings, user, showAuthFlow, showDynamicUserProfile, toolkitEnabled, authMode, setAuthMode, multiWallet, setMultiWallet, } = useInternalDynamicContext();
+    const { projectSettings, user, showAuthFlow, showDynamicUserProfile, toolkitEnabled, authMode, setAuthMode, } = useInternalDynamicContext();
     const isToolkitVisible = useMemo(() => {
         if (!toolkitEnabled)
             return false;
@@ -85,7 +84,7 @@ const Toolkit = () => {
     }, [showAuthFlow, showDynamicUserProfile, toolkitEnabled]);
     if (!isToolkitVisible)
         return null;
-    return (jsx(ShadowDOM, { dataTestId: 'toolkit-shadowdom', className: 'toolkit-shadowdom', zIndex: toolkitZIndex, children: jsxs("div", { className: 'toolkit__container', children: [jsxs("div", { className: 'toolkit__switcher', children: [jsx(Typography, { className: 'switcher__copy', as: 'h2', variant: 'body_normal', children: "Theme" }), jsx(ThemeSwitch, {})] }), jsxs("div", { className: 'toolkit__switcher', children: [jsx(Typography, { className: 'switcher__copy', as: 'h2', variant: 'body_normal', children: "Template" }), jsx(TemplateSelect, {})] }), jsxs("div", { className: 'toolkit__switcher', children: [jsx(Typography, { className: 'switcher__copy', as: 'h2', variant: 'body_normal', children: "Primary Color" }), jsx(PrimaryColorInput, {})] }), !user && (jsxs(Fragment, { children: [jsxs("div", { className: 'toolkit__switcher', children: [jsx(Typography, { className: 'switcher__copy', as: 'h2', variant: 'body_normal', children: "Auth mode" }), jsx(AuthModeSwitch, { authMode: authMode, setAuthMode: setAuthMode })] }), jsxs("div", { className: 'toolkit__switcher', children: [jsx(Typography, { className: 'switcher__copy', as: 'h2', variant: 'body_normal', children: "Multi Wallet" }), jsx(MultiWalletSwitch, { multiWallet: multiWallet, setMultiWallet: setMultiWallet })] })] })), isEmailProviderEnabled((projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.providers) || []) && !user && (jsxs(Fragment, { children: [jsxs("div", { className: 'toolkit__switcher', children: [jsx(Typography, { className: 'switcher__copy', as: 'h2', variant: 'body_normal', children: "Log in with Email" }), jsx(LoginWithEmailSwitch, {})] }), jsxs("div", { className: 'toolkit__switcher', children: [jsx(Typography, { className: 'switcher__copy', as: 'h2', variant: 'body_normal', children: "Email vs Wallet priority" }), jsx(LoginWithEmailViewDisplayPriorityOrderSwitch, {})] })] }))] }) }));
+    return (jsx(ShadowDOM, { dataTestId: 'toolkit-shadowdom', className: 'toolkit-shadowdom', zIndex: toolkitZIndex, children: jsxs("div", { className: 'toolkit__container', children: [jsxs("div", { className: 'toolkit__switcher', children: [jsx(Typography, { className: 'switcher__copy', as: 'h2', variant: 'body_normal', children: "Theme" }), jsx(ThemeSwitch, {})] }), jsxs("div", { className: 'toolkit__switcher', children: [jsx(Typography, { className: 'switcher__copy', as: 'h2', variant: 'body_normal', children: "Template" }), jsx(TemplateSelect, {})] }), jsxs("div", { className: 'toolkit__switcher', children: [jsx(Typography, { className: 'switcher__copy', as: 'h2', variant: 'body_normal', children: "Primary Color" }), jsx(PrimaryColorInput, {})] }), !user && (jsxs("div", { className: 'toolkit__switcher', children: [jsx(Typography, { className: 'switcher__copy', as: 'h2', variant: 'body_normal', children: "Auth mode" }), jsx(AuthModeSwitch, { authMode: authMode, setAuthMode: setAuthMode })] })), isEmailProviderEnabled((projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.providers) || []) && !user && (jsxs(Fragment, { children: [jsxs("div", { className: 'toolkit__switcher', children: [jsx(Typography, { className: 'switcher__copy', as: 'h2', variant: 'body_normal', children: "Log in with Email" }), jsx(LoginWithEmailSwitch, {})] }), jsxs("div", { className: 'toolkit__switcher', children: [jsx(Typography, { className: 'switcher__copy', as: 'h2', variant: 'body_normal', children: "Email vs Wallet priority" }), jsx(LoginWithEmailViewDisplayPriorityOrderSwitch, {})] })] }))] }) }));
 };
 
 export { Toolkit };

package/src/lib/components/Toolkit/components/index.d.ts

@@ -4,4 +4,3 @@ export { AuthModeSwitch } from './AuthModeSwitch';
 export { LoginWithEmailSwitch } from './LoginWithEmailSwitch';
 export { LoginWithEmailViewDisplayPriorityOrderSwitch } from './LoginWithEmailViewDisplayPriorityOrderSwitch';
 export { TemplateSelect } from './TemplateSelect';
-export { MultiWalletSwitch } from './MultiWalletSwitch';

package/src/lib/context/DynamicContext/DynamicContext.cjs

@@ -79,7 +79,6 @@ var locale = require('../../locale/locale.cjs');
 var getMissingChains = require('../../utils/functions/getMissingChains/getMissingChains.cjs');
 var parseTheme = require('../../utils/functions/parseTheme/parseTheme.cjs');
 var useMultiWalletWidgetState = require('../../utils/hooks/multiWallet/useMultiWalletWidgetState/useMultiWalletWidgetState.cjs');
-var useMultiWallet = require('../../utils/hooks/multiWallet/useMultiWallet/useMultiWallet.cjs');
 var useClearWalletConnectSessions = require('../../utils/hooks/useClearWalletConnectSessions/useClearWalletConnectSessions.cjs');
 var useConnectWallet = require('../../utils/hooks/useConnectWallet/useConnectWallet.cjs');
 var useFetchWalletsForChainsMap = require('../../utils/hooks/useFetchWalletsForChainsMap/useFetchWalletsForChainsMap.cjs');
@@ -117,6 +116,7 @@ var useShowAuthFlow = require('./hooks/useShowAuthFlow/useShowAuthFlow.cjs');
 var usePasskeySuccessPopup = require('./hooks/usePasskeySuccessPopup/usePasskeySuccessPopup.cjs');
 var useTieCallbacksToEvents = require('./hooks/useTieCallbacksToEvents/useTieCallbacksToEvents.cjs');
 var useVerificationInProgress = require('./hooks/useVerificationInProgress/useVerificationInProgress.cjs');
+var useMultiWallet = require('./hooks/useMultiWallet/useMultiWallet.cjs');
 var useSetShowLinkNewWalletModal = require('./hooks/useSetShowLinkNewWalletModal/useSetShowLinkNewWalletModal.cjs');
 var useCustomerCallbacks = require('./useCustomerCallbacks/useCustomerCallbacks.cjs');
 var validators = require('./validators/validators.cjs');
@@ -126,7 +126,7 @@ const EMPTY_INITIAL_USER = undefined;
 const DynamicContext = React.createContext(undefined);
 /** The context provider itself we only use internally */
 const InnerDynamicContextProvider = ({ children, theme, settings, locale: locale$1, }) => {
-    var _a, _b, _c, _d, _e, _f;
+    var _a, _b, _c, _d, _e, _f, _g;
     const { accessDeniedMessagePrimary, accessDeniedMessageSecondary, accessDeniedButton, apiBaseUrl, enableConnectOnlyFallback = false, deepLinkPreference = 'native', bridgeChains, cssOverrides, defaultNumberOfWalletsToShow = values.DEFAULT_NUMBER_OF_WALLETS_TO_SHOW, flowNetwork, initialAuthenticationMode = 'connect-and-sign', debugError = false, displaySiweStatement = true, newToWeb3WalletChainMap, enableVisitTrackingOnConnectOnly = true, environmentId, localStorageSuffix, eventsCallbacks, evmNetworks, walletsFilter, logLevel = 'WARN', mobileExperience = 'in-app-browser', notInTheListImageUrl, onboardingImageUrl, policiesConsentInnerComponent, customPrivacyPolicy, privacyPolicyUrl, signWithEmailWalletName, socialMediaLinkText, socialMediaIconUrl, socialMediaUrl, customTermsOfServices, termsOfServiceUrl, toolkitEnabled, siweStatement, shadowDOMEnabled = true, walletConnectors: walletConnectorsProp, socialProvidersFilter, showLockedWalletView = false, walletConnectPreferredChains, walletConnectorExtensions, hideEmbeddedWalletTransactionUIs, } = settings;
     const networkValidationMode = helpers.resolveNetworkValidationMode({
         bridgeChains: settings.bridgeChains,
@@ -168,10 +168,10 @@ const InnerDynamicContextProvider = ({ children, theme, settings, locale: locale
         dynamicContextProps: { settings },
         environmentId,
     });
-    const { multiWallet, setMultiWallet } = useMultiWallet.useMultiWallet({
+    const multiWallet = useMultiWallet.useMultiWallet({
         isBridgeFlow,
-        multiWalletSettings: (_b = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk) === null || _b === void 0 ? void 0 : _b.multiWallet,
-        toolkitEnabled: toolkitEnabled || false,
+        multiWalletOverride: (_b = settings.overrides) === null || _b === void 0 ? void 0 : _b.multiWallet,
+        multiWalletSettings: (_c = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk) === null || _c === void 0 ? void 0 : _c.multiWallet,
     });
     // ensures that when user comes back to site and primary wallet is out of sync, we don't show widget popup
     const [showWidgetStatePopup, setShowWidgetStatePopup] = React.useState(!multiWallet);
@@ -245,7 +245,7 @@ const InnerDynamicContextProvider = ({ children, theme, settings, locale: locale
     //selected wallet to perform an action (become primary, unlink, etc)
     const [selectedWalletWithAction, setSelectedWalletWithAction] = React.useState(null);
     // until user completes onboarding, jwt is only stored in onboardingOnlyJwt
-    const authToken = (_c = getAuthToken.getAuthToken()) !== null && _c !== void 0 ? _c : onboardingOnlyJwt;
+    const authToken = (_d = getAuthToken.getAuthToken()) !== null && _d !== void 0 ? _d : onboardingOnlyJwt;
     useSetWalletConnectorVerifiedCredentials.useSetWalletConnectorVerifiedCredentials(authToken, walletConnectorOptions);
     const { didConnectedStateLoad, primaryWallet, showQrcodeModal, secondaryWallets, setPrimaryWallet, setShowQrcodeModal, wallets: linkedOrConnectedWallets, } = useWalletConnectors.useWalletConnectors({
         authMode,
@@ -312,14 +312,13 @@ const InnerDynamicContextProvider = ({ children, theme, settings, locale: locale
         setShowAuthFlow,
         setShowBridgeWidget,
         setShowDynamicUserProfile,
-        toolkitEnabled,
         user,
         walletConnectors,
     });
     let wcVersion;
     if (projectSettings) {
         wcVersion =
-            ((_e = (_d = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk) === null || _d === void 0 ? void 0 : _d.walletConnect) === null || _e === void 0 ? void 0 : _e.v2Enabled) && !walletConnectV1Bridge
+            ((_f = (_e = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk) === null || _e === void 0 ? void 0 : _e.walletConnect) === null || _f === void 0 ? void 0 : _f.v2Enabled) && !walletConnectV1Bridge
                 ? 2
                 : 1;
     }
@@ -516,7 +515,6 @@ const InnerDynamicContextProvider = ({ children, theme, settings, locale: locale
             setIsVerificationInProgress,
             setLegacyIsVerifying,
             setLogInWithEmail,
-            setMultiWallet,
             setMultiWalletWidgetState,
             setNetwork,
             setOnboardingOnlyJwt,
@@ -633,7 +631,6 @@ const InnerDynamicContextProvider = ({ children, theme, settings, locale: locale
         setCallback,
         setIsVerificationInProgress,
         setLogInWithEmail,
-        setMultiWallet,
         setMultiWalletWidgetState,
         setNetwork,
         setPrimaryWallet,
@@ -701,7 +698,7 @@ const InnerDynamicContextProvider = ({ children, theme, settings, locale: locale
             setShowDynamicUserProfile(true);
         }
     }, [multiWallet, multiWalletWidgetState, showDynamicUserProfile, user]);
-    return (jsxRuntime.jsx(reactI18next.I18nextProvider, { i18n: i18nSDKInstance, children: jsxRuntime.jsx(DynamicContext.Provider, { value: value, children: jsxRuntime.jsx(walletBook.WalletBookContextProvider, { walletBook: walletBook$1, children: jsxRuntime.jsx(ThemeContext.ThemeContextProvider, { customerTheme: parseTheme.parseTheme(theme, ((_f = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.design) === null || _f === void 0 ? void 0 : _f.modal) || undefined), designSettings: projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.design, children: jsxRuntime.jsx(LoadingContext.LoadingContextProvider, { children: jsxRuntime.jsxs(ViewContext.ViewContextProvider, { initialView: helpers.getInitialView({
+    return (jsxRuntime.jsx(reactI18next.I18nextProvider, { i18n: i18nSDKInstance, children: jsxRuntime.jsx(DynamicContext.Provider, { value: value, children: jsxRuntime.jsx(walletBook.WalletBookContextProvider, { walletBook: walletBook$1, children: jsxRuntime.jsx(ThemeContext.ThemeContextProvider, { customerTheme: parseTheme.parseTheme(theme, ((_g = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.design) === null || _g === void 0 ? void 0 : _g.modal) || undefined), designSettings: projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.design, children: jsxRuntime.jsx(LoadingContext.LoadingContextProvider, { children: jsxRuntime.jsxs(ViewContext.ViewContextProvider, { initialView: helpers.getInitialView({
                                 bridgeOnboardingCompleted,
                                 connectedWallets,
                                 isAuthenticated: isAuthenticated || Boolean(primaryWallet),

package/src/lib/context/DynamicContext/DynamicContext.js

@@ -75,7 +75,6 @@ import { Locale } from '../../locale/locale.js';
 import { getMissingChains } from '../../utils/functions/getMissingChains/getMissingChains.js';
 import { parseTheme } from '../../utils/functions/parseTheme/parseTheme.js';
 import { useMultiWalletWidgetState } from '../../utils/hooks/multiWallet/useMultiWalletWidgetState/useMultiWalletWidgetState.js';
-import { useMultiWallet } from '../../utils/hooks/multiWallet/useMultiWallet/useMultiWallet.js';
 import { useClearWalletConnectSessions } from '../../utils/hooks/useClearWalletConnectSessions/useClearWalletConnectSessions.js';
 import { useConnectWallet } from '../../utils/hooks/useConnectWallet/useConnectWallet.js';
 import { useFetchWalletsForChainsMap } from '../../utils/hooks/useFetchWalletsForChainsMap/useFetchWalletsForChainsMap.js';
@@ -113,6 +112,7 @@ import { useShowAuthFlow } from './hooks/useShowAuthFlow/useShowAuthFlow.js';
 import { usePasskeySuccessPopup } from './hooks/usePasskeySuccessPopup/usePasskeySuccessPopup.js';
 import { useTieCallbacksToEvents } from './hooks/useTieCallbacksToEvents/useTieCallbacksToEvents.js';
 import { useVerificationInProgress } from './hooks/useVerificationInProgress/useVerificationInProgress.js';
+import { useMultiWallet } from './hooks/useMultiWallet/useMultiWallet.js';
 import { useSetShowLinkNewWalletModal } from './hooks/useSetShowLinkNewWalletModal/useSetShowLinkNewWalletModal.js';
 import { useCustomerCallbacks } from './useCustomerCallbacks/useCustomerCallbacks.js';
 import { validateAuthUser } from './validators/validators.js';
@@ -122,7 +122,7 @@ const EMPTY_INITIAL_USER = undefined;
 const DynamicContext = createContext(undefined);
 /** The context provider itself we only use internally */
 const InnerDynamicContextProvider = ({ children, theme, settings, locale, }) => {
-    var _a, _b, _c, _d, _e, _f;
+    var _a, _b, _c, _d, _e, _f, _g;
     const { accessDeniedMessagePrimary, accessDeniedMessageSecondary, accessDeniedButton, apiBaseUrl, enableConnectOnlyFallback = false, deepLinkPreference = 'native', bridgeChains, cssOverrides, defaultNumberOfWalletsToShow = DEFAULT_NUMBER_OF_WALLETS_TO_SHOW, flowNetwork, initialAuthenticationMode = 'connect-and-sign', debugError = false, displaySiweStatement = true, newToWeb3WalletChainMap, enableVisitTrackingOnConnectOnly = true, environmentId, localStorageSuffix, eventsCallbacks, evmNetworks, walletsFilter, logLevel = 'WARN', mobileExperience = 'in-app-browser', notInTheListImageUrl, onboardingImageUrl, policiesConsentInnerComponent, customPrivacyPolicy, privacyPolicyUrl, signWithEmailWalletName, socialMediaLinkText, socialMediaIconUrl, socialMediaUrl, customTermsOfServices, termsOfServiceUrl, toolkitEnabled, siweStatement, shadowDOMEnabled = true, walletConnectors: walletConnectorsProp, socialProvidersFilter, showLockedWalletView = false, walletConnectPreferredChains, walletConnectorExtensions, hideEmbeddedWalletTransactionUIs, } = settings;
     const networkValidationMode = resolveNetworkValidationMode({
         bridgeChains: settings.bridgeChains,
@@ -164,10 +164,10 @@ const InnerDynamicContextProvider = ({ children, theme, settings, locale, }) =>
         dynamicContextProps: { settings },
         environmentId,
     });
-    const { multiWallet, setMultiWallet } = useMultiWallet({
+    const multiWallet = useMultiWallet({
         isBridgeFlow,
-        multiWalletSettings: (_b = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk) === null || _b === void 0 ? void 0 : _b.multiWallet,
-        toolkitEnabled: toolkitEnabled || false,
+        multiWalletOverride: (_b = settings.overrides) === null || _b === void 0 ? void 0 : _b.multiWallet,
+        multiWalletSettings: (_c = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk) === null || _c === void 0 ? void 0 : _c.multiWallet,
     });
     // ensures that when user comes back to site and primary wallet is out of sync, we don't show widget popup
     const [showWidgetStatePopup, setShowWidgetStatePopup] = useState(!multiWallet);
@@ -241,7 +241,7 @@ const InnerDynamicContextProvider = ({ children, theme, settings, locale, }) =>
     //selected wallet to perform an action (become primary, unlink, etc)
     const [selectedWalletWithAction, setSelectedWalletWithAction] = useState(null);
     // until user completes onboarding, jwt is only stored in onboardingOnlyJwt
-    const authToken = (_c = getAuthToken()) !== null && _c !== void 0 ? _c : onboardingOnlyJwt;
+    const authToken = (_d = getAuthToken()) !== null && _d !== void 0 ? _d : onboardingOnlyJwt;
     useSetWalletConnectorVerifiedCredentials(authToken, walletConnectorOptions);
     const { didConnectedStateLoad, primaryWallet, showQrcodeModal, secondaryWallets, setPrimaryWallet, setShowQrcodeModal, wallets: linkedOrConnectedWallets, } = useWalletConnectors({
         authMode,
@@ -308,14 +308,13 @@ const InnerDynamicContextProvider = ({ children, theme, settings, locale, }) =>
         setShowAuthFlow,
         setShowBridgeWidget,
         setShowDynamicUserProfile,
-        toolkitEnabled,
         user,
         walletConnectors,
     });
     let wcVersion;
     if (projectSettings) {
         wcVersion =
-            ((_e = (_d = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk) === null || _d === void 0 ? void 0 : _d.walletConnect) === null || _e === void 0 ? void 0 : _e.v2Enabled) && !walletConnectV1Bridge
+            ((_f = (_e = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk) === null || _e === void 0 ? void 0 : _e.walletConnect) === null || _f === void 0 ? void 0 : _f.v2Enabled) && !walletConnectV1Bridge
                 ? 2
                 : 1;
     }
@@ -512,7 +511,6 @@ const InnerDynamicContextProvider = ({ children, theme, settings, locale, }) =>
             setIsVerificationInProgress,
             setLegacyIsVerifying,
             setLogInWithEmail,
-            setMultiWallet,
             setMultiWalletWidgetState,
             setNetwork,
             setOnboardingOnlyJwt,
@@ -629,7 +627,6 @@ const InnerDynamicContextProvider = ({ children, theme, settings, locale, }) =>
         setCallback,
         setIsVerificationInProgress,
         setLogInWithEmail,
-        setMultiWallet,
         setMultiWalletWidgetState,
         setNetwork,
         setPrimaryWallet,
@@ -697,7 +694,7 @@ const InnerDynamicContextProvider = ({ children, theme, settings, locale, }) =>
             setShowDynamicUserProfile(true);
         }
     }, [multiWallet, multiWalletWidgetState, showDynamicUserProfile, user]);
-    return (jsx(I18nextProvider, { i18n: i18nSDKInstance, children: jsx(DynamicContext.Provider, { value: value, children: jsx(WalletBookContextProvider, { walletBook: walletBook, children: jsx(ThemeContextProvider, { customerTheme: parseTheme(theme, ((_f = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.design) === null || _f === void 0 ? void 0 : _f.modal) || undefined), designSettings: projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.design, children: jsx(LoadingContextProvider, { children: jsxs(ViewContextProvider, { initialView: getInitialView({
+    return (jsx(I18nextProvider, { i18n: i18nSDKInstance, children: jsx(DynamicContext.Provider, { value: value, children: jsx(WalletBookContextProvider, { walletBook: walletBook, children: jsx(ThemeContextProvider, { customerTheme: parseTheme(theme, ((_g = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.design) === null || _g === void 0 ? void 0 : _g.modal) || undefined), designSettings: projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.design, children: jsx(LoadingContextProvider, { children: jsxs(ViewContextProvider, { initialView: getInitialView({
                                 bridgeOnboardingCompleted,
                                 connectedWallets,
                                 isAuthenticated: isAuthenticated || Boolean(primaryWallet),

package/src/lib/context/DynamicContext/hooks/index.d.ts

@@ -7,3 +7,4 @@ export * from './useShowAuthFlow';
 export * from './usePasskeySuccessPopup';
 export * from './useTieCallbacksToEvents';
 export * from './useVerificationInProgress';
+export * from './useMultiWallet';

package/src/lib/context/DynamicContext/hooks/useHandleLogout/types.d.ts

@@ -11,7 +11,6 @@ export type UseHandleLogoutParams = {
     bridgeChains: ChainsToConnect[] | undefined;
     setShowDynamicUserProfile: Dispatch<SetStateAction<boolean>>;
     setShowBridgeWidget: Dispatch<SetStateAction<boolean>>;
-    toolkitEnabled: boolean | undefined;
     user: UserProfile | undefined;
     environmentId: string;
     walletConnectors: WalletConnectorCore.WalletConnector[];

package/src/lib/context/DynamicContext/hooks/useHandleLogout/useHandleLogout.cjs

@@ -84,9 +84,6 @@ const useHandleLogout = (params) => {
         p.setShowBridgeWidget(false);
         p.resetLoginWithEmail();
         localStorage.LocalStorage.removeFromLS(localStorage$1.WALLET_PICKER_SEARCH_KEY);
-        if (!p.toolkitEnabled) {
-            localStorage.LocalStorage.removeFromLS(localStorage$1.IS_MULTI_WALLET_ENABLED);
-        }
         const jwt = getAuthToken.getAuthToken();
         if (jwt && p.user) {
             // do not await this async call - just fire and forget

package/src/lib/context/DynamicContext/hooks/useHandleLogout/useHandleLogout.js

@@ -9,7 +9,7 @@ import '@dynamic-labs/wallet-connector-core';
 import 'react/jsx-runtime';
 import '../../../ViewContext/ViewContext.js';
 import '@dynamic-labs/wallet-book';
-import { WALLET_PICKER_SEARCH_KEY, IS_MULTI_WALLET_ENABLED, AUTH_TOKEN } from '../../../../utils/constants/localStorage.js';
+import { WALLET_PICKER_SEARCH_KEY, AUTH_TOKEN } from '../../../../utils/constants/localStorage.js';
 import '../../../../utils/constants/colors.js';
 import '../../../../utils/constants/values.js';
 import { LocalStorage } from '../../../../shared/utils/classes/storage/localStorage.js';
@@ -80,9 +80,6 @@ const useHandleLogout = (params) => {
         p.setShowBridgeWidget(false);
         p.resetLoginWithEmail();
         LocalStorage.removeFromLS(WALLET_PICKER_SEARCH_KEY);
-        if (!p.toolkitEnabled) {
-            LocalStorage.removeFromLS(IS_MULTI_WALLET_ENABLED);
-        }
         const jwt = getAuthToken();
         if (jwt && p.user) {
             // do not await this async call - just fire and forget

package/src/lib/context/DynamicContext/hooks/useMultiWallet/useMultiWallet.cjs

@@ -0,0 +1,15 @@
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+const useMultiWallet = ({ isBridgeFlow, multiWalletOverride, multiWalletSettings, }) => {
+    var _a;
+    // Use settings override
+    if (multiWalletOverride !== undefined) {
+        return multiWalletOverride;
+    }
+    // Use settings value
+    return (_a = (multiWalletSettings || isBridgeFlow)) !== null && _a !== void 0 ? _a : false;
+};
+
+exports.useMultiWallet = useMultiWallet;

package/src/lib/context/DynamicContext/hooks/useMultiWallet/useMultiWallet.d.ts

@@ -0,0 +1,6 @@
+export type UseMultiWalletProps = {
+    isBridgeFlow?: boolean;
+    multiWalletOverride?: boolean;
+    multiWalletSettings?: boolean;
+};
+export declare const useMultiWallet: ({ isBridgeFlow, multiWalletOverride, multiWalletSettings, }: UseMultiWalletProps) => boolean;

package/src/lib/context/DynamicContext/hooks/useMultiWallet/useMultiWallet.js

@@ -0,0 +1,11 @@
+const useMultiWallet = ({ isBridgeFlow, multiWalletOverride, multiWalletSettings, }) => {
+    var _a;
+    // Use settings override
+    if (multiWalletOverride !== undefined) {
+        return multiWalletOverride;
+    }
+    // Use settings value
+    return (_a = (multiWalletSettings || isBridgeFlow)) !== null && _a !== void 0 ? _a : false;
+};
+
+export { useMultiWallet };

package/src/lib/context/DynamicContext/types/index.d.ts

@@ -32,6 +32,10 @@ export type WalletListViewSettings = {
 export type ViewsOverrides = SdkView | WalletListViewSettings;
 export type SettingsOverrides = {
     views?: Array<ViewsOverrides>;
+    /**
+     * Allows overriding the multi-wallet feature from the dashboard.
+     */
+    multiWallet?: boolean;
 };
 export type ConnectWalletResult = {
     address: string;
@@ -117,7 +121,6 @@ export interface IDynamicContext {
     setDesktopUri: Dispatch<SetStateAction<string>>;
     setIsSingleWalletAccount: Dispatch<SetStateAction<boolean>>;
     setLogInWithEmail: Dispatch<SetStateAction<boolean>>;
-    setMultiWallet: (value: boolean) => void;
     setMultiWalletWidgetState: MultiWalletWidgetStateSetter;
     setNetwork: Dispatch<SetStateAction<number | string | undefined>>;
     setOnboardingOnlyJwt: Dispatch<SetStateAction<string | undefined>>;

package/src/lib/context/DynamicContext/useCustomerCallbacks/useCustomerCallbacks.cjs

@@ -110,8 +110,10 @@ const useCustomerCallbacks = ({ callbacks: { onAuthSuccess, onLinkSuccess, onUse
         handleNextCallback(callbackQueue[0], authToken, user);
         setCallbackQueue((prev) => {
             const [resolvedCallback, ...updatedQueue] = prev;
-            logger.logger.debug('Resolved callback: ', resolvedCallback.callback);
-            logger.logger.debug('Callbacks in queue: ', updatedQueue.map((c) => c.callback));
+            if (resolvedCallback) {
+                logger.logger.debug('Resolved callback: ', resolvedCallback.callback);
+                logger.logger.debug('Callbacks in queue: ', updatedQueue.map((c) => c.callback));
+            }
             return updatedQueue;
         });
     }, [callbackQueue, handleNextCallback, primaryWallet, user]);

package/src/lib/context/DynamicContext/useCustomerCallbacks/useCustomerCallbacks.js

@@ -106,8 +106,10 @@ const useCustomerCallbacks = ({ callbacks: { onAuthSuccess, onLinkSuccess, onUse
         handleNextCallback(callbackQueue[0], authToken, user);
         setCallbackQueue((prev) => {
             const [resolvedCallback, ...updatedQueue] = prev;
-            logger.debug('Resolved callback: ', resolvedCallback.callback);
-            logger.debug('Callbacks in queue: ', updatedQueue.map((c) => c.callback));
+            if (resolvedCallback) {
+                logger.debug('Resolved callback: ', resolvedCallback.callback);
+                logger.debug('Callbacks in queue: ', updatedQueue.map((c) => c.callback));
+            }
             return updatedQueue;
         });
     }, [callbackQueue, handleNextCallback, primaryWallet, user]);