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

package/src/lib/views/BridgeNextWalletConnectionView/BridgeNextWalletConnectionView.js

@@ -28,7 +28,7 @@ const BridgeNextWalletConnectionView = () => {
     if (!chainInfo) {
         throw new DynamicError('No chain info found for chain', chain);
     }
-    return (jsx(BridgeNextWalletToConnectLayout, { chainName: chainInfo.blockchainName, chainIcon: jsx(ChainIcon, {}), onClickAction: () => setView('wallet-list'), onClickClose: () => setShowAuthFlow(false) }));
+    return (jsx(BridgeNextWalletToConnectLayout, { chainName: chainInfo.blockchainName, chainIcon: jsx(ChainIcon, {}), onClickAction: () => setView('wallet-list'), onClickClose: () => setShowAuthFlow(false, { emitCancelAuth: true }) }));
 };
 
 export { BridgeNextWalletConnectionView };

package/src/lib/views/BridgeSummaryView/BridgeSummaryView.cjs

@@ -27,7 +27,7 @@ var Balance = require('../../widgets/DynamicWidget/components/Balance/Balance.cj
 const BridgeSummaryView = () => {
     const { primaryWallet, setShowAuthFlow, appName, bridgeChains = [], } = useInternalDynamicContext.useInternalDynamicContext();
     const { t } = reactI18next.useTranslation();
-    const onClickClose = () => setShowAuthFlow(false);
+    const onClickClose = () => setShowAuthFlow(false, { emitCancelAuth: true });
     const body = React.useMemo(() => {
         const blockchainNames = bridgeChains.map(({ chain }) => { var _a; return (_a = walletConnectorCore.getChainInfo(chain)) === null || _a === void 0 ? void 0 : _a.blockchainName; });
         const [firstBlockchainName, secondBlockchainName] = blockchainNames;

package/src/lib/views/BridgeSummaryView/BridgeSummaryView.js

@@ -23,7 +23,7 @@ import { Balance } from '../../widgets/DynamicWidget/components/Balance/Balance.
 const BridgeSummaryView = () => {
     const { primaryWallet, setShowAuthFlow, appName, bridgeChains = [], } = useInternalDynamicContext();
     const { t } = useTranslation();
-    const onClickClose = () => setShowAuthFlow(false);
+    const onClickClose = () => setShowAuthFlow(false, { emitCancelAuth: true });
     const body = useMemo(() => {
         const blockchainNames = bridgeChains.map(({ chain }) => { var _a; return (_a = getChainInfo(chain)) === null || _a === void 0 ? void 0 : _a.blockchainName; });
         const [firstBlockchainName, secondBlockchainName] = blockchainNames;

package/src/lib/views/BridgeWelcomeView/BridgeWelcomeView.cjs

@@ -47,7 +47,7 @@ const BridgeWelcomeView = () => {
         return undefined;
     })
         .filter(isChainInfoDefined), [bridgeChains]);
-    return (jsxRuntime.jsx(BridgeWelcomeLayout.BridgeWelcomeLayout, { onClickClose: () => setShowAuthFlow(false), title: t('dyn_bridge.welcome_view.title', { appName }), copykey: 'dyn_bridge.welcome_view.title', body: body, chains: chains, actionButtonText: t('dyn_bridge.welcome_view.button'), onClickAction: () => setView('wallet-list') }));
+    return (jsxRuntime.jsx(BridgeWelcomeLayout.BridgeWelcomeLayout, { onClickClose: () => setShowAuthFlow(false, { emitCancelAuth: true }), title: t('dyn_bridge.welcome_view.title', { appName }), copykey: 'dyn_bridge.welcome_view.title', body: body, chains: chains, actionButtonText: t('dyn_bridge.welcome_view.button'), onClickAction: () => setView('wallet-list') }));
 };
 
 exports.BridgeWelcomeView = BridgeWelcomeView;

package/src/lib/views/BridgeWelcomeView/BridgeWelcomeView.js

@@ -43,7 +43,7 @@ const BridgeWelcomeView = () => {
         return undefined;
     })
         .filter(isChainInfoDefined), [bridgeChains]);
-    return (jsx(BridgeWelcomeLayout, { onClickClose: () => setShowAuthFlow(false), title: t('dyn_bridge.welcome_view.title', { appName }), copykey: 'dyn_bridge.welcome_view.title', body: body, chains: chains, actionButtonText: t('dyn_bridge.welcome_view.button'), onClickAction: () => setView('wallet-list') }));
+    return (jsx(BridgeWelcomeLayout, { onClickClose: () => setShowAuthFlow(false, { emitCancelAuth: true }), title: t('dyn_bridge.welcome_view.title', { appName }), copykey: 'dyn_bridge.welcome_view.title', body: body, chains: chains, actionButtonText: t('dyn_bridge.welcome_view.button'), onClickAction: () => setView('wallet-list') }));
 };
 
 export { BridgeWelcomeView };

package/src/lib/views/EmailVerification/EmailVerification.cjs

@@ -151,7 +151,7 @@ const EmailVerification = () => {
                     yield createEmbeddedWallet();
                 }
                 catch (e) {
-                    setShowAuthFlow(false);
+                    setShowAuthFlow(false, { emitCancelAuth: true });
                 }
                 return;
             }

package/src/lib/views/EmailVerification/EmailVerification.js

@@ -147,7 +147,7 @@ const EmailVerification = () => {
                     yield createEmbeddedWallet();
                 }
                 catch (e) {
-                    setShowAuthFlow(false);
+                    setShowAuthFlow(false, { emitCancelAuth: true });
                 }
                 return;
             }

package/src/lib/views/EmbeddedReveal/EmbeddedRevealView/EmbeddedRevealView.cjs

@@ -140,7 +140,7 @@ const EmbeddedRevealView = () => {
                 : 'height: 100px');
         }
     }, [iframeContainerRef, data, isTurnkeyHDWallet, exportPrivateKey]);
-    const closeButton = (jsxRuntime.jsx(IconButton.IconButton, { onClick: () => setShowAuthFlow(false), type: 'button', children: jsxRuntime.jsx(close.ReactComponent, {}) }));
+    const closeButton = (jsxRuntime.jsx(IconButton.IconButton, { onClick: () => setShowAuthFlow(false, { emitCancelAuth: true }), type: 'button', children: jsxRuntime.jsx(close.ReactComponent, {}) }));
     const hasInjectedCredential = !isLoading && data && !error;
     const credentialTitle = !isTurnkeyHDWallet || exportPrivateKey
         ? t('dyn_embedded_reveal.private_key_title')

package/src/lib/views/EmbeddedReveal/EmbeddedRevealView/EmbeddedRevealView.js

@@ -136,7 +136,7 @@ const EmbeddedRevealView = () => {
                 : 'height: 100px');
         }
     }, [iframeContainerRef, data, isTurnkeyHDWallet, exportPrivateKey]);
-    const closeButton = (jsx(IconButton, { onClick: () => setShowAuthFlow(false), type: 'button', children: jsx(SvgClose, {}) }));
+    const closeButton = (jsx(IconButton, { onClick: () => setShowAuthFlow(false, { emitCancelAuth: true }), type: 'button', children: jsx(SvgClose, {}) }));
     const hasInjectedCredential = !isLoading && data && !error;
     const credentialTitle = !isTurnkeyHDWallet || exportPrivateKey
         ? t('dyn_embedded_reveal.private_key_title')

package/src/lib/views/MergeUserAccountsView/MergeUserAccountsView.cjs

@@ -102,7 +102,7 @@ const MergeUserAccountsView = () => {
         catch (e) {
             setError(t('dyn_merge_user_accounts.errors.merge_error'));
             if (user) {
-                setShowAuthFlow(false);
+                setShowAuthFlow(false, { emitCancelAuth: true });
                 return;
             }
             goToInitialView();

package/src/lib/views/MergeUserAccountsView/MergeUserAccountsView.js

@@ -98,7 +98,7 @@ const MergeUserAccountsView = () => {
         catch (e) {
             setError(t('dyn_merge_user_accounts.errors.merge_error'));
             if (user) {
-                setShowAuthFlow(false);
+                setShowAuthFlow(false, { emitCancelAuth: true });
                 return;
             }
             goToInitialView();

package/src/lib/views/Passkey/PasskeyRecovery/InitRecovery/PasskeyInitRecovery.cjs

@@ -113,7 +113,7 @@ const PasskeyInitRecovery = () => {
     const translationKey = isTurnkeyWalletWithoutAuthenticator
         ? 'dyn_passkey_secure_modal'
         : 'dyn_passkey_recovery';
-    const closeButton = (jsxRuntime.jsx(IconButton.IconButton, { type: 'button', onClick: () => setShowAuthFlow(false), "data-testid": 'close-button', children: jsxRuntime.jsx(close.ReactComponent, {}) }));
+    const closeButton = (jsxRuntime.jsx(IconButton.IconButton, { type: 'button', onClick: () => setShowAuthFlow(false, { emitCancelAuth: true }), "data-testid": 'close-button', children: jsxRuntime.jsx(close.ReactComponent, {}) }));
     return (jsxRuntime.jsxs(jsxRuntime.Fragment, { children: [jsxRuntime.jsx(ModalHeader.ModalHeader, { trailing: closeButton, children: jsxRuntime.jsx(Typography.Typography, { as: 'h1', variant: 'title', color: 'primary', "data-testid": 'dynamic-auth-modal-heading', className: 'header__typography', children: t(`${translationKey}.start.title`) }) }), jsxRuntime.jsxs("div", { className: 'passkey-recovery-view', children: [jsxRuntime.jsx(IconWithSpinner.IconWithSpinner, { Icon: EmailIcon, isSpinning: isLoading, iconSize: 96 }), jsxRuntime.jsx(Typography.Typography, { variant: 'body_normal', weight: 'regular', color: 'secondary', className: 'passkey-recovery-view__subtitle', children: t(`${translationKey}.start.description`) }), errorText && jsxRuntime.jsx(ErrorContainer.ErrorContainer, { children: errorText }), jsxRuntime.jsx("div", { className: 'passkey-recovery-view__actions', children: jsxRuntime.jsx(Button.Button, { buttonPadding: 'large', dataTestId: 'passkey-recovery-button', onClick: () => initRecovery(), disabled: isLoading, showInternalLoading: false, children: jsxRuntime.jsx("div", { children: jsxRuntime.jsx(Typography.Typography, { children: t(`${translationKey}.start.start_button`) }) }) }) }), jsxRuntime.jsx(NeedHelpSection.NeedHelpSection, {})] })] }));
 };
 

package/src/lib/views/Passkey/PasskeyRecovery/InitRecovery/PasskeyInitRecovery.js

@@ -109,7 +109,7 @@ const PasskeyInitRecovery = () => {
     const translationKey = isTurnkeyWalletWithoutAuthenticator
         ? 'dyn_passkey_secure_modal'
         : 'dyn_passkey_recovery';
-    const closeButton = (jsx(IconButton, { type: 'button', onClick: () => setShowAuthFlow(false), "data-testid": 'close-button', children: jsx(SvgClose, {}) }));
+    const closeButton = (jsx(IconButton, { type: 'button', onClick: () => setShowAuthFlow(false, { emitCancelAuth: true }), "data-testid": 'close-button', children: jsx(SvgClose, {}) }));
     return (jsxs(Fragment, { children: [jsx(ModalHeader, { trailing: closeButton, children: jsx(Typography, { as: 'h1', variant: 'title', color: 'primary', "data-testid": 'dynamic-auth-modal-heading', className: 'header__typography', children: t(`${translationKey}.start.title`) }) }), jsxs("div", { className: 'passkey-recovery-view', children: [jsx(IconWithSpinner, { Icon: EmailIcon, isSpinning: isLoading, iconSize: 96 }), jsx(Typography, { variant: 'body_normal', weight: 'regular', color: 'secondary', className: 'passkey-recovery-view__subtitle', children: t(`${translationKey}.start.description`) }), errorText && jsx(ErrorContainer, { children: errorText }), jsx("div", { className: 'passkey-recovery-view__actions', children: jsx(Button, { buttonPadding: 'large', dataTestId: 'passkey-recovery-button', onClick: () => initRecovery(), disabled: isLoading, showInternalLoading: false, children: jsx("div", { children: jsx(Typography, { children: t(`${translationKey}.start.start_button`) }) }) }) }), jsx(NeedHelpSection, {})] })] }));
 };
 

package/src/lib/views/QrCodeView/QRCode.cjs

@@ -5,12 +5,12 @@ Object.defineProperty(exports, '__esModule', { value: true });
 var jsxRuntime = require('react/jsx-runtime');
 var React = require('react');
 var QRCodeUtil = require('qrcode');
-var walletConnectorCore = require('@dynamic-labs/wallet-connector-core');
 var IconWithSpinner = require('../../components/IconWithSpinner/IconWithSpinner.cjs');
 var QrCodeContext = require('../../context/QrCodeContext/QrCodeContext.cjs');
 require('../../events/dynamicEvents.cjs');
 require('@dynamic-labs/utils');
 require('../../context/DynamicContext/DynamicContext.cjs');
+require('@dynamic-labs/wallet-connector-core');
 require('../../context/CaptchaContext/CaptchaContext.cjs');
 require('../../context/ErrorContext/ErrorContext.cjs');
 require('../../context/ViewContext/ViewContext.cjs');
@@ -117,8 +117,7 @@ const QRCode = ({ ecl = 'M', Icon, logoMargin = 0, logoSize = 40, size = 250, va
     }, [ecl, logoSize, size, value, accentColor]);
     const logoPosition = size / 2 - logoSize / 2 - logoMargin;
     const walletsWithoutIndicator = ['coinbase', 'walletconnect'];
-    const indicator = !walletKey ||
-        walletsWithoutIndicator.includes(walletConnectorCore.normalizeWalletName(walletKey))
+    const indicator = !walletKey || walletsWithoutIndicator.includes(walletKey)
         ? undefined
         : 'walletConnect';
     return (jsxRuntime.jsx("div", { className: 'qrcode__container', children: jsxRuntime.jsx("div", { className: 'qrcode', children: showQrCodeImage ? (jsxRuntime.jsx("img", { src: data, alt: '' })) : (jsxRuntime.jsxs(jsxRuntime.Fragment, { children: [jsxRuntime.jsxs("svg", { height: '100%', width: '100%', viewBox: `0 0 ${size} ${size}`, "data-testid": 'qr-code', children: [jsxRuntime.jsx("defs", { children: jsxRuntime.jsx("clipPath", { id: 'clip-logo', children: jsxRuntime.jsx("rect", { height: logoSize, width: logoSize, x: logoPosition, y: logoPosition, rx: 7, ry: 7 }) }) }), jsxRuntime.jsx("rect", { fill: 'none', height: size, width: size }), dots] }), jsxRuntime.jsx(IconWithSpinner.IconWithSpinner, { Icon: Icon, iconSize: logoSize, isSpinning: true, className: 'qrcode__icon', indicator: indicator })] })) }) }));

package/src/lib/views/QrCodeView/QRCode.js

@@ -1,12 +1,12 @@
 import { jsx, jsxs, Fragment } from 'react/jsx-runtime';
 import { useMemo } from 'react';
 import QRCodeUtil from 'qrcode';
-import { normalizeWalletName } from '@dynamic-labs/wallet-connector-core';
 import { IconWithSpinner } from '../../components/IconWithSpinner/IconWithSpinner.js';
 import { useQrCodeContext } from '../../context/QrCodeContext/QrCodeContext.js';
 import '../../events/dynamicEvents.js';
 import '@dynamic-labs/utils';
 import '../../context/DynamicContext/DynamicContext.js';
+import '@dynamic-labs/wallet-connector-core';
 import '../../context/CaptchaContext/CaptchaContext.js';
 import '../../context/ErrorContext/ErrorContext.js';
 import '../../context/ViewContext/ViewContext.js';
@@ -109,8 +109,7 @@ const QRCode = ({ ecl = 'M', Icon, logoMargin = 0, logoSize = 40, size = 250, va
     }, [ecl, logoSize, size, value, accentColor]);
     const logoPosition = size / 2 - logoSize / 2 - logoMargin;
     const walletsWithoutIndicator = ['coinbase', 'walletconnect'];
-    const indicator = !walletKey ||
-        walletsWithoutIndicator.includes(normalizeWalletName(walletKey))
+    const indicator = !walletKey || walletsWithoutIndicator.includes(walletKey)
         ? undefined
         : 'walletConnect';
     return (jsx("div", { className: 'qrcode__container', children: jsx("div", { className: 'qrcode', children: showQrCodeImage ? (jsx("img", { src: data, alt: '' })) : (jsxs(Fragment, { children: [jsxs("svg", { height: '100%', width: '100%', viewBox: `0 0 ${size} ${size}`, "data-testid": 'qr-code', children: [jsx("defs", { children: jsx("clipPath", { id: 'clip-logo', children: jsx("rect", { height: logoSize, width: logoSize, x: logoPosition, y: logoPosition, rx: 7, ry: 7 }) }) }), jsx("rect", { fill: 'none', height: size, width: size }), dots] }), jsx(IconWithSpinner, { Icon: Icon, iconSize: logoSize, isSpinning: true, className: 'qrcode__icon', indicator: indicator })] })) }) }));

package/src/lib/views/WalletGroupView/WalletGroupView.cjs

@@ -79,7 +79,9 @@ const WalletGroupView = () => {
     const hardwareWallet = selectedWalletGroup.groupedWallets.find(isHardwareWallet);
     const isHardwareWalletPresent = Boolean(hardwareWallet);
     return (jsxRuntime.jsx(SelectWalletChainLayout.SelectWalletChainLayout, { HeaderIcon: jsxRuntime.jsx(walletBook.WalletIcon, { walletKey: (_a = walletBookData.brand) === null || _a === void 0 ? void 0 : _a.spriteId }), children: jsxRuntime.jsxs("div", { className: 'wallet-group__list', children: [isHardwareWalletPresent && (jsxRuntime.jsxs(jsxRuntime.Fragment, { children: [jsxRuntime.jsx(HardwareWalletToggle.HardwareWalletToggle, { checked: isHardwareWalletEnabled, onChecked: setIsHardwareWalletEnabled }), jsxRuntime.jsx(Divider.Divider, {})] })), jsxRuntime.jsx("div", { className: 'select-wallet-chain-layout__list', children: wallets.map((wallet, index) => (jsxRuntime.jsx(WalletGroupItem.WalletGroupItem, { wallet: wallet, onClick: () => {
-                            if (isHardwareWalletEnabled && hardwareWallet) {
+                            if (isHardwareWalletEnabled &&
+                                hardwareWallet &&
+                                wallet.key === 'phantom') {
                                 handleWalletItemClick(hardwareWallet);
                                 return;
                             }

package/src/lib/views/WalletGroupView/WalletGroupView.js

@@ -75,7 +75,9 @@ const WalletGroupView = () => {
     const hardwareWallet = selectedWalletGroup.groupedWallets.find(isHardwareWallet);
     const isHardwareWalletPresent = Boolean(hardwareWallet);
     return (jsx(SelectWalletChainLayout, { HeaderIcon: jsx(WalletIcon, { walletKey: (_a = walletBookData.brand) === null || _a === void 0 ? void 0 : _a.spriteId }), children: jsxs("div", { className: 'wallet-group__list', children: [isHardwareWalletPresent && (jsxs(Fragment, { children: [jsx(HardwareWalletToggle, { checked: isHardwareWalletEnabled, onChecked: setIsHardwareWalletEnabled }), jsx(Divider, {})] })), jsx("div", { className: 'select-wallet-chain-layout__list', children: wallets.map((wallet, index) => (jsx(WalletGroupItem, { wallet: wallet, onClick: () => {
-                            if (isHardwareWalletEnabled && hardwareWallet) {
+                            if (isHardwareWalletEnabled &&
+                                hardwareWallet &&
+                                wallet.key === 'phantom') {
                                 handleWalletItemClick(hardwareWallet);
                                 return;
                             }

package/src/lib/views/WalletGroupView/components/HardwareWalletToggle/HardwareWalletToggle.cjs

@@ -15,7 +15,7 @@ require('../../../../context/ViewContext/ViewContext.cjs');
 require('@dynamic-labs/sdk-api');
 require('../../../../shared/logger.cjs');
 require('@dynamic-labs/iconic');
-var footerInfoIcon = require('../../../../shared/assets/footer-info-icon.cjs');
+var check = require('../../../../shared/assets/check.cjs');
 require('@dynamic-labs/wallet-book');
 require('../../../../utils/constants/colors.cjs');
 require('../../../../shared/utils/classes/storage/localStorage.cjs');
@@ -42,31 +42,33 @@ require('../../../../components/ShadowDOM/ShadowDOM.cjs');
 require('../../../../components/OverlayCard/OverlayCard.context.cjs');
 require('../../../../context/FooterAnimationContext/index.cjs');
 require('../../../../context/QrCodeContext/QrCodeContext.cjs');
-var Tooltip = require('../../../../components/Tooltip/Tooltip.cjs');
 require('../../../../context/WalletGroupContext/WalletGroupContext.cjs');
 require('../../../../widgets/DynamicWidget/components/DynamicWidgetHeader/DynamicWidgetHeader.cjs');
 require('react-focus-lock');
 require('../../../../context/LoadingContext/LoadingContext.cjs');
 require('qrcode');
+var Icon = require('../../../../components/Icon/Icon.cjs');
 require('i18next');
 require('../../../../widgets/DynamicWidget/context/DynamicWidgetContext.cjs');
 require('../../../../components/UserProfile/parts/UserProfileField/components/VerifiedEmailIcon/VerifiedEmailIcon.cjs');
 require('formik');
-var IconButton = require('../../../../components/IconButton/IconButton.cjs');
+require('../../../../components/IconButton/IconButton.cjs');
 require('../../../../components/Alert/Alert.cjs');
 require('@dynamic-labs/viem-utils');
 require('../../../../widgets/DynamicWidget/views/ManagePasskeysWidgetView/PasskeyCard/PasskeyCard.cjs');
-var Checkbox = require('../../../../components/Checkbox/Checkbox.cjs');
 var ListTile = require('../../../../components/ListTile/ListTile.cjs');
 require('../../../../components/InlineWidget/InlineWidget.cjs');
 require('../../../../components/MenuList/Dropdown/Dropdown.cjs');
 require('../../../../components/Popper/Popper/Popper.cjs');
 require('../../../../components/Popper/PopperContext/PopperContext.cjs');
+var Toggle = require('../../../../components/Toggle/Toggle.cjs');
 
 const HardwareWalletToggle = ({ checked, onChecked, }) => {
     const { t } = reactI18next.useTranslation();
-    const hardwareWalletToggleTooltip = (jsxRuntime.jsx(Tooltip.Tooltip, { content: t('dyn_select_chain.using_hardware_wallet_toggle_info'), className: 'header__tooltip', children: jsxRuntime.jsx(IconButton.IconButton, { type: 'button', "data-testid": 'info-button', className: 'header__icon', copykey: 'dyn_select_chain.using_hardware_wallet_toggle_info', children: jsxRuntime.jsx(footerInfoIcon.ReactComponent, {}) }) }));
-    return (jsxRuntime.jsx(ListTile.ListTile, { onClick: () => onChecked(!checked), trailing: hardwareWalletToggleTooltip, children: jsxRuntime.jsxs("div", { className: 'wallet-group__list__item__content', copykey: 'dyn_select_chain.using_hardware_wallet_toggle_label', children: [t('dyn_select_chain.using_hardware_wallet_toggle_label'), jsxRuntime.jsx(Checkbox.Checkbox, { checked: checked })] }) }));
+    const toggle = (jsxRuntime.jsx(Toggle.Toggle, { checked: checked, onChange: () => onChecked(!checked), "data-testid": 'hardware-wallet-toggle', icon: 
+        // eslint-disable-next-line react/jsx-wrap-multilines
+        jsxRuntime.jsx(Icon.Icon, { size: 'small', children: jsxRuntime.jsx(check.ReactComponent, {}) }) }));
+    return (jsxRuntime.jsx(ListTile.ListTile, { disabled: true, trailing: toggle, children: jsxRuntime.jsx("span", { copykey: 'dyn_select_chain.using_hardware_wallet_toggle_label', children: t('dyn_select_chain.using_hardware_wallet_toggle_label') }) }));
 };
 
 exports.HardwareWalletToggle = HardwareWalletToggle;

package/src/lib/views/WalletGroupView/components/HardwareWalletToggle/HardwareWalletToggle.js

@@ -1,4 +1,4 @@
-import { jsx, jsxs } from 'react/jsx-runtime';
+import { jsx } from 'react/jsx-runtime';
 import { useTranslation } from 'react-i18next';
 import 'react';
 import '../../../../events/dynamicEvents.js';
@@ -11,7 +11,7 @@ import '../../../../context/ViewContext/ViewContext.js';
 import '@dynamic-labs/sdk-api';
 import '../../../../shared/logger.js';
 import '@dynamic-labs/iconic';
-import { ReactComponent as SvgFooterInfoIcon } from '../../../../shared/assets/footer-info-icon.js';
+import { ReactComponent as SvgCheck } from '../../../../shared/assets/check.js';
 import '@dynamic-labs/wallet-book';
 import '../../../../utils/constants/colors.js';
 import '../../../../shared/utils/classes/storage/localStorage.js';
@@ -38,31 +38,33 @@ import '../../../../components/ShadowDOM/ShadowDOM.js';
 import '../../../../components/OverlayCard/OverlayCard.context.js';
 import '../../../../context/FooterAnimationContext/index.js';
 import '../../../../context/QrCodeContext/QrCodeContext.js';
-import { Tooltip } from '../../../../components/Tooltip/Tooltip.js';
 import '../../../../context/WalletGroupContext/WalletGroupContext.js';
 import '../../../../widgets/DynamicWidget/components/DynamicWidgetHeader/DynamicWidgetHeader.js';
 import 'react-focus-lock';
 import '../../../../context/LoadingContext/LoadingContext.js';
 import 'qrcode';
+import { Icon } from '../../../../components/Icon/Icon.js';
 import 'i18next';
 import '../../../../widgets/DynamicWidget/context/DynamicWidgetContext.js';
 import '../../../../components/UserProfile/parts/UserProfileField/components/VerifiedEmailIcon/VerifiedEmailIcon.js';
 import 'formik';
-import { IconButton } from '../../../../components/IconButton/IconButton.js';
+import '../../../../components/IconButton/IconButton.js';
 import '../../../../components/Alert/Alert.js';
 import '@dynamic-labs/viem-utils';
 import '../../../../widgets/DynamicWidget/views/ManagePasskeysWidgetView/PasskeyCard/PasskeyCard.js';
-import { Checkbox } from '../../../../components/Checkbox/Checkbox.js';
 import { ListTile } from '../../../../components/ListTile/ListTile.js';
 import '../../../../components/InlineWidget/InlineWidget.js';
 import '../../../../components/MenuList/Dropdown/Dropdown.js';
 import '../../../../components/Popper/Popper/Popper.js';
 import '../../../../components/Popper/PopperContext/PopperContext.js';
+import { Toggle } from '../../../../components/Toggle/Toggle.js';
 
 const HardwareWalletToggle = ({ checked, onChecked, }) => {
     const { t } = useTranslation();
-    const hardwareWalletToggleTooltip = (jsx(Tooltip, { content: t('dyn_select_chain.using_hardware_wallet_toggle_info'), className: 'header__tooltip', children: jsx(IconButton, { type: 'button', "data-testid": 'info-button', className: 'header__icon', copykey: 'dyn_select_chain.using_hardware_wallet_toggle_info', children: jsx(SvgFooterInfoIcon, {}) }) }));
-    return (jsx(ListTile, { onClick: () => onChecked(!checked), trailing: hardwareWalletToggleTooltip, children: jsxs("div", { className: 'wallet-group__list__item__content', copykey: 'dyn_select_chain.using_hardware_wallet_toggle_label', children: [t('dyn_select_chain.using_hardware_wallet_toggle_label'), jsx(Checkbox, { checked: checked })] }) }));
+    const toggle = (jsx(Toggle, { checked: checked, onChange: () => onChecked(!checked), "data-testid": 'hardware-wallet-toggle', icon: 
+        // eslint-disable-next-line react/jsx-wrap-multilines
+        jsx(Icon, { size: 'small', children: jsx(SvgCheck, {}) }) }));
+    return (jsx(ListTile, { disabled: true, trailing: toggle, children: jsx("span", { copykey: 'dyn_select_chain.using_hardware_wallet_toggle_label', children: t('dyn_select_chain.using_hardware_wallet_toggle_label') }) }));
 };
 
 export { HardwareWalletToggle };

package/src/lib/views/WalletUsedView/WalletUsedView.cjs

@@ -34,7 +34,6 @@ var getSiweStatement = require('../../utils/functions/getSiweStatement/getSiweSt
 var getWalletProvider = require('../../utils/functions/getWalletProvider/getWalletProvider.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');
@@ -88,14 +87,14 @@ const WalletUsedView = () => {
     }, [walletConnector]);
     const _shortenWalletAddress = shortenWalletAddress.shortenWalletAddress(walletAddress);
     const updatePrimaryWalletId = (walletConnector, user) => {
-        const newWalletName = walletConnector.name;
+        const newWalletKey = walletConnector.key;
         if (user.lastVerifiedCredentialId) {
             if (!primaryWallet) {
                 setPrimaryWalletId(user.lastVerifiedCredentialId);
                 return;
             }
-            const currentPrimaryWalletName = primaryWallet.connector.name;
-            if (isSameWalletName.isSameWalletName(newWalletName, currentPrimaryWalletName)) {
+            const currentPrimaryWalletKey = primaryWallet.connector.key;
+            if (newWalletKey === currentPrimaryWalletKey) {
                 setPrimaryWalletId(user.lastVerifiedCredentialId);
             }
             // if both wallets are flow wallets, set the last verified wallet as primary
@@ -149,13 +148,14 @@ const WalletUsedView = () => {
             setCallback('linkSuccess', {
                 walletId: decodedJwt.lastVerifiedCredentialId,
             });
+            setShowAuthFlow(false);
         }
         catch (error) {
             logger.logger.error(error);
+            setShowAuthFlow(false, { emitCancelAuth: true });
         }
         finally {
             setLoading(false);
-            setShowAuthFlow(false);
             setMultiWalletWidgetState('idle');
         }
     });

package/src/lib/views/WalletUsedView/WalletUsedView.js

@@ -30,7 +30,6 @@ import { getSiweStatement } from '../../utils/functions/getSiweStatement/getSiwe
 import { getWalletProvider } from '../../utils/functions/getWalletProvider/getWalletProvider.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';
@@ -84,14 +83,14 @@ const WalletUsedView = () => {
     }, [walletConnector]);
     const _shortenWalletAddress = shortenWalletAddress(walletAddress);
     const updatePrimaryWalletId = (walletConnector, user) => {
-        const newWalletName = walletConnector.name;
+        const newWalletKey = walletConnector.key;
         if (user.lastVerifiedCredentialId) {
             if (!primaryWallet) {
                 setPrimaryWalletId(user.lastVerifiedCredentialId);
                 return;
             }
-            const currentPrimaryWalletName = primaryWallet.connector.name;
-            if (isSameWalletName(newWalletName, currentPrimaryWalletName)) {
+            const currentPrimaryWalletKey = primaryWallet.connector.key;
+            if (newWalletKey === currentPrimaryWalletKey) {
                 setPrimaryWalletId(user.lastVerifiedCredentialId);
             }
             // if both wallets are flow wallets, set the last verified wallet as primary
@@ -145,13 +144,14 @@ const WalletUsedView = () => {
             setCallback('linkSuccess', {
                 walletId: decodedJwt.lastVerifiedCredentialId,
             });
+            setShowAuthFlow(false);
         }
         catch (error) {
             logger.error(error);
+            setShowAuthFlow(false, { emitCancelAuth: true });
         }
         finally {
             setLoading(false);
-            setShowAuthFlow(false);
             setMultiWalletWidgetState('idle');
         }
     });

package/src/lib/widgets/DynamicBridgeWidget/views/EditProfileView/EditProfileView.cjs

@@ -14,7 +14,7 @@ var UserProfileForm = require('../../../../components/UserProfileForm/UserProfil
 const EditProfileView = () => {
     const { setView } = ViewContext.useViewContext();
     const { goToProfileView } = DynamicBridgeWidgetContext.useDynamicBridgeWidgetContext();
-    const { internalSetShowAuthFlow } = useInternalDynamicContext.useInternalDynamicContext();
+    const { setShowAuthFlow } = useInternalDynamicContext.useInternalDynamicContext();
     const { updateUser } = useUserUpdateRequest.useUserUpdateRequestInternal({
         validationSchemaStripUnknown: true,
     });
@@ -22,10 +22,13 @@ const EditProfileView = () => {
         const { isEmailVerificationRequired } = yield updateUser(formValues);
         goToProfileView();
         if (isEmailVerificationRequired) {
-            internalSetShowAuthFlow(true);
+            setShowAuthFlow(true, {
+                ignoreIfIsEmbeddedWidget: false,
+                performMultiWalletChecks: false,
+            });
             setView('verify-email');
         }
-    }), [goToProfileView, internalSetShowAuthFlow, setView, updateUser]);
+    }), [goToProfileView, setShowAuthFlow, setView, updateUser]);
     return (jsxRuntime.jsx(UserProfileForm.UserProfileForm, { onEditProfileSubmit: onEditProfileFormSubmit, onEditProfileCancel: goToProfileView }));
 };
 

package/src/lib/widgets/DynamicBridgeWidget/views/EditProfileView/EditProfileView.js

@@ -10,7 +10,7 @@ import { UserProfileForm } from '../../../../components/UserProfileForm/UserProf
 const EditProfileView = () => {
     const { setView } = useViewContext();
     const { goToProfileView } = useDynamicBridgeWidgetContext();
-    const { internalSetShowAuthFlow } = useInternalDynamicContext();
+    const { setShowAuthFlow } = useInternalDynamicContext();
     const { updateUser } = useUserUpdateRequestInternal({
         validationSchemaStripUnknown: true,
     });
@@ -18,10 +18,13 @@ const EditProfileView = () => {
         const { isEmailVerificationRequired } = yield updateUser(formValues);
         goToProfileView();
         if (isEmailVerificationRequired) {
-            internalSetShowAuthFlow(true);
+            setShowAuthFlow(true, {
+                ignoreIfIsEmbeddedWidget: false,
+                performMultiWalletChecks: false,
+            });
             setView('verify-email');
         }
-    }), [goToProfileView, internalSetShowAuthFlow, setView, updateUser]);
+    }), [goToProfileView, setShowAuthFlow, setView, updateUser]);
     return (jsx(UserProfileForm, { onEditProfileSubmit: onEditProfileFormSubmit, onEditProfileCancel: goToProfileView }));
 };
 

package/src/lib/widgets/DynamicWidget/components/ActiveWalletInformation/ActiveWalletInformation.cjs

@@ -5,12 +5,12 @@ Object.defineProperty(exports, '__esModule', { value: true });
 var jsxRuntime = require('react/jsx-runtime');
 var React = require('react');
 var reactI18next = require('react-i18next');
-var walletConnectorCore = require('@dynamic-labs/wallet-connector-core');
 var bitcoin = require('@dynamic-labs/bitcoin');
 var classNames = require('../../../../utils/functions/classNames/classNames.cjs');
 require('../../../../events/dynamicEvents.cjs');
 require('@dynamic-labs/utils');
 var useInternalDynamicContext = require('../../../../context/DynamicContext/useInternalDynamicContext.cjs');
+require('@dynamic-labs/wallet-connector-core');
 require('../../../../context/CaptchaContext/CaptchaContext.cjs');
 require('../../../../context/ErrorContext/ErrorContext.cjs');
 require('../../../../context/ViewContext/ViewContext.cjs');
@@ -104,8 +104,7 @@ const ActiveWalletInformation = () => {
         {
             Icon: null,
             callback: () => setDynamicWidgetView('wallet-settings'),
-            hide: !(wallet &&
-                walletConnectorCore.normalizeWalletName(wallet.connector.name).startsWith('turnkey')),
+            hide: !(wallet && wallet.connector.key.startsWith('turnkey')),
             text: 'Wallet settings',
         },
         {

package/src/lib/widgets/DynamicWidget/components/ActiveWalletInformation/ActiveWalletInformation.js

@@ -1,12 +1,12 @@
 import { jsxs, jsx } from 'react/jsx-runtime';
 import { useState } from 'react';
 import { useTranslation } from 'react-i18next';
-import { normalizeWalletName } from '@dynamic-labs/wallet-connector-core';
 import { isBitcoinConnector } from '@dynamic-labs/bitcoin';
 import { classNames } from '../../../../utils/functions/classNames/classNames.js';
 import '../../../../events/dynamicEvents.js';
 import '@dynamic-labs/utils';
 import { useInternalDynamicContext } from '../../../../context/DynamicContext/useInternalDynamicContext.js';
+import '@dynamic-labs/wallet-connector-core';
 import '../../../../context/CaptchaContext/CaptchaContext.js';
 import '../../../../context/ErrorContext/ErrorContext.js';
 import '../../../../context/ViewContext/ViewContext.js';
@@ -100,8 +100,7 @@ const ActiveWalletInformation = () => {
         {
             Icon: null,
             callback: () => setDynamicWidgetView('wallet-settings'),
-            hide: !(wallet &&
-                normalizeWalletName(wallet.connector.name).startsWith('turnkey')),
+            hide: !(wallet && wallet.connector.key.startsWith('turnkey')),
             text: 'Wallet settings',
         },
         {