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

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

@@ -36,7 +36,12 @@ const useDynamicContext = () => {
         setMultiWalletWidgetState,
         setNetwork,
         setPrimaryWallet,
-        setShowAuthFlow,
+        setShowAuthFlow: (value) => setShowAuthFlow(value, {
+            emitCancelAuth: true,
+            ignoreIfIsEmbeddedWidget: true,
+            initializeWalletConnect: true,
+            performMultiWalletChecks: true,
+        }),
         setShowBridgeWidget,
         setShowDynamicUserProfile,
         setShowLinkNewWalletModal,

package/src/lib/context/SocialRedirectContext/SocialRedirectContext.cjs

@@ -97,7 +97,7 @@ const SocialRedirectContextProvider = ({ children, }) => {
     const handleError = React.useCallback((message) => {
         logger.logger.error(message);
         if (isAuthenticated) {
-            setShowAuthFlow(false);
+            setShowAuthFlow(false, { emitCancelAuth: true });
             setShowDynamicUserProfile(true);
         }
         else {

package/src/lib/context/SocialRedirectContext/SocialRedirectContext.js

@@ -93,7 +93,7 @@ const SocialRedirectContextProvider = ({ children, }) => {
     const handleError = useCallback((message) => {
         logger.error(message);
         if (isAuthenticated) {
-            setShowAuthFlow(false);
+            setShowAuthFlow(false, { emitCancelAuth: true });
             setShowDynamicUserProfile(true);
         }
         else {

package/src/lib/events/dynamicEvents.d.ts

@@ -2,6 +2,9 @@ import EventEmitter from 'eventemitter3';
 import { Wallet } from '../shared';
 /** Maps internal event names to their listeners */
 export type DynamicEvents = {
+    /** Triggered when auth is closed before reaching success (due to user cancel or fail) */
+    authFlowCancelled: () => void;
+    /** Triggered when auth is attempted but fails, like when user rejects connection or the network call fails */
     emailVerificationResult: (param: boolean, email: string) => void;
     embeddedWalletCreated: (wallet: Wallet) => void;
     embeddedWalletFailed: (error: unknown) => void;

package/src/lib/layout/DynamicAuthLayout/HelpContent/WalletListHelpContent/WalletExtensionOrAppContinueButton/WalletExtensionOrAppContinueButton.cjs

@@ -64,10 +64,10 @@ require('../../../../../components/Popper/PopperContext/PopperContext.cjs');
 const WalletExtensionOrAppContinueButton = ({ wallet, selectedUrl, }) => {
     const showRefreshOnceInstalledWalletButton = Boolean(selectedUrl.length) && !(wallet === null || wallet === void 0 ? void 0 : wallet.isInstalledOnBrowser);
     const walletConnectionAfterPageReloadHandler = () => {
-        if (!(wallet === null || wallet === void 0 ? void 0 : wallet.name)) {
+        if (!(wallet === null || wallet === void 0 ? void 0 : wallet.key)) {
             return;
         }
-        localStorage.LocalStorage.setToLS(localStorage$1.NEWTOWEB3_WALLET_EXTENSION_FLAG_KEY, wallet.name);
+        localStorage.LocalStorage.setToLS(localStorage$1.NEWTOWEB3_WALLET_EXTENSION_FLAG_KEY, wallet.key);
         window.location.reload();
     };
     return (jsxRuntime.jsxs("div", { className: 'new-to-web3-buttons__container', children: [!utils.isMobile() && (jsxRuntime.jsxs(jsxRuntime.Fragment, { children: [(wallet === null || wallet === void 0 ? void 0 : wallet.isInstalledOnBrowser) && (jsxRuntime.jsx(NewToWeb3WalletItem.NewToWeb3WalletItem, { wallet: wallet, children: jsxRuntime.jsx(Typography.Typography, { as: 'p', "data-testid": 'desktop-interactive-wallet-item', variant: 'body_normal', weight: 'bold', children: "Continue" }) })), showRefreshOnceInstalledWalletButton && (jsxRuntime.jsx("button", { onClick: walletConnectionAfterPageReloadHandler, children: jsxRuntime.jsx(Typography.Typography, { as: 'p', "data-testid": 'refresh-once-installed-button', variant: 'body_normal', weight: 'bold', children: "Continue once installed" }) }))] })), wallet && utils.isMobile() && (jsxRuntime.jsx(NewToWeb3WalletItem.NewToWeb3WalletItem, { wallet: wallet, children: jsxRuntime.jsx("p", { "data-testid": 'mobile-interactive-wallet-item', children: "Continue once installed" }) }))] }));

package/src/lib/layout/DynamicAuthLayout/HelpContent/WalletListHelpContent/WalletExtensionOrAppContinueButton/WalletExtensionOrAppContinueButton.js

@@ -60,10 +60,10 @@ import '../../../../../components/Popper/PopperContext/PopperContext.js';
 const WalletExtensionOrAppContinueButton = ({ wallet, selectedUrl, }) => {
     const showRefreshOnceInstalledWalletButton = Boolean(selectedUrl.length) && !(wallet === null || wallet === void 0 ? void 0 : wallet.isInstalledOnBrowser);
     const walletConnectionAfterPageReloadHandler = () => {
-        if (!(wallet === null || wallet === void 0 ? void 0 : wallet.name)) {
+        if (!(wallet === null || wallet === void 0 ? void 0 : wallet.key)) {
             return;
         }
-        LocalStorage.setToLS(NEWTOWEB3_WALLET_EXTENSION_FLAG_KEY, wallet.name);
+        LocalStorage.setToLS(NEWTOWEB3_WALLET_EXTENSION_FLAG_KEY, wallet.key);
         window.location.reload();
     };
     return (jsxs("div", { className: 'new-to-web3-buttons__container', children: [!isMobile() && (jsxs(Fragment, { children: [(wallet === null || wallet === void 0 ? void 0 : wallet.isInstalledOnBrowser) && (jsx(NewToWeb3WalletItem, { wallet: wallet, children: jsx(Typography, { as: 'p', "data-testid": 'desktop-interactive-wallet-item', variant: 'body_normal', weight: 'bold', children: "Continue" }) })), showRefreshOnceInstalledWalletButton && (jsx("button", { onClick: walletConnectionAfterPageReloadHandler, children: jsx(Typography, { as: 'p', "data-testid": 'refresh-once-installed-button', variant: 'body_normal', weight: 'bold', children: "Continue once installed" }) }))] })), wallet && isMobile() && (jsx(NewToWeb3WalletItem, { wallet: wallet, children: jsx("p", { "data-testid": 'mobile-interactive-wallet-item', children: "Continue once installed" }) }))] }));

package/src/lib/layout/DynamicAuthLayout/HelpContent/WalletListHelpContent/WalletListHelpContent.cjs

@@ -4,13 +4,13 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var jsxRuntime = require('react/jsx-runtime');
 var React = require('react');
-var walletConnectorCore = require('@dynamic-labs/wallet-connector-core');
 var iconic = require('@dynamic-labs/iconic');
 var walletBook = require('@dynamic-labs/wallet-book');
 var utils = require('@dynamic-labs/utils');
 var useInternalDynamicContext = require('../../../../context/DynamicContext/useInternalDynamicContext.cjs');
 require('@dynamic-labs/sdk-api');
 require('../../../../shared/logger.cjs');
+require('@dynamic-labs/wallet-connector-core');
 require('../../../../context/ViewContext/ViewContext.cjs');
 var puzzle = require('../../../../shared/assets/puzzle.cjs');
 var index = require('../../../../shared/utils/functions/getValueByKey/index.cjs');
@@ -74,10 +74,10 @@ const WalletListHelpContent = ({ chains, newToWeb3WalletChainMap, }) => {
     const { walletBook: walletBook$1 } = walletBook.useWalletBookContext();
     const [selectedUrl, setSelectedUrl] = React.useState('');
     const chainName = ((_a = chains === null || chains === void 0 ? void 0 : chains.filter((chain) => Boolean(chain.enabled)).find((enabledChain) => enabledChain.name === newToWeb3WalletChainMap.primary_chain)) === null || _a === void 0 ? void 0 : _a.name) || 'evm';
-    const walletName = index.getValueByKey(newToWeb3WalletChainMap === null || newToWeb3WalletChainMap === void 0 ? void 0 : newToWeb3WalletChainMap.wallets, chainName);
-    const newToWeb3Wallet = walletConnectorOptions.find((wallet) => { var _a; return walletConnectorCore.normalizeWalletName((_a = wallet.key) !== null && _a !== void 0 ? _a : wallet.name) === walletName; });
+    const walletKey = index.getValueByKey(newToWeb3WalletChainMap === null || newToWeb3WalletChainMap === void 0 ? void 0 : newToWeb3WalletChainMap.wallets, chainName);
+    const newToWeb3Wallet = walletConnectorOptions.find((wallet) => wallet.key === walletKey);
     const isCustodialServiceWallet = newToWeb3Wallet === null || newToWeb3Wallet === void 0 ? void 0 : newToWeb3Wallet.walletConnector.canConnectViaCustodialService;
-    const links = walletBook.getWalletLinks(walletBook$1, walletName);
+    const links = walletBook.getWalletLinks(walletBook$1, walletKey);
     const { currentDesktopUrl, canShowAndroidAppButton, canShowIosAppButton } = parseWalletLinks.parseWalletLinks(links);
     const walletLinksElements = [
         {
@@ -102,7 +102,7 @@ const WalletListHelpContent = ({ chains, newToWeb3WalletChainMap, }) => {
     if (!Object.keys((_b = walletBook$1 === null || walletBook$1 === void 0 ? void 0 : walletBook$1.wallets) !== null && _b !== void 0 ? _b : {}).length) {
         return jsxRuntime.jsx(Skeleton.Skeleton, { className: 'walletlist-footer-content__container' });
     }
-    return (jsxRuntime.jsx("div", { className: 'walletlist-help-content__container', children: jsxRuntime.jsxs(EnterTileAnimation.EnterTileAnimation, { delay: '300ms', children: [jsxRuntime.jsx("div", { className: 'walletlist-help-content__icon', children: jsxRuntime.jsx(walletBook.WalletIcon, { walletKey: walletName, style: { height: pixelToRem.pixelToRem(56), width: pixelToRem.pixelToRem(56) } }) }), jsxRuntime.jsxs("div", { className: 'walletlist-help-content__typography-wrapper', children: [jsxRuntime.jsxs(Typography.Typography, { as: 'p', variant: 'title', weight: 'medium', children: ["We recommend installing", ' ', walletBook.getWalletBookWallet(walletBook$1, walletName).name] }), jsxRuntime.jsx(Typography.Typography, { as: 'label', variant: 'body_normal', weight: 'regular', color: 'secondary', className: 'walletlist-help-content__typography--label', children: "Select your preferred option below:" })] }), jsxRuntime.jsx("div", { className: 'walletlist-help-content__buttons-wrapper', children: walletLinksElements.map((element, i) => element.isEnabled ? (jsxRuntime.jsx("button", { onClick: () => setSelectedUrl(element.url), children: jsxRuntime.jsx(Item.Item, { StartIcon: element.icon, heading: element.content, url: element.url }) }, i)) : undefined) }), isCustodialServiceWallet && (jsxRuntime.jsxs("div", { className: 'walletlist-help-content__custodial-wallet-area', children: [jsxRuntime.jsx(Typography.Typography, { className: 'walletlist-help-content__custodial-wallet-area--title', as: 'p', color: 'secondary', variant: 'body_normal', weight: 'regular', children: "If you don't want to install a wallet, then use:" }), jsxRuntime.jsx(NewToWeb3WalletItem.NewToWeb3WalletItem, { wallet: newToWeb3Wallet })] })), jsxRuntime.jsx(WalletExtensionOrAppContinueButton.WalletExtensionOrAppContinueButton, { selectedUrl: selectedUrl, wallet: newToWeb3Wallet })] }) }));
+    return (jsxRuntime.jsx("div", { className: 'walletlist-help-content__container', children: jsxRuntime.jsxs(EnterTileAnimation.EnterTileAnimation, { delay: '300ms', children: [jsxRuntime.jsx("div", { className: 'walletlist-help-content__icon', children: jsxRuntime.jsx(walletBook.WalletIcon, { walletKey: walletKey, style: { height: pixelToRem.pixelToRem(56), width: pixelToRem.pixelToRem(56) } }) }), jsxRuntime.jsxs("div", { className: 'walletlist-help-content__typography-wrapper', children: [jsxRuntime.jsxs(Typography.Typography, { as: 'p', variant: 'title', weight: 'medium', children: ["We recommend installing", ' ', walletBook.getWalletBookWallet(walletBook$1, walletKey).name] }), jsxRuntime.jsx(Typography.Typography, { as: 'label', variant: 'body_normal', weight: 'regular', color: 'secondary', className: 'walletlist-help-content__typography--label', children: "Select your preferred option below:" })] }), jsxRuntime.jsx("div", { className: 'walletlist-help-content__buttons-wrapper', children: walletLinksElements.map((element, i) => element.isEnabled ? (jsxRuntime.jsx("button", { onClick: () => setSelectedUrl(element.url), children: jsxRuntime.jsx(Item.Item, { StartIcon: element.icon, heading: element.content, url: element.url }) }, i)) : undefined) }), isCustodialServiceWallet && (jsxRuntime.jsxs("div", { className: 'walletlist-help-content__custodial-wallet-area', children: [jsxRuntime.jsx(Typography.Typography, { className: 'walletlist-help-content__custodial-wallet-area--title', as: 'p', color: 'secondary', variant: 'body_normal', weight: 'regular', children: "If you don't want to install a wallet, then use:" }), jsxRuntime.jsx(NewToWeb3WalletItem.NewToWeb3WalletItem, { wallet: newToWeb3Wallet })] })), jsxRuntime.jsx(WalletExtensionOrAppContinueButton.WalletExtensionOrAppContinueButton, { selectedUrl: selectedUrl, wallet: newToWeb3Wallet })] }) }));
 };
 
 exports.WalletListHelpContent = WalletListHelpContent;

package/src/lib/layout/DynamicAuthLayout/HelpContent/WalletListHelpContent/WalletListHelpContent.js

@@ -1,12 +1,12 @@
 import { jsx, jsxs } from 'react/jsx-runtime';
 import { useState } from 'react';
-import { normalizeWalletName } from '@dynamic-labs/wallet-connector-core';
 import { AppleIcon, AndroidIcon } from '@dynamic-labs/iconic';
 import { useWalletBookContext, getWalletLinks, WalletIcon, getWalletBookWallet } from '@dynamic-labs/wallet-book';
 import { isMobile } from '@dynamic-labs/utils';
 import { useInternalDynamicContext } from '../../../../context/DynamicContext/useInternalDynamicContext.js';
 import '@dynamic-labs/sdk-api';
 import '../../../../shared/logger.js';
+import '@dynamic-labs/wallet-connector-core';
 import '../../../../context/ViewContext/ViewContext.js';
 import { ReactComponent as SvgPuzzle } from '../../../../shared/assets/puzzle.js';
 import { getValueByKey } from '../../../../shared/utils/functions/getValueByKey/index.js';
@@ -70,10 +70,10 @@ const WalletListHelpContent = ({ chains, newToWeb3WalletChainMap, }) => {
     const { walletBook } = useWalletBookContext();
     const [selectedUrl, setSelectedUrl] = useState('');
     const chainName = ((_a = chains === null || chains === void 0 ? void 0 : chains.filter((chain) => Boolean(chain.enabled)).find((enabledChain) => enabledChain.name === newToWeb3WalletChainMap.primary_chain)) === null || _a === void 0 ? void 0 : _a.name) || 'evm';
-    const walletName = getValueByKey(newToWeb3WalletChainMap === null || newToWeb3WalletChainMap === void 0 ? void 0 : newToWeb3WalletChainMap.wallets, chainName);
-    const newToWeb3Wallet = walletConnectorOptions.find((wallet) => { var _a; return normalizeWalletName((_a = wallet.key) !== null && _a !== void 0 ? _a : wallet.name) === walletName; });
+    const walletKey = getValueByKey(newToWeb3WalletChainMap === null || newToWeb3WalletChainMap === void 0 ? void 0 : newToWeb3WalletChainMap.wallets, chainName);
+    const newToWeb3Wallet = walletConnectorOptions.find((wallet) => wallet.key === walletKey);
     const isCustodialServiceWallet = newToWeb3Wallet === null || newToWeb3Wallet === void 0 ? void 0 : newToWeb3Wallet.walletConnector.canConnectViaCustodialService;
-    const links = getWalletLinks(walletBook, walletName);
+    const links = getWalletLinks(walletBook, walletKey);
     const { currentDesktopUrl, canShowAndroidAppButton, canShowIosAppButton } = parseWalletLinks(links);
     const walletLinksElements = [
         {
@@ -98,7 +98,7 @@ const WalletListHelpContent = ({ chains, newToWeb3WalletChainMap, }) => {
     if (!Object.keys((_b = walletBook === null || walletBook === void 0 ? void 0 : walletBook.wallets) !== null && _b !== void 0 ? _b : {}).length) {
         return jsx(Skeleton, { className: 'walletlist-footer-content__container' });
     }
-    return (jsx("div", { className: 'walletlist-help-content__container', children: jsxs(EnterTileAnimation, { delay: '300ms', children: [jsx("div", { className: 'walletlist-help-content__icon', children: jsx(WalletIcon, { walletKey: walletName, style: { height: pixelToRem(56), width: pixelToRem(56) } }) }), jsxs("div", { className: 'walletlist-help-content__typography-wrapper', children: [jsxs(Typography, { as: 'p', variant: 'title', weight: 'medium', children: ["We recommend installing", ' ', getWalletBookWallet(walletBook, walletName).name] }), jsx(Typography, { as: 'label', variant: 'body_normal', weight: 'regular', color: 'secondary', className: 'walletlist-help-content__typography--label', children: "Select your preferred option below:" })] }), jsx("div", { className: 'walletlist-help-content__buttons-wrapper', children: walletLinksElements.map((element, i) => element.isEnabled ? (jsx("button", { onClick: () => setSelectedUrl(element.url), children: jsx(Item, { StartIcon: element.icon, heading: element.content, url: element.url }) }, i)) : undefined) }), isCustodialServiceWallet && (jsxs("div", { className: 'walletlist-help-content__custodial-wallet-area', children: [jsx(Typography, { className: 'walletlist-help-content__custodial-wallet-area--title', as: 'p', color: 'secondary', variant: 'body_normal', weight: 'regular', children: "If you don't want to install a wallet, then use:" }), jsx(NewToWeb3WalletItem, { wallet: newToWeb3Wallet })] })), jsx(WalletExtensionOrAppContinueButton, { selectedUrl: selectedUrl, wallet: newToWeb3Wallet })] }) }));
+    return (jsx("div", { className: 'walletlist-help-content__container', children: jsxs(EnterTileAnimation, { delay: '300ms', children: [jsx("div", { className: 'walletlist-help-content__icon', children: jsx(WalletIcon, { walletKey: walletKey, style: { height: pixelToRem(56), width: pixelToRem(56) } }) }), jsxs("div", { className: 'walletlist-help-content__typography-wrapper', children: [jsxs(Typography, { as: 'p', variant: 'title', weight: 'medium', children: ["We recommend installing", ' ', getWalletBookWallet(walletBook, walletKey).name] }), jsx(Typography, { as: 'label', variant: 'body_normal', weight: 'regular', color: 'secondary', className: 'walletlist-help-content__typography--label', children: "Select your preferred option below:" })] }), jsx("div", { className: 'walletlist-help-content__buttons-wrapper', children: walletLinksElements.map((element, i) => element.isEnabled ? (jsx("button", { onClick: () => setSelectedUrl(element.url), children: jsx(Item, { StartIcon: element.icon, heading: element.content, url: element.url }) }, i)) : undefined) }), isCustodialServiceWallet && (jsxs("div", { className: 'walletlist-help-content__custodial-wallet-area', children: [jsx(Typography, { className: 'walletlist-help-content__custodial-wallet-area--title', as: 'p', color: 'secondary', variant: 'body_normal', weight: 'regular', children: "If you don't want to install a wallet, then use:" }), jsx(NewToWeb3WalletItem, { wallet: newToWeb3Wallet })] })), jsx(WalletExtensionOrAppContinueButton, { selectedUrl: selectedUrl, wallet: newToWeb3Wallet })] }) }));
 };
 
 export { WalletListHelpContent };

package/src/lib/locale/en/translation.cjs

@@ -957,13 +957,11 @@ const translation = {
      * {
         description: "This wallet supports multiple chains. Select which chain you'd like to connect to",
         using_hardware_wallet_toggle_label: 'Using Ledger with Solana',
-        using_hardware_wallet_toggle_info: 'To sign in with Ledger and Solana.',
       }
      */
     dyn_select_chain: {
         description: "This wallet supports multiple chains. Select which chain you'd like to connect to",
         using_hardware_wallet_toggle_label: 'Using Ledger with Solana',
-        using_hardware_wallet_toggle_info: 'To sign in with Ledger and Solana.',
     },
     /**
      * @description copy keys for sign message flow views

package/src/lib/locale/en/translation.d.ts

@@ -952,13 +952,11 @@ export declare const translation: {
      * {
         description: "This wallet supports multiple chains. Select which chain you'd like to connect to",
         using_hardware_wallet_toggle_label: 'Using Ledger with Solana',
-        using_hardware_wallet_toggle_info: 'To sign in with Ledger and Solana.',
       }
      */
     dyn_select_chain: {
         description: string;
         using_hardware_wallet_toggle_label: string;
-        using_hardware_wallet_toggle_info: string;
     };
     /**
      * @description copy keys for sign message flow views

package/src/lib/locale/en/translation.js

@@ -953,13 +953,11 @@ const translation = {
      * {
         description: "This wallet supports multiple chains. Select which chain you'd like to connect to",
         using_hardware_wallet_toggle_label: 'Using Ledger with Solana',
-        using_hardware_wallet_toggle_info: 'To sign in with Ledger and Solana.',
       }
      */
     dyn_select_chain: {
         description: "This wallet supports multiple chains. Select which chain you'd like to connect to",
         using_hardware_wallet_toggle_label: 'Using Ledger with Solana',
-        using_hardware_wallet_toggle_info: 'To sign in with Ledger and Solana.',
     },
     /**
      * @description copy keys for sign message flow views

package/src/lib/shared/types/index.d.ts

@@ -177,6 +177,9 @@ export type DynamicEventsCallbacks = {
         messageToSign: string;
         signedMessage: string;
     }) => void;
+    /** Called when the auth modal is closed before reaching success (due to user cancel or fail) */
+    onAuthFlowCancel?: () => void;
+    /** Called whenever the auth modal is closed */
     onAuthFlowClose?: () => void;
     onAuthFlowOpen?: () => void;
     onAuthSuccess?: OnAuthSuccess;