@dynamic-labs/sdk-react-core 1.1.0-alpha.25 → 1.1.0-alpha.26

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

@@ -2,13 +2,14 @@ import { Dispatch, MutableRefObject, ReactNode, SetStateAction } from 'react';
 import { DynamicJwt, NameServiceData, ProjectSettings, SdkView } from '@dynamic-labs/sdk-api';
 import { NetworkConfigurationMap, SocialProviderFilter, WalletUiUtils } from '@dynamic-labs/types';
 import { Chain, FetchPublicAddressOpts, WalletConnector } from '@dynamic-labs/wallet-connector-core';
+import { PasskeySuccessEnum } from '../../../components/PasskeyCreatedSuccessBanner/PasskeyCreatedSuccessBanner';
 import { AccessDeniedCustomButton, AccountSwitchState, AuthModeType, AwaitingSignatureState, ChainToWalletMap, DynamicEventsCallbacks, DynamicRPCProviders, MultiWalletWidgetState, UserProfile, Wallet, WalletOption, WalletWithAction } from '../../../shared';
 import { SocialNetworkIconType } from '../../../utils/functions/getSocialNetworkIcon';
 import { MultiWalletWidgetStateSetter } from '../../../utils/hooks/multiWallet';
+import { ConnectWalletOptions } from '../../../utils/hooks/useConnectWallet/useConnectWallet';
 import { ThemeData, ThemeSetting } from '../../ThemeContext';
 import { DisplayOrder, SetDisplayOrderPriority, SetShowAuthFlow } from '../hooks';
 import { SetCallbackType } from '../useCustomerCallbacks';
-import { PasskeySuccessEnum } from '../../../components/PasskeyCreatedSuccessBanner/PasskeyCreatedSuccessBanner';
 export type ChainsToConnect = {
     chain: Chain;
     chainId?: number;
@@ -33,7 +34,7 @@ export interface IDynamicContext {
     authorizationViewDisplayOrder: DisplayOrder;
     awaitingSignatureState: AwaitingSignatureState;
     clearStatesOnBackClick: () => void;
-    connectWallet: (walletConnector: WalletConnector, fetchPublicAddressOpts?: FetchPublicAddressOpts, shouldCallCallback?: boolean) => Promise<ConnectWalletResult | undefined>;
+    connectWallet: (walletConnector: WalletConnector, fetchPublicAddressOpts?: FetchPublicAddressOpts, options?: ConnectWalletOptions) => Promise<ConnectWalletResult | undefined>;
     connectedWallets: Wallet[];
     linkedWallets: Wallet[];
     locale: {

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

@@ -1,7 +1,7 @@
 import { JwtVerifiedCredential } from '@dynamic-labs/sdk-api';
-import { AuthModeType, OnAuthSuccess, onConnect, OnEmbeddedWalletCreated, OnLinkSuccess, OnUserProfileUpdate, UserProfile, Wallet } from '../../../shared/types';
+import { OnAuthSuccess, OnEmbeddedWalletCreated, OnLinkSuccess, OnUserProfileUpdate, UserProfile, Wallet } from '../../../shared/types';
 import { IDynamicContext } from '../types';
-export type Callback = 'authSuccess' | 'linkSuccess' | 'userProfileUpdate' | 'connectSuccess' | 'embeddedWalletCreated';
+export type Callback = 'authSuccess' | 'linkSuccess' | 'userProfileUpdate' | 'embeddedWalletCreated';
 export type CallbackParams = {
     /** For embedded wallet events */
     email?: string;
@@ -10,10 +10,8 @@ export type CallbackParams = {
     walletId?: string;
 };
 export type UseCustomerCallbacksArgs = {
-    authMode: AuthModeType;
     callbacks: {
         onAuthSuccess?: OnAuthSuccess;
-        onConnect?: onConnect;
         onLinkSuccess?: OnLinkSuccess;
         onUserProfileUpdate?: OnUserProfileUpdate;
         onEmbeddedWalletCreated?: OnEmbeddedWalletCreated;

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

@@ -20,9 +20,8 @@ require('../../../../../_virtual/_tslib.cjs');
 require('@dynamic-labs/multi-wallet');
 var getAuthToken = require('../../../utils/functions/getAuthToken/getAuthToken.cjs');
 require('viem/chains');
-var isConnectOnly = require('../../../utils/hooks/authenticationHooks/helpers/isConnectOnly.cjs');
 
-const useCustomerCallbacks = ({ callbacks: { onAuthSuccess, onLinkSuccess, onUserProfileUpdate, onConnect, onEmbeddedWalletCreated, }, handleLogOut, primaryWallet, secondaryWallets, user, isAuthenticated, authMode, setIsVerificationInProgress, }) => {
+const useCustomerCallbacks = ({ callbacks: { onAuthSuccess, onLinkSuccess, onUserProfileUpdate, onEmbeddedWalletCreated, }, handleLogOut, primaryWallet, secondaryWallets, user, isAuthenticated, setIsVerificationInProgress, }) => {
     const [callbackQueue, setCallbackQueue] = React.useState([]);
     /** Gets the wallet from its id */
     const getWallet = React.useCallback((id) => {
@@ -31,39 +30,6 @@ const useCustomerCallbacks = ({ callbacks: { onAuthSuccess, onLinkSuccess, onUse
             ? (_a = [primaryWallet, ...secondaryWallets].find((wallet) => (wallet === null || wallet === void 0 ? void 0 : wallet.id) === id)) !== null && _a !== void 0 ? _a : undefined
             : undefined;
     }, [primaryWallet, secondaryWallets]);
-    const isConnectOnlyAndCallbackIsConnectSuccess = React.useCallback((next) => isConnectOnly.isConnectOnly(user, authMode) &&
-        Boolean(primaryWallet) &&
-        next === 'connectSuccess', [authMode, user, primaryWallet]);
-    const handleConnectOnlyAndCallbackIsConnectSuccess = React.useCallback(() => {
-        const [{ callback: peek, params }] = callbackQueue;
-        // we need to handle connect-only different way
-        // for connect-only we don't have user object or JWT (needed in connect-and-sign)
-        // so we need to handle connect-only before the early returns
-        if (isConnectOnlyAndCallbackIsConnectSuccess(peek)) {
-            const updatedQueue = [...callbackQueue];
-            updatedQueue.shift();
-            setCallbackQueue(updatedQueue);
-            try {
-                setIsVerificationInProgress(false);
-                const wallet = getWallet(params === null || params === void 0 ? void 0 : params.walletId);
-                onConnect === null || onConnect === void 0 ? void 0 : onConnect({
-                    wallet,
-                    walletConnector: wallet === null || wallet === void 0 ? void 0 : wallet.connector,
-                });
-            }
-            catch (e) {
-                logger.logger.error('Error calling onConnect: ', e);
-            }
-            return false;
-        }
-        return true;
-    }, [
-        callbackQueue,
-        getWallet,
-        isConnectOnlyAndCallbackIsConnectSuccess,
-        onConnect,
-        setIsVerificationInProgress,
-    ]);
     const handleNextCallback = React.useCallback((next, authToken, user) => {
         var _a, _b;
         switch (next === null || next === void 0 ? void 0 : next.callback) {
@@ -129,32 +95,20 @@ const useCustomerCallbacks = ({ callbacks: { onAuthSuccess, onLinkSuccess, onUse
         setIsVerificationInProgress,
     ]);
     React.useEffect(() => {
-        if (!callbackQueue.length)
-            return;
-        if (!handleConnectOnlyAndCallbackIsConnectSuccess())
-            return;
-        if (!user)
+        if (!callbackQueue.length || !user)
             return;
         const authToken = getAuthToken.getAuthToken();
-        if (!authToken)
-            return;
         // checks if user logged in with a wallet, so we need to wait
         // for the primary wallet state to be set
         // if user logged in with email without embedded wallet, then
         // there is no wallet so we can go ahead and run the callback
-        if (user.isAuthenticatedWithAWallet && !primaryWallet) {
+        if (!authToken || (user.isAuthenticatedWithAWallet && !primaryWallet)) {
             return;
         }
         const updatedQueue = [...callbackQueue];
         handleNextCallback(updatedQueue.shift(), authToken, user);
         setCallbackQueue(updatedQueue);
-    }, [
-        callbackQueue,
-        handleConnectOnlyAndCallbackIsConnectSuccess,
-        handleNextCallback,
-        primaryWallet,
-        user,
-    ]);
+    }, [callbackQueue, handleNextCallback, primaryWallet, user]);
     const setCallback = (callback, params) => {
         setCallbackQueue((prev) => [...prev, { callback, params }]);
     };

package/src/lib/context/DynamicContext/useCustomerCallbacks/useCustomerCallbacks.d.ts

@@ -1,4 +1,4 @@
 import { SetCallbackType, UseCustomerCallbacksArgs } from './types';
-export declare const useCustomerCallbacks: ({ callbacks: { onAuthSuccess, onLinkSuccess, onUserProfileUpdate, onConnect, onEmbeddedWalletCreated, }, handleLogOut, primaryWallet, secondaryWallets, user, isAuthenticated, authMode, setIsVerificationInProgress, }: UseCustomerCallbacksArgs) => {
+export declare const useCustomerCallbacks: ({ callbacks: { onAuthSuccess, onLinkSuccess, onUserProfileUpdate, onEmbeddedWalletCreated, }, handleLogOut, primaryWallet, secondaryWallets, user, isAuthenticated, setIsVerificationInProgress, }: UseCustomerCallbacksArgs) => {
     setCallback: SetCallbackType;
 };

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

@@ -16,9 +16,8 @@ import '../../../../../_virtual/_tslib.js';
 import '@dynamic-labs/multi-wallet';
 import { getAuthToken } from '../../../utils/functions/getAuthToken/getAuthToken.js';
 import 'viem/chains';
-import { isConnectOnly } from '../../../utils/hooks/authenticationHooks/helpers/isConnectOnly.js';
 
-const useCustomerCallbacks = ({ callbacks: { onAuthSuccess, onLinkSuccess, onUserProfileUpdate, onConnect, onEmbeddedWalletCreated, }, handleLogOut, primaryWallet, secondaryWallets, user, isAuthenticated, authMode, setIsVerificationInProgress, }) => {
+const useCustomerCallbacks = ({ callbacks: { onAuthSuccess, onLinkSuccess, onUserProfileUpdate, onEmbeddedWalletCreated, }, handleLogOut, primaryWallet, secondaryWallets, user, isAuthenticated, setIsVerificationInProgress, }) => {
     const [callbackQueue, setCallbackQueue] = useState([]);
     /** Gets the wallet from its id */
     const getWallet = useCallback((id) => {
@@ -27,39 +26,6 @@ const useCustomerCallbacks = ({ callbacks: { onAuthSuccess, onLinkSuccess, onUse
             ? (_a = [primaryWallet, ...secondaryWallets].find((wallet) => (wallet === null || wallet === void 0 ? void 0 : wallet.id) === id)) !== null && _a !== void 0 ? _a : undefined
             : undefined;
     }, [primaryWallet, secondaryWallets]);
-    const isConnectOnlyAndCallbackIsConnectSuccess = useCallback((next) => isConnectOnly(user, authMode) &&
-        Boolean(primaryWallet) &&
-        next === 'connectSuccess', [authMode, user, primaryWallet]);
-    const handleConnectOnlyAndCallbackIsConnectSuccess = useCallback(() => {
-        const [{ callback: peek, params }] = callbackQueue;
-        // we need to handle connect-only different way
-        // for connect-only we don't have user object or JWT (needed in connect-and-sign)
-        // so we need to handle connect-only before the early returns
-        if (isConnectOnlyAndCallbackIsConnectSuccess(peek)) {
-            const updatedQueue = [...callbackQueue];
-            updatedQueue.shift();
-            setCallbackQueue(updatedQueue);
-            try {
-                setIsVerificationInProgress(false);
-                const wallet = getWallet(params === null || params === void 0 ? void 0 : params.walletId);
-                onConnect === null || onConnect === void 0 ? void 0 : onConnect({
-                    wallet,
-                    walletConnector: wallet === null || wallet === void 0 ? void 0 : wallet.connector,
-                });
-            }
-            catch (e) {
-                logger.error('Error calling onConnect: ', e);
-            }
-            return false;
-        }
-        return true;
-    }, [
-        callbackQueue,
-        getWallet,
-        isConnectOnlyAndCallbackIsConnectSuccess,
-        onConnect,
-        setIsVerificationInProgress,
-    ]);
     const handleNextCallback = useCallback((next, authToken, user) => {
         var _a, _b;
         switch (next === null || next === void 0 ? void 0 : next.callback) {
@@ -125,32 +91,20 @@ const useCustomerCallbacks = ({ callbacks: { onAuthSuccess, onLinkSuccess, onUse
         setIsVerificationInProgress,
     ]);
     useEffect(() => {
-        if (!callbackQueue.length)
-            return;
-        if (!handleConnectOnlyAndCallbackIsConnectSuccess())
-            return;
-        if (!user)
+        if (!callbackQueue.length || !user)
             return;
         const authToken = getAuthToken();
-        if (!authToken)
-            return;
         // checks if user logged in with a wallet, so we need to wait
         // for the primary wallet state to be set
         // if user logged in with email without embedded wallet, then
         // there is no wallet so we can go ahead and run the callback
-        if (user.isAuthenticatedWithAWallet && !primaryWallet) {
+        if (!authToken || (user.isAuthenticatedWithAWallet && !primaryWallet)) {
             return;
         }
         const updatedQueue = [...callbackQueue];
         handleNextCallback(updatedQueue.shift(), authToken, user);
         setCallbackQueue(updatedQueue);
-    }, [
-        callbackQueue,
-        handleConnectOnlyAndCallbackIsConnectSuccess,
-        handleNextCallback,
-        primaryWallet,
-        user,
-    ]);
+    }, [callbackQueue, handleNextCallback, primaryWallet, user]);
     const setCallback = (callback, params) => {
         setCallbackQueue((prev) => [...prev, { callback, params }]);
     };

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

@@ -15,6 +15,8 @@ export type DynamicEvents = {
     embeddedWalletRevealCompleted: (wallet: Wallet) => void;
     embeddedWalletRevealFailed: (error: unknown) => void;
     logout: () => void;
+    /** Triggered when a new wallet is connected in connect-only mode */
+    walletConnected: (wallet: Wallet) => void;
     /** This event is used to trigger logout to be called, DO NOT listen to it. Listen to "logout" instead */
     triggerLogout: () => void;
 };

package/src/lib/modals/TransactionConfirmationModal/TransactionConfirmationModal.cjs

@@ -24,7 +24,6 @@ require('../../context/CaptchaContext/CaptchaContext.cjs');
 require('../../context/ErrorContext/ErrorContext.cjs');
 require('@dynamic-labs/multi-wallet');
 var isMagicConnector = require('../../utils/functions/isMagicConnector/isMagicConnector.cjs');
-var sendTransactionWithAutoNonce = require('../../utils/functions/sendTransactionWithAutoNonce/sendTransactionWithAutoNonce.cjs');
 require('viem/chains');
 require('../../context/AccessDeniedContext/AccessDeniedContext.cjs');
 require('../../context/AccountExistsContext/AccountExistsContext.cjs');
@@ -96,7 +95,7 @@ const TransactionConfirmationModal = ({ title, handler, onReject, onTransactionR
     }, [onTransactionResponseSuccess, onReject]);
     return (jsxRuntime.jsx(Portal.Portal, { handleClose: closeModal, isShown: show, zIndex: index.authModalZIndex, withBackdrop: true, elementId: 'dynamic-send-transaction', transitionEvents: {
             onUnmount: handleOnModalUnmount,
-        }, children: jsxRuntime.jsx(Modal.Modal, { children: jsxRuntime.jsx(ModalCard.ModalCard, { children: jsxRuntime.jsx(TransactionConfirmationView.TransactionConfirmationView, { provider: provider, transaction: transactionWithGasPrice, title: title, copykey: copykey, mutation: () => sendTransactionWithAutoNonce.sendTransactionWithAutoNonce(walletConnector, transactionWithGasPrice, handler), onClickClose: closeModal, onError: (error) => (errorRef.current = error), displayPoweredByDynamicFooter: true, onSuccess: (transactionResponse) => {
+        }, children: jsxRuntime.jsx(Modal.Modal, { children: jsxRuntime.jsx(ModalCard.ModalCard, { children: jsxRuntime.jsx(TransactionConfirmationView.TransactionConfirmationView, { provider: provider, transaction: transactionWithGasPrice, title: title, copykey: copykey, mutation: () => handler(transactionWithGasPrice), onClickClose: closeModal, onError: (error) => (errorRef.current = error), displayPoweredByDynamicFooter: true, onSuccess: (transactionResponse) => {
                         errorRef.current = null;
                         transactionResponseRef.current = transactionResponse;
                         closeModal();

package/src/lib/modals/TransactionConfirmationModal/TransactionConfirmationModal.js

@@ -20,7 +20,6 @@ import '../../context/CaptchaContext/CaptchaContext.js';
 import '../../context/ErrorContext/ErrorContext.js';
 import '@dynamic-labs/multi-wallet';
 import { isMagicConnector } from '../../utils/functions/isMagicConnector/isMagicConnector.js';
-import { sendTransactionWithAutoNonce } from '../../utils/functions/sendTransactionWithAutoNonce/sendTransactionWithAutoNonce.js';
 import 'viem/chains';
 import '../../context/AccessDeniedContext/AccessDeniedContext.js';
 import '../../context/AccountExistsContext/AccountExistsContext.js';
@@ -92,7 +91,7 @@ const TransactionConfirmationModal = ({ title, handler, onReject, onTransactionR
     }, [onTransactionResponseSuccess, onReject]);
     return (jsx(Portal, { handleClose: closeModal, isShown: show, zIndex: authModalZIndex, withBackdrop: true, elementId: 'dynamic-send-transaction', transitionEvents: {
             onUnmount: handleOnModalUnmount,
-        }, children: jsx(Modal, { children: jsx(ModalCard, { children: jsx(TransactionConfirmationView, { provider: provider, transaction: transactionWithGasPrice, title: title, copykey: copykey, mutation: () => sendTransactionWithAutoNonce(walletConnector, transactionWithGasPrice, handler), onClickClose: closeModal, onError: (error) => (errorRef.current = error), displayPoweredByDynamicFooter: true, onSuccess: (transactionResponse) => {
+        }, children: jsx(Modal, { children: jsx(ModalCard, { children: jsx(TransactionConfirmationView, { provider: provider, transaction: transactionWithGasPrice, title: title, copykey: copykey, mutation: () => handler(transactionWithGasPrice), onClickClose: closeModal, onError: (error) => (errorRef.current = error), displayPoweredByDynamicFooter: true, onSuccess: (transactionResponse) => {
                         errorRef.current = null;
                         transactionResponseRef.current = transactionResponse;
                         closeModal();