@dynamic-labs/sdk-react-core 1.1.0-alpha.8 → 1.1.0-alpha.9

package/CHANGELOG.md

@@ -1,4 +1,18 @@
 
+## [1.1.0-alpha.9](https://github.com/dynamic-labs/DynamicAuth/compare/v1.1.0-alpha.8...v1.1.0-alpha.9) (2024-01-04)
+
+
+### Features
+
+* add solana magic support ([#4258](https://github.com/dynamic-labs/DynamicAuth/issues/4258)) ([da726aa](https://github.com/dynamic-labs/DynamicAuth/commit/da726aa78466c52ee3e1f18952e4351cde754cbc))
+
+
+### Bug Fixes
+
+* edge case with unlinking wallet ([#4285](https://github.com/dynamic-labs/DynamicAuth/issues/4285)) ([1057fe4](https://github.com/dynamic-labs/DynamicAuth/commit/1057fe47599381f5d9dc39ce4cbeca2041c70319))
+* remove normalizeWalletName from DynamicAuth ([5592817](https://github.com/dynamic-labs/DynamicAuth/commit/5592817b62e345319e04cca9a98276ffad87cfc2))
+* **useFetchBalance:** ensure the latest wallet balance is fetched ([#4288](https://github.com/dynamic-labs/DynamicAuth/issues/4288)) ([25dd035](https://github.com/dynamic-labs/DynamicAuth/commit/25dd035cf8893b7cd28f550026134ba0eecda142))
+
 ## [1.1.0-alpha.8](https://github.com/dynamic-labs/DynamicAuth/compare/v1.1.0-alpha.7...v1.1.0-alpha.8) (2024-01-03)
 
 

package/package.cjs

@@ -2,7 +2,7 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var version = "1.1.0-alpha.8";
+var version = "1.1.0-alpha.9";
 var dependencies = {
 	"@dynamic-labs/iconic": "0.1.47",
 	"@dynamic-labs/sdk-api": "0.0.340",

package/package.js

@@ -1,4 +1,4 @@
-var version = "1.1.0-alpha.8";
+var version = "1.1.0-alpha.9";
 var dependencies = {
 	"@dynamic-labs/iconic": "0.1.47",
 	"@dynamic-labs/sdk-api": "0.0.340",

package/package.json

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

package/src/index.cjs

@@ -126,7 +126,6 @@ require('./lib/config/ApiEndpoint.cjs');
 require('@dynamic-labs/multi-wallet');
 var walletConnectorCore = require('@dynamic-labs/wallet-connector-core');
 require('./lib/utils/constants/colors.cjs');
-var isSameWalletName = require('./lib/utils/functions/isSameWalletName/isSameWalletName.cjs');
 require('./lib/context/ViewContext/ViewContext.cjs');
 var useEmbeddedWallet = require('./lib/utils/hooks/useEmbeddedWallet/useEmbeddedWallet.cjs');
 require('@dynamic-labs/iconic');
@@ -185,6 +184,7 @@ var EmailConfirmationWaitingView = require('./lib/views/EmailConfirmationWaiting
 var viewToComponentMap = require('./lib/views/viewToComponentMap.cjs');
 var NetworkNotSupportedSwitchManual = require('./lib/views/NetworkNotSupportedSwitchManual/NetworkNotSupportedSwitchManual.cjs');
 var themesData = require('./lib/context/ThemeContext/themesData.cjs');
+var isSameWalletName = require('./lib/utils/functions/isSameWalletName/isSameWalletName.cjs');
 var getNetwork = require('./lib/utils/functions/getNetwork/getNetwork.cjs');
 var index$3 = require('./lib/utils/functions/walletFilters/index.cjs');
 var SendBalanceContext = require('./lib/context/SendBalanceContext/SendBalanceContext.cjs');
@@ -325,7 +325,6 @@ Object.defineProperty(exports, 'normalizeWalletName', {
   enumerable: true,
   get: function () { return walletConnectorCore.normalizeWalletName; }
 });
-exports.isSameWalletName = isSameWalletName.isSameWalletName;
 exports.useEmbeddedWallet = useEmbeddedWallet.useEmbeddedWallet;
 exports.useIsLoggedIn = useIsLoggedIn.useIsLoggedIn;
 exports.usePasskeyRecovery = usePasskeyRecovery.usePasskeyRecovery;
@@ -354,6 +353,7 @@ exports.NetworkNotSupportedSwitchManual = NetworkNotSupportedSwitchManual.Networ
 exports.getDefaultColor = themesData.getDefaultColor;
 exports.getThemeConfig = themesData.getThemeConfig;
 exports.themesData = themesData.themesData;
+exports.isSameWalletName = isSameWalletName.isSameWalletName;
 exports.getNetwork = getNetwork.getNetwork;
 exports.FilterAndSortWallets = index$3.FilterAndSortWallets;
 exports.FilterBridgeChainsName = index$3.FilterBridgeChainsName;

package/src/index.js

@@ -122,7 +122,6 @@ import './lib/config/ApiEndpoint.js';
 import '@dynamic-labs/multi-wallet';
 export { normalizeWalletName } from '@dynamic-labs/wallet-connector-core';
 import './lib/utils/constants/colors.js';
-export { isSameWalletName } from './lib/utils/functions/isSameWalletName/isSameWalletName.js';
 import './lib/context/ViewContext/ViewContext.js';
 export { useEmbeddedWallet } from './lib/utils/hooks/useEmbeddedWallet/useEmbeddedWallet.js';
 import '@dynamic-labs/iconic';
@@ -181,6 +180,7 @@ export { EmailConfirmationWaitingView } from './lib/views/EmailConfirmationWaiti
 export { viewToComponentMap } from './lib/views/viewToComponentMap.js';
 export { NetworkNotSupportedSwitchManual } from './lib/views/NetworkNotSupportedSwitchManual/NetworkNotSupportedSwitchManual.js';
 export { getDefaultColor, getThemeConfig, themesData } from './lib/context/ThemeContext/themesData.js';
+export { isSameWalletName } from './lib/utils/functions/isSameWalletName/isSameWalletName.js';
 export { getNetwork } from './lib/utils/functions/getNetwork/getNetwork.js';
 export { FilterAndSortWallets, FilterBridgeChainsName, FilterWallets, RemoveWallets, SortWallets, UniswapFilter } from './lib/utils/functions/walletFilters/index.js';
 export { useSendBalance } from './lib/context/SendBalanceContext/SendBalanceContext.js';

package/src/lib/Main.cjs

@@ -30,7 +30,6 @@ require('./config/ApiEndpoint.cjs');
 var isConnectOnly = require('./utils/hooks/authenticationHooks/helpers/isConnectOnly.cjs');
 require('./context/EmailVerificationContext/EmailVerificationContext.cjs');
 require('react-dom');
-var isSameWalletName = require('./utils/functions/isSameWalletName/isSameWalletName.cjs');
 require('./context/ThemeContext/ThemeContext.cjs');
 require('@dynamic-labs/types');
 require('yup');
@@ -84,7 +83,7 @@ const Main = () => {
             userWallets.length === 1) {
             yield handleLogOut();
         }
-        setShowAuthFlow(false);
+        setShowAuthFlow(false, { emitCancelAuth: true });
         setDeniedAddress('');
         setDeniedOauthProvider(undefined);
         setExistentAccountData(undefined);
@@ -154,9 +153,9 @@ const Main = () => {
         }
     });
     React.useEffect(() => {
-        const newToWeb3WalletName = localStorage.LocalStorage.getFromLS(localStorage$1.NEWTOWEB3_WALLET_EXTENSION_FLAG_KEY);
-        if ((walletConnectorOptions === null || walletConnectorOptions === void 0 ? void 0 : walletConnectorOptions.length) && newToWeb3WalletName) {
-            const wallet = walletConnectorOptions.find((wallet) => isSameWalletName.isSameWalletName(wallet.name, newToWeb3WalletName));
+        const newToWeb3WalletKey = localStorage.LocalStorage.getFromLS(localStorage$1.NEWTOWEB3_WALLET_EXTENSION_FLAG_KEY);
+        if ((walletConnectorOptions === null || walletConnectorOptions === void 0 ? void 0 : walletConnectorOptions.length) && newToWeb3WalletKey) {
+            const wallet = walletConnectorOptions.find((wallet) => wallet.key === newToWeb3WalletKey);
             if (wallet === null || wallet === void 0 ? void 0 : wallet.walletConnector) {
                 handleNewToWeb3WalletIntent(wallet.walletConnector);
             }

package/src/lib/Main.js

@@ -26,7 +26,6 @@ import './config/ApiEndpoint.js';
 import { isConnectOnly } from './utils/hooks/authenticationHooks/helpers/isConnectOnly.js';
 import './context/EmailVerificationContext/EmailVerificationContext.js';
 import 'react-dom';
-import { isSameWalletName } from './utils/functions/isSameWalletName/isSameWalletName.js';
 import './context/ThemeContext/ThemeContext.js';
 import '@dynamic-labs/types';
 import 'yup';
@@ -80,7 +79,7 @@ const Main = () => {
             userWallets.length === 1) {
             yield handleLogOut();
         }
-        setShowAuthFlow(false);
+        setShowAuthFlow(false, { emitCancelAuth: true });
         setDeniedAddress('');
         setDeniedOauthProvider(undefined);
         setExistentAccountData(undefined);
@@ -150,9 +149,9 @@ const Main = () => {
         }
     });
     useEffect(() => {
-        const newToWeb3WalletName = LocalStorage.getFromLS(NEWTOWEB3_WALLET_EXTENSION_FLAG_KEY);
-        if ((walletConnectorOptions === null || walletConnectorOptions === void 0 ? void 0 : walletConnectorOptions.length) && newToWeb3WalletName) {
-            const wallet = walletConnectorOptions.find((wallet) => isSameWalletName(wallet.name, newToWeb3WalletName));
+        const newToWeb3WalletKey = LocalStorage.getFromLS(NEWTOWEB3_WALLET_EXTENSION_FLAG_KEY);
+        if ((walletConnectorOptions === null || walletConnectorOptions === void 0 ? void 0 : walletConnectorOptions.length) && newToWeb3WalletKey) {
+            const wallet = walletConnectorOptions.find((wallet) => wallet.key === newToWeb3WalletKey);
             if (wallet === null || wallet === void 0 ? void 0 : wallet.walletConnector) {
                 handleNewToWeb3WalletIntent(wallet.walletConnector);
             }

package/src/lib/components/Toggle/Toggle.cjs

@@ -0,0 +1,14 @@
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+var _tslib = require('../../../../_virtual/_tslib.cjs');
+var jsxRuntime = require('react/jsx-runtime');
+var classNames = require('../../utils/functions/classNames/classNames.cjs');
+
+const Toggle = (_a) => {
+    var { icon, variant = 'primary', className } = _a, props = _tslib.__rest(_a, ["icon", "variant", "className"]);
+    return (jsxRuntime.jsxs("label", { className: classNames.classNames('toggle', className), children: [jsxRuntime.jsx("input", Object.assign({ type: 'checkbox', className: 'toggle--input' }, props)), jsxRuntime.jsx("div", { className: classNames.classNames('toggle--content', `toggle--content__variant-${variant}`), children: jsxRuntime.jsx("div", { className: 'toggle--knob', children: icon }) })] }));
+};
+
+exports.Toggle = Toggle;

package/src/lib/components/Toggle/Toggle.d.ts

@@ -0,0 +1,7 @@
+import { ComponentPropsWithoutRef, FC } from 'react';
+type ToggleProps = ComponentPropsWithoutRef<'input'> & {
+    icon?: JSX.Element;
+    variant?: 'primary';
+};
+export declare const Toggle: FC<ToggleProps>;
+export {};

package/src/lib/components/Toggle/Toggle.js

@@ -0,0 +1,10 @@
+import { __rest } from '../../../../_virtual/_tslib.js';
+import { jsxs, jsx } from 'react/jsx-runtime';
+import { classNames } from '../../utils/functions/classNames/classNames.js';
+
+const Toggle = (_a) => {
+    var { icon, variant = 'primary', className } = _a, props = __rest(_a, ["icon", "variant", "className"]);
+    return (jsxs("label", { className: classNames('toggle', className), children: [jsx("input", Object.assign({ type: 'checkbox', className: 'toggle--input' }, props)), jsx("div", { className: classNames('toggle--content', `toggle--content__variant-${variant}`), children: jsx("div", { className: 'toggle--knob', children: icon }) })] }));
+};
+
+export { Toggle };

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

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

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

@@ -34,7 +34,6 @@ var AccountExistsContext = require('../AccountExistsContext/AccountExistsContext
 var api = require('../../data/api.cjs');
 var EmailVerificationContext = require('../EmailVerificationContext/EmailVerificationContext.cjs');
 require('react-dom');
-var isSameWalletName = require('../../utils/functions/isSameWalletName/isSameWalletName.cjs');
 var useFetchNonce = require('../../utils/hooks/useFetchNonce/useFetchNonce.cjs');
 var useFetchProjectSettings = require('../../utils/hooks/useFetchProjectSettings/useFetchProjectSettings.cjs');
 var ThemeContext = require('../ThemeContext/ThemeContext.cjs');
@@ -72,10 +71,10 @@ var useMultiWalletWidgetState = require('../../utils/hooks/multiWallet/useMultiW
 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 useProcessNetworkConfigurations = require('../../utils/hooks/useProcessNetworkConfigurations/useProcessNetworkConfigurations.cjs');
 var useFetchWalletsForChainsMap = require('../../utils/hooks/useFetchWalletsForChainsMap/useFetchWalletsForChainsMap.cjs');
 var useHandleUnlinkWallet = require('../../utils/hooks/useHandleUnlinkWallet/useHandleUnlinkWallet.cjs');
 var usePrimaryWalletId = require('../../utils/hooks/usePrimaryWalletId/usePrimaryWalletId.cjs');
+var useProcessNetworkConfigurations = require('../../utils/hooks/useProcessNetworkConfigurations/useProcessNetworkConfigurations.cjs');
 var useRpcProviders = require('../../utils/hooks/useRpcProviders/useRpcProviders.cjs');
 var useWalletEventListeners = require('../../utils/hooks/useWalletEventListeners/useWalletEventListeners.cjs');
 var DynamicBridgeWidgetContext = require('../../widgets/DynamicBridgeWidget/context/DynamicBridgeWidgetContext/DynamicBridgeWidgetContext.cjs');
@@ -94,24 +93,24 @@ require('../../widgets/DynamicWidget/views/ManagePasskeysWidgetView/PasskeyCard/
 require('../../views/WalletList/WalletList.cjs');
 require('../../views/viewToComponentMap.cjs');
 var FundingWidget = require('../../widgets/FundingWidget/FundingWidget.cjs');
+var ConnectWithEmailOtpProvider = require('../ConnectWithEmailOtpContext/ConnectWithEmailOtpProvider.cjs');
+require('../ConnectWithEmailOtpContext/connectWithEmailOtpContext.cjs');
 var FundingContext = require('../FundingContext/FundingContext.cjs');
 var SendBalanceContext = require('../SendBalanceContext/SendBalanceContext.cjs');
 var UseNetworkValidation = require('../UseNetworkValidation/UseNetworkValidation.cjs');
 var UserWalletsContext = require('../UserWalletsContext/UserWalletsContext.cjs');
 var WalletContext = require('../WalletContext/WalletContext.cjs');
-var ConnectWithEmailOtpProvider = require('../ConnectWithEmailOtpContext/ConnectWithEmailOtpProvider.cjs');
-require('../ConnectWithEmailOtpContext/connectWithEmailOtpContext.cjs');
 var handleDisconnectWallet = require('./handleDisconnectWallet/handleDisconnectWallet.cjs');
 var helpers = require('./helpers.cjs');
 var useDisplayOrderState = require('./hooks/useDisplayOrderState/useDisplayOrderState.cjs');
 var useEmailLoginState = require('./hooks/useEmailLoginState/useEmailLoginState.cjs');
 var useNameService = require('./hooks/useNameService/useNameService.cjs');
 var useSelectedWalletConnector = require('./hooks/useSelectedWalletConnector/useSelectedWalletConnector.cjs');
-var useSetShowAuthFlowWithInit = require('./hooks/useSetShowAuthFlowWithInit/useSetShowAuthFlowWithInit.cjs');
+var useShowAuthFlow = require('./hooks/useShowAuthFlow/useShowAuthFlow.cjs');
 var useShowPasskeyCreateSuccess = require('./hooks/useShowPasskeyCreateSuccess/useShowPasskeyCreateSuccess.cjs');
 var useTieCallbacksToEvents = require('./hooks/useTieCallbacksToEvents/useTieCallbacksToEvents.cjs');
 var useVerificationInProgress = require('./hooks/useVerificationInProgress/useVerificationInProgress.cjs');
-var useSetShowLinkNewWalletModalWithInit = require('./hooks/useSetShowLinkNewWalletModalWithInit/useSetShowLinkNewWalletModalWithInit.cjs');
+var useSetShowLinkNewWalletModal = require('./hooks/useSetShowLinkNewWalletModal/useSetShowLinkNewWalletModal.cjs');
 var useCustomerCallbacks = require('./useCustomerCallbacks/useCustomerCallbacks.cjs');
 var useCustomerAuthFlowCallbacks = require('./useCustomerCallbacks/useCustomerAuthFlowCallbacks.cjs');
 var validators = require('./validators.cjs');
@@ -121,7 +120,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, _g, _h;
+    var _a, _b, _c, _d, _e, _f;
     const { accessDeniedMessagePrimary, accessDeniedMessageSecondary, accessDeniedButton, apiBaseUrl, enableForcedNetworkValidation: enableForcedNetworkValidationProp = 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', notInTheListImageUrl, onboardingImageUrl, policiesConsentInnerComponent, customPrivacyPolicy, privacyPolicyUrl, signWithEmailWalletName, socialMediaLinkText, socialMediaIconUrl, socialMediaUrl, customTermsOfServices, termsOfServiceUrl, toolkitEnabled, siweStatement, shadowDOMEnabled = true, walletConnectors: walletConnectorsProp, socialProvidersFilter, showLockedWalletView = true, walletConnectPreferredChains, walletConnectorExtensions, } = settings;
     let enableForcedNetworkValidation = enableForcedNetworkValidationProp;
     if (bridgeChains) {
@@ -130,7 +129,8 @@ const InnerDynamicContextProvider = ({ children, theme, settings, locale: locale
     // Ties all client callbacks to dynamic's events, such that
     // when our events are triggered, so are the client callbacks
     useTieCallbacksToEvents.useTieCallbacksToEvents(eventsCallbacks);
-    let { walletConnectV1Bridge, appLogoUrl = 'https://demo.dynamic.xyz/assets/dynamic-logo.svg', appName = 'Dynamic Example', } = settings;
+    let { appLogoUrl = 'https://demo.dynamic.xyz/assets/dynamic-logo.svg', appName = 'Dynamic Example', } = settings;
+    const { walletConnectV1Bridge } = settings;
     if (!environmentId) {
         throw new utils.MissingEnvironmentIdError();
     }
@@ -145,7 +145,6 @@ const InnerDynamicContextProvider = ({ children, theme, settings, locale: locale
     const isAuthenticated = Boolean(getAuthToken.getAuthToken());
     const isBridgeFlow = Boolean(bridgeChains);
     const [onboardingOnlyJwt, setOnboardingOnlyJwt] = React.useState(undefined);
-    const [showAuthFlow, setShowAuthFlow] = React.useState(false);
     // state to track the full connectivity status of the individual's wallets.
     // Set to true once the predetermined number of wallets is connected.
     const [isFullyConnected, setIsFullyConnected, removeIsFullyConnected] = useLocalStorage.useLocalStorage(localStorage$1.IS_FULLY_CONNECTED, false);
@@ -170,14 +169,6 @@ const InnerDynamicContextProvider = ({ children, theme, settings, locale: locale
         multiWalletSettings: (_b = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk) === null || _b === void 0 ? void 0 : _b.multiWallet,
         toolkitEnabled: toolkitEnabled || false,
     });
-    // for demo proposes when running single wallet
-    // it should not use bridge even having walletConnectV1Bridge set on settings
-    // but v2 if enabled
-    if (toolkitEnabled &&
-        ((_d = (_c = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk) === null || _c === void 0 ? void 0 : _c.walletConnect) === null || _d === void 0 ? void 0 : _d.v2Enabled) &&
-        !multiWallet) {
-        walletConnectV1Bridge = undefined;
-    }
     // 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);
     // Used inside useVerifyOnAwaitingSignature. Is legacy and should be removed asap
@@ -217,6 +208,14 @@ const InnerDynamicContextProvider = ({ children, theme, settings, locale: locale
     });
     const [authMode, setAuthMode] = useLocalStorage.useLocalStorage(localStorage$1.AUTH_MODE, initialAuthenticationMode);
     const { clearPrimaryWalletId, primaryWalletId, setPrimaryWalletId } = usePrimaryWalletId.usePrimaryWalletId();
+    const isUserAuthenticated = Boolean(authMode === 'connect-and-sign' ? user : isFullyConnected);
+    const isRenderingEmbeddedAuthFlow = React.useRef(false);
+    const [showAuthFlow, setShowAuthFlow] = useShowAuthFlow.useShowAuthFlow({
+        isAuthenticated: isUserAuthenticated,
+        isMultiWalletEnabled: multiWallet,
+        isRenderingEmbeddedAuthFlow,
+        walletConnectorOptions,
+    });
     const { connectWallet, removeConnectedWalletsInfo, connectedWalletsInfo, getConnectedWalletById, connectedWallets, disconnectWallet, refreshConnectedWallet, } = useConnectWallet.useConnectWallet({
         authMode,
         clearPrimaryWalletId,
@@ -248,7 +247,7 @@ const InnerDynamicContextProvider = ({ children, theme, settings, locale: locale
         removeUser();
     }, [removeUser]);
     // until user completes onboarding, jwt is only stored in onboardingOnlyJwt
-    const authToken = (_e = getAuthToken.getAuthToken()) !== null && _e !== void 0 ? _e : onboardingOnlyJwt;
+    const authToken = (_c = getAuthToken.getAuthToken()) !== null && _c !== void 0 ? _c : onboardingOnlyJwt;
     useSetWalletConnectorVerifiedCredentials.useSetWalletConnectorVerifiedCredentials(authToken, walletConnectorOptions);
     const { didConnectedStateLoad, primaryWallet, showQrcodeModal, secondaryWallets, setPrimaryWallet, setShowQrcodeModal, wallets: linkedOrConnectedWallets, } = useWalletConnectors.useWalletConnectors({
         authMode,
@@ -275,21 +274,10 @@ const InnerDynamicContextProvider = ({ children, theme, settings, locale: locale
         user,
         walletBook: walletBook$1,
     });
-    const isRenderingEmbeddedAuthFlow = React.useRef(false);
-    const isUserAuthenticated = Boolean(authMode === 'connect-and-sign' ? user : isFullyConnected);
-    const setShowAuthFlowWithInit = useSetShowAuthFlowWithInit.useSetShowAuthFlowWithInit({
+    const setShowLinkNewWalletModal = useSetShowLinkNewWalletModal.useSetShowLinkNewWalletModal({
         isAuthenticated: isUserAuthenticated,
         isMultiWalletEnabled: multiWallet,
-        isRenderingEmbeddedAuthFlow,
         setShowAuthFlow,
-        walletConnectorOptions,
-    });
-    const setShowLinkNewWalletModalWithInit = useSetShowLinkNewWalletModalWithInit.useSetShowLinkNewWalletModalWithInit({
-        isAuthenticated: isUserAuthenticated,
-        isMultiWalletEnabled: multiWallet,
-        isRenderingEmbeddedAuthFlow,
-        setShowAuthFlow,
-        walletConnectorOptions,
     });
     const { getNameService, removeConnectedNameService } = useNameService.useNameService({
         authToken,
@@ -302,7 +290,7 @@ const InnerDynamicContextProvider = ({ children, theme, settings, locale: locale
         clearOphanedWalletConnectSessions,
     ]);
     const handleLogOut = React.useCallback(() => _tslib.__awaiter(void 0, void 0, void 0, function* () {
-        var _j, _k;
+        var _g, _h;
         setSdkHasLoaded(false);
         clearAllWalletConnectSessions();
         setBridgeChainsToConnect(bridgeChains);
@@ -328,7 +316,12 @@ const InnerDynamicContextProvider = ({ children, theme, settings, locale: locale
             setIsVerificationInProgress(false);
         setLegacyIsVerifying(false);
         setAuthMode(initialAuthenticationMode);
-        setShowAuthFlow(false);
+        setShowAuthFlow(false, {
+            emitCancelAuth: false,
+            ignoreIfIsEmbeddedWidget: false,
+            initializeWalletConnect: false,
+            performMultiWalletChecks: false,
+        });
         setMultiWalletWidgetState('idle');
         removeAuthTokenAndUser();
         removeLsSettings();
@@ -339,12 +332,12 @@ const InnerDynamicContextProvider = ({ children, theme, settings, locale: locale
         clearPrimaryWalletId();
         removeConnectedNameService();
         for (const connectedWallet of connectedWallets) {
-            (_j = eventsCallbacks === null || eventsCallbacks === void 0 ? void 0 : eventsCallbacks.onDisconnect) === null || _j === void 0 ? void 0 : _j.call(eventsCallbacks, {
+            (_g = eventsCallbacks === null || eventsCallbacks === void 0 ? void 0 : eventsCallbacks.onDisconnect) === null || _g === void 0 ? void 0 : _g.call(eventsCallbacks, {
                 wallet: connectedWallet,
                 walletConnector: connectedWallet === null || connectedWallet === void 0 ? void 0 : connectedWallet.connector,
             });
         }
-        (_k = eventsCallbacks === null || eventsCallbacks === void 0 ? void 0 : eventsCallbacks.onLogout) === null || _k === void 0 ? void 0 : _k.call(eventsCallbacks, user);
+        (_h = eventsCallbacks === null || eventsCallbacks === void 0 ? void 0 : eventsCallbacks.onLogout) === null || _h === void 0 ? void 0 : _h.call(eventsCallbacks, user);
         dynamicEvents.dynamicEvents.emit('logout');
     }), [
         setSdkHasLoaded,
@@ -356,6 +349,7 @@ const InnerDynamicContextProvider = ({ children, theme, settings, locale: locale
         setIsVerificationInProgress,
         setAuthMode,
         initialAuthenticationMode,
+        setShowAuthFlow,
         setMultiWalletWidgetState,
         removeAuthTokenAndUser,
         removeLsSettings,
@@ -373,7 +367,7 @@ const InnerDynamicContextProvider = ({ children, theme, settings, locale: locale
     let wcVersion;
     if (projectSettings) {
         wcVersion =
-            ((_g = (_f = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk) === null || _f === void 0 ? void 0 : _f.walletConnect) === null || _g === void 0 ? void 0 : _g.v2Enabled) && !walletConnectV1Bridge
+            ((_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
                 ? 2
                 : 1;
     }
@@ -461,7 +455,7 @@ const InnerDynamicContextProvider = ({ children, theme, settings, locale: locale
         }
         if (selectedWalletConnector &&
             (!primaryWallet ||
-                !isSameWalletName.isSameWalletName(primaryWallet.connector.name, selectedWalletConnector.name))) {
+                primaryWallet.connector.key !== selectedWalletConnector.key)) {
             yield (selectedWalletConnector === null || selectedWalletConnector === void 0 ? void 0 : selectedWalletConnector.endSession());
         }
     }), [
@@ -512,7 +506,6 @@ const InnerDynamicContextProvider = ({ children, theme, settings, locale: locale
             handleLogOut,
             handleUnlinkWallet: authMode === 'connect-only' ? disconnectWallet : handleUnlinkWallet,
             i18nSDKInstance,
-            internalSetShowAuthFlow: setShowAuthFlow,
             isAuthenticated,
             isBridgeFlow,
             isFullyConnected,
@@ -568,10 +561,10 @@ const InnerDynamicContextProvider = ({ children, theme, settings, locale: locale
             setSdkHasLoaded,
             setSelectedWalletConnectorKey,
             setSelectedWalletWithAction,
-            setShowAuthFlow: setShowAuthFlowWithInit,
+            setShowAuthFlow,
             setShowBridgeWidget,
             setShowDynamicUserProfile,
-            setShowLinkNewWalletModal: setShowLinkNewWalletModalWithInit,
+            setShowLinkNewWalletModal,
             setShowPasskeyCreatedSuccess,
             setShowQrcodeModal,
             setShowWidgetStatePopup,
@@ -677,8 +670,8 @@ const InnerDynamicContextProvider = ({ children, theme, settings, locale: locale
         setPrimaryWalletId,
         setSdkHasLoaded,
         setSelectedWalletConnectorKey,
-        setShowAuthFlowWithInit,
-        setShowLinkNewWalletModalWithInit,
+        setShowAuthFlow,
+        setShowLinkNewWalletModal,
         setShowPasskeyCreatedSuccess,
         setShowQrcodeModal,
         setUser,
@@ -739,7 +732,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, ((_h = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.design) === null || _h === void 0 ? void 0 : _h.modal) || undefined), designSettings: projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.design, children: jsxRuntime.jsx(LoadingContext.LoadingContextProvider, { children: jsxRuntime.jsx(ErrorContext.ErrorContextProvider, { 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, ((_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.jsx(ErrorContext.ErrorContextProvider, { children: jsxRuntime.jsxs(ViewContext.ViewContextProvider, { initialView: helpers.getInitialView({
                                     connectedWallets,
                                     isAuthenticated,
                                     isBridgeFlow,