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

package/src/lib/views/TransactionConfirmationView/TransactionConfirmationView.js

@@ -7,7 +7,7 @@ import { DynamicError, TransactionGasCannotBeSponsoredError } from '@dynamic-lab
 import { isAccountAbstractionConnector } from '@dynamic-labs/wallet-connector-core';
 import '../../context/DynamicContext/DynamicContext.js';
 import '@dynamic-labs/sdk-api';
-import '../../shared/logger.js';
+import { logger } from '../../shared/logger.js';
 import { getChainIcon } from '../../shared/utils/functions/chain/getChainIcon.js';
 import '@dynamic-labs/wallet-book';
 import { shortenWalletAddress } from '../../shared/utils/functions/shortenWalletAddress/shortenWalletAddress.js';
@@ -96,6 +96,9 @@ const TransactionConfirmationView = ({ transaction, mutation, onError, onSuccess
         }
         return primaryWallet.connector.canSponsorTransactionGas(transaction);
     }, {
+        onReject: (error) => {
+            logger.error(error);
+        },
         onResolve: (isGasSponsored) => {
             const { connector } = primaryWallet;
             setIsGasSponsored(isGasSponsored);
@@ -107,12 +110,14 @@ const TransactionConfirmationView = ({ transaction, mutation, onError, onSuccess
     const { mutate: send, isLoading, error: transactionError, } = useMutation(() => mutation(), {
         onFailure: (error) => {
             if (TransactionGasCannotBeSponsoredError.isInstance(error)) {
+                logger.debug(error);
                 setIsGasSponsored(false);
                 const { connector } = primaryWallet;
                 if (isAccountAbstractionConnector(connector)) {
                     connector.disableGasSponsorshipOnce();
                 }
             }
+            logger.error(error);
             onError === null || onError === void 0 ? void 0 : onError(error);
         },
         onSuccess: (tx) => onSuccess === null || onSuccess === void 0 ? void 0 : onSuccess(tx),

package/src/lib/views/TransactionConfirmationView/helpers/transactionErrorMessage.cjs

@@ -19,7 +19,7 @@ require('viem');
 require('../../../shared/consts/index.cjs');
 
 const errorCodesMapping = {
-    '-32603': 'Could not replace existing transaction',
+    '-32603': 'A network error has occurred. Please try again later',
     0: 'The operation either timed out or was not allowed.',
     16: 'Invalid Passkey signature. Select the passkey for this account and device.',
     3: 'You reached the limit of passkeys for this account.',

package/src/lib/views/TransactionConfirmationView/helpers/transactionErrorMessage.js

@@ -15,7 +15,7 @@ import 'viem';
 import '../../../shared/consts/index.js';
 
 const errorCodesMapping = {
-    '-32603': 'Could not replace existing transaction',
+    '-32603': 'A network error has occurred. Please try again later',
     0: 'The operation either timed out or was not allowed.',
     16: 'Invalid Passkey signature. Select the passkey for this account and device.',
     3: 'You reached the limit of passkeys for this account.',

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

@@ -92,7 +92,7 @@ const EmailOTPConnectorPendingSignModalContent = ({ walletConnector }) => {
             dynamicEvents.dynamicEvents.emit('emailVerificationResult', true, email);
         }),
     });
-    return (jsxRuntime.jsx(OTPVerificationView.OTPVerificationView, { email: email, error: error, isLoading: isLoading, onPinComplete: onSubmit, isValid: isValid === true, onPinChange: () => setError(undefined) }));
+    return (jsxRuntime.jsx(OTPVerificationView.OTPVerificationView, { email: email, error: error, isLoading: isLoading, onPinComplete: onSubmit, retryHandler: walletConnector.retryOneTypePassword.bind(walletConnector), isValid: isValid === true, onPinChange: () => setError(undefined) }));
 };
 
 exports.EmailOTPConnectorPendingSignModalContent = EmailOTPConnectorPendingSignModalContent;

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

@@ -88,7 +88,7 @@ const EmailOTPConnectorPendingSignModalContent = ({ walletConnector }) => {
             dynamicEvents.emit('emailVerificationResult', true, email);
         }),
     });
-    return (jsx(OTPVerificationView, { email: email, error: error, isLoading: isLoading, onPinComplete: onSubmit, isValid: isValid === true, onPinChange: () => setError(undefined) }));
+    return (jsx(OTPVerificationView, { email: email, error: error, isLoading: isLoading, onPinComplete: onSubmit, retryHandler: walletConnector.retryOneTypePassword.bind(walletConnector), isValid: isValid === true, onPinChange: () => setError(undefined) }));
 };
 
 export { EmailOTPConnectorPendingSignModalContent };

package/src/lib/utils/functions/sendTransactionWithAutoNonce/index.d.ts

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

package/src/lib/utils/functions/sendTransactionWithAutoNonce/sendTransactionWithAutoNonce.cjs

@@ -1,49 +0,0 @@
-'use strict';
-
-Object.defineProperty(exports, '__esModule', { value: true });
-
-var _tslib = require('../../../../../_virtual/_tslib.cjs');
-
-const MAGIC_COULD_NOT_REPLACE_TRANSACTION_ERROR_CODE = -32603;
-/**
- * Sends a transaction with an automatically determined nonce, if not provided.
- *
- * In Ethereum, each transaction sent from a particular address must have a unique nonce.
- * If the transaction does not already have a nonce, this function helps to automatically set it.
- * If a transaction with a particular nonce fails due to a "could not replace transaction" error,
- * this function will automatically retry with the next nonce.
- *
- * @param connector - A Dynamic connector to interact with the Ethereum network.
- * @param transaction - The transaction details.
- * @param sendTransactionHandler - A handler function to send the transaction.
- *
- * @returns A promise that resolves to the transaction response.
- */
-const sendTransactionWithAutoNonce = (connector, transaction, sendTransactionHandler) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
-    var _a;
-    if (transaction.nonce !== undefined) {
-        return sendTransactionHandler(transaction);
-    }
-    const publicClient = yield connector.getPublicClient();
-    const walletClient = yield connector.getSigner();
-    const address = (yield walletClient.getAddresses())[0] || ((_a = walletClient.account) === null || _a === void 0 ? void 0 : _a.address);
-    const nonce = yield publicClient.getTransactionCount({
-        address,
-    });
-    const transactionWithNonce = Object.assign(Object.assign({}, transaction), { nonce });
-    try {
-        const response = yield sendTransactionHandler(transactionWithNonce);
-        return response;
-    }
-    catch (err) {
-        if (err.code ===
-            MAGIC_COULD_NOT_REPLACE_TRANSACTION_ERROR_CODE) {
-            const transactionWithNextNonce = Object.assign(Object.assign({}, transaction), { nonce: nonce + 1 });
-            return sendTransactionHandler(transactionWithNextNonce);
-        }
-        throw err;
-    }
-});
-
-exports.MAGIC_COULD_NOT_REPLACE_TRANSACTION_ERROR_CODE = MAGIC_COULD_NOT_REPLACE_TRANSACTION_ERROR_CODE;
-exports.sendTransactionWithAutoNonce = sendTransactionWithAutoNonce;

package/src/lib/utils/functions/sendTransactionWithAutoNonce/sendTransactionWithAutoNonce.d.ts

@@ -1,18 +0,0 @@
-import { TransactionRequest, Address } from 'viem';
-import { WalletConnector } from '../../../..';
-export declare const MAGIC_COULD_NOT_REPLACE_TRANSACTION_ERROR_CODE = -32603;
-/**
- * Sends a transaction with an automatically determined nonce, if not provided.
- *
- * In Ethereum, each transaction sent from a particular address must have a unique nonce.
- * If the transaction does not already have a nonce, this function helps to automatically set it.
- * If a transaction with a particular nonce fails due to a "could not replace transaction" error,
- * this function will automatically retry with the next nonce.
- *
- * @param connector - A Dynamic connector to interact with the Ethereum network.
- * @param transaction - The transaction details.
- * @param sendTransactionHandler - A handler function to send the transaction.
- *
- * @returns A promise that resolves to the transaction response.
- */
-export declare const sendTransactionWithAutoNonce: (connector: WalletConnector, transaction: TransactionRequest, sendTransactionHandler: (transaction: TransactionRequest) => Promise<Address>) => Promise<`0x${string}`>;

package/src/lib/utils/functions/sendTransactionWithAutoNonce/sendTransactionWithAutoNonce.js

@@ -1,44 +0,0 @@
-import { __awaiter } from '../../../../../_virtual/_tslib.js';
-
-const MAGIC_COULD_NOT_REPLACE_TRANSACTION_ERROR_CODE = -32603;
-/**
- * Sends a transaction with an automatically determined nonce, if not provided.
- *
- * In Ethereum, each transaction sent from a particular address must have a unique nonce.
- * If the transaction does not already have a nonce, this function helps to automatically set it.
- * If a transaction with a particular nonce fails due to a "could not replace transaction" error,
- * this function will automatically retry with the next nonce.
- *
- * @param connector - A Dynamic connector to interact with the Ethereum network.
- * @param transaction - The transaction details.
- * @param sendTransactionHandler - A handler function to send the transaction.
- *
- * @returns A promise that resolves to the transaction response.
- */
-const sendTransactionWithAutoNonce = (connector, transaction, sendTransactionHandler) => __awaiter(void 0, void 0, void 0, function* () {
-    var _a;
-    if (transaction.nonce !== undefined) {
-        return sendTransactionHandler(transaction);
-    }
-    const publicClient = yield connector.getPublicClient();
-    const walletClient = yield connector.getSigner();
-    const address = (yield walletClient.getAddresses())[0] || ((_a = walletClient.account) === null || _a === void 0 ? void 0 : _a.address);
-    const nonce = yield publicClient.getTransactionCount({
-        address,
-    });
-    const transactionWithNonce = Object.assign(Object.assign({}, transaction), { nonce });
-    try {
-        const response = yield sendTransactionHandler(transactionWithNonce);
-        return response;
-    }
-    catch (err) {
-        if (err.code ===
-            MAGIC_COULD_NOT_REPLACE_TRANSACTION_ERROR_CODE) {
-            const transactionWithNextNonce = Object.assign(Object.assign({}, transaction), { nonce: nonce + 1 });
-            return sendTransactionHandler(transactionWithNextNonce);
-        }
-        throw err;
-    }
-});
-
-export { MAGIC_COULD_NOT_REPLACE_TRANSACTION_ERROR_CODE, sendTransactionWithAutoNonce };