@dynamic-labs/sdk-react-core 1.2.0-alpha.1 → 1.3.0

package/src/lib/views/SendBalanceView/components/TransactionStage/TransactionStage.js

@@ -1,24 +1,25 @@
 import { __rest } from '../../../../../../_virtual/_tslib.js';
 import { jsx } from 'react/jsx-runtime';
+import { isAccountAbstractionConnector } from '@dynamic-labs/wallet-connector-core';
+import { TransactionConfirmationView } from '../../../TransactionConfirmationView/TransactionConfirmationView.js';
+import { useTransactionWithGasPrice } from '../../../../utils/hooks/useTransactionWithGasPrice/useTransactionWithGasPrice.js';
 import 'react';
-import '../../../../events/dynamicEvents.js';
-import '@dynamic-labs/utils';
 import '../../../../context/DynamicContext/DynamicContext.js';
 import '@dynamic-labs/sdk-api';
 import '../../../../shared/logger.js';
 import '@dynamic-labs/iconic';
-import '@dynamic-labs/wallet-connector-core';
 import '../../../../context/ViewContext/ViewContext.js';
 import '@dynamic-labs/wallet-book';
 import '../../../../utils/constants/colors.js';
 import '../../../../utils/constants/values.js';
 import '../../../../shared/utils/classes/storage/localStorage.js';
 import 'viem';
+import '@dynamic-labs/utils';
 import '../../../../shared/consts/index.js';
+import '../../../../events/dynamicEvents.js';
 import '../../../../context/CaptchaContext/CaptchaContext.js';
 import '../../../../context/ErrorContext/ErrorContext.js';
 import '@dynamic-labs/multi-wallet';
-import { isMagicConnector } from '../../../../utils/functions/isMagicConnector/isMagicConnector.js';
 import 'viem/chains';
 import '../../../../context/AccessDeniedContext/AccessDeniedContext.js';
 import '../../../../context/AccountExistsContext/AccountExistsContext.js';
@@ -27,7 +28,6 @@ import '../../../../context/EmailVerificationContext/EmailVerificationContext.js
 import 'react-dom';
 import '../../../../context/ThemeContext/ThemeContext.js';
 import '@dynamic-labs/types';
-import { useTransactionWithGasPrice } from '../../../../utils/hooks/useTransactionWithGasPrice/useTransactionWithGasPrice.js';
 import 'yup';
 import 'react-i18next';
 import '../../../../context/MockContext/MockContext.js';
@@ -63,18 +63,29 @@ import '../../../../context/FooterAnimationContext/index.js';
 import '../../../../widgets/DynamicWidget/components/DynamicWidgetHeader/DynamicWidgetHeader.js';
 import '../../../../widgets/DynamicWidget/context/DynamicWidgetContext.js';
 import '../../../../components/UserProfile/parts/UserProfileField/components/VerifiedEmailIcon/VerifiedEmailIcon.js';
-import { TransactionConfirmationView } from '../../../TransactionConfirmationView/TransactionConfirmationView.js';
 import '../../../../widgets/DynamicWidget/views/ManagePasskeysWidgetView/PasskeyCard/PasskeyCard.js';
+import { useInternalDynamicContext } from '../../../../context/DynamicContext/useDynamicContext/useInternalDynamicContext.js';
 
+/**
+ * This component is used as a step between the SendBalanceView that defines the transaction
+ * and the TransactionConfirmationView that shows the transaction details and asks for confirmation.
+ * The step is required for the useTransactionWithGasPrice to apply our gas rules to the transaction.
+ */
 const TransactionStage = (_a) => {
-    var { transaction, provider, walletConnector, mutation } = _a, rest = __rest(_a, ["transaction", "provider", "walletConnector", "mutation"]);
+    var { transaction, provider, mutation } = _a, rest = __rest(_a, ["transaction", "provider", "mutation"]);
+    const { primaryWallet } = useInternalDynamicContext();
     const transactionWithGasPrice = useTransactionWithGasPrice({
-        enabled: isMagicConnector(walletConnector),
-        increasePercentage: 5,
+        enabled: !isAccountAbstractionConnector(primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.connector),
         provider,
         transaction,
     });
-    return (jsx(TransactionConfirmationView, Object.assign({ provider: provider, transaction: transactionWithGasPrice, mutation: () => mutation(transactionWithGasPrice) }, rest)));
+    return (jsx(TransactionConfirmationView, Object.assign({ provider: provider, transaction: transactionWithGasPrice, 
+        /**
+         * The mutation function that will be called when the user confirms the transaction
+         * and it will carry the transaction with the gas fee applied to be submitted by the
+         * SendBalanceView component
+         */
+        mutation: () => mutation(transactionWithGasPrice) }, rest)));
 };
 
 export { TransactionStage };

package/src/lib/views/SocialRedirectView/SocialRedirectView.cjs

@@ -62,6 +62,8 @@ require('../../components/Alert/Alert.cjs');
 require('../../components/PasskeyCreatedSuccessBanner/PasskeyCreatedSuccessBanner.cjs');
 require('../../context/PasskeyContext/PasskeyContext.cjs');
 require('@dynamic-labs/viem-utils');
+require('../TransactionConfirmationView/helpers/transactionErrorMessage.cjs');
+require('../../utils/hooks/useTransactionWithGasPrice/useTransactionWithGasPrice.cjs');
 require('../../widgets/DynamicWidget/views/ManagePasskeysWidgetView/PasskeyCard/PasskeyCard.cjs');
 require('../../components/InlineWidget/InlineWidget.cjs');
 require('../../components/IsBrowser/IsBrowser.cjs');

package/src/lib/views/SocialRedirectView/SocialRedirectView.js

@@ -58,6 +58,8 @@ import '../../components/Alert/Alert.js';
 import '../../components/PasskeyCreatedSuccessBanner/PasskeyCreatedSuccessBanner.js';
 import '../../context/PasskeyContext/PasskeyContext.js';
 import '@dynamic-labs/viem-utils';
+import '../TransactionConfirmationView/helpers/transactionErrorMessage.js';
+import '../../utils/hooks/useTransactionWithGasPrice/useTransactionWithGasPrice.js';
 import '../../widgets/DynamicWidget/views/ManagePasskeysWidgetView/PasskeyCard/PasskeyCard.js';
 import '../../components/InlineWidget/InlineWidget.js';
 import '../../components/IsBrowser/IsBrowser.js';

package/src/lib/views/SocialWrongAccountView/SocialWrongAccountView.cjs

@@ -62,6 +62,8 @@ require('../../components/Alert/Alert.cjs');
 require('../../components/PasskeyCreatedSuccessBanner/PasskeyCreatedSuccessBanner.cjs');
 require('../../context/PasskeyContext/PasskeyContext.cjs');
 require('@dynamic-labs/viem-utils');
+require('../TransactionConfirmationView/helpers/transactionErrorMessage.cjs');
+require('../../utils/hooks/useTransactionWithGasPrice/useTransactionWithGasPrice.cjs');
 require('../../widgets/DynamicWidget/views/ManagePasskeysWidgetView/PasskeyCard/PasskeyCard.cjs');
 require('../../components/InlineWidget/InlineWidget.cjs');
 require('../../components/IsBrowser/IsBrowser.cjs');

package/src/lib/views/SocialWrongAccountView/SocialWrongAccountView.js

@@ -58,6 +58,8 @@ import '../../components/Alert/Alert.js';
 import '../../components/PasskeyCreatedSuccessBanner/PasskeyCreatedSuccessBanner.js';
 import '../../context/PasskeyContext/PasskeyContext.js';
 import '@dynamic-labs/viem-utils';
+import '../TransactionConfirmationView/helpers/transactionErrorMessage.js';
+import '../../utils/hooks/useTransactionWithGasPrice/useTransactionWithGasPrice.js';
 import '../../widgets/DynamicWidget/views/ManagePasskeysWidgetView/PasskeyCard/PasskeyCard.js';
 import '../../components/InlineWidget/InlineWidget.js';
 import '../../components/IsBrowser/IsBrowser.js';

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

@@ -79,6 +79,7 @@ require('../../components/UserProfile/parts/UserProfileField/components/Verified
 var useTransactionGas = require('./hooks/useTransactionGas/useTransactionGas.cjs');
 var useTransactionTotal = require('./hooks/useTransactionTotal/useTransactionTotal.cjs');
 var transactionErrorMessage = require('./helpers/transactionErrorMessage.cjs');
+require('../../utils/hooks/useTransactionWithGasPrice/useTransactionWithGasPrice.cjs');
 require('../../widgets/DynamicWidget/views/ManagePasskeysWidgetView/PasskeyCard/PasskeyCard.cjs');
 var useInternalDynamicContext = require('../../context/DynamicContext/useDynamicContext/useInternalDynamicContext.cjs');
 
@@ -95,12 +96,13 @@ const TransactionConfirmationView = ({ transaction, mutation, onError, onSuccess
         const balanceText = yield primaryWallet.connector.getBalance();
         return balanceText ? viem.parseEther(balanceText) : undefined;
     }));
-    const { isLoading: isGasSponsoredLoading } = usePromise.usePromise(() => {
+    const { isLoading: isGasSponsoredLoading, data: canSponsorTransactionGas } = usePromise.usePromise(() => _tslib.__awaiter(void 0, void 0, void 0, function* () {
         if (!walletConnectorCore.isAccountAbstractionConnector(primaryWallet.connector)) {
             return false;
         }
-        return primaryWallet.connector.canSponsorTransactionGas(transaction);
-    }, {
+        const canSponsor = yield primaryWallet.connector.canSponsorTransactionGas(transaction);
+        return canSponsor !== null && canSponsor !== void 0 ? canSponsor : false;
+    }), {
         onReject: (error) => {
             logger.logger.error(error);
         },
@@ -146,7 +148,7 @@ const TransactionConfirmationView = ({ transaction, mutation, onError, onSuccess
         transactionValue,
     });
     const isTransactionLoading = isTransactionValueLoading ||
-        isGasPriceLoading ||
+        (canSponsorTransactionGas ? false : isGasPriceLoading) ||
         isTransactionToAddressLoading ||
         isTransactionFromAddressLoading ||
         isGasSponsoredLoading;

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

@@ -75,6 +75,7 @@ import '../../components/UserProfile/parts/UserProfileField/components/VerifiedE
 import { useTransactionGas } from './hooks/useTransactionGas/useTransactionGas.js';
 import { useTransactionTotal } from './hooks/useTransactionTotal/useTransactionTotal.js';
 import { transactionErrorMessage } from './helpers/transactionErrorMessage.js';
+import '../../utils/hooks/useTransactionWithGasPrice/useTransactionWithGasPrice.js';
 import '../../widgets/DynamicWidget/views/ManagePasskeysWidgetView/PasskeyCard/PasskeyCard.js';
 import { useInternalDynamicContext } from '../../context/DynamicContext/useDynamicContext/useInternalDynamicContext.js';
 
@@ -91,12 +92,13 @@ const TransactionConfirmationView = ({ transaction, mutation, onError, onSuccess
         const balanceText = yield primaryWallet.connector.getBalance();
         return balanceText ? parseEther(balanceText) : undefined;
     }));
-    const { isLoading: isGasSponsoredLoading } = usePromise(() => {
+    const { isLoading: isGasSponsoredLoading, data: canSponsorTransactionGas } = usePromise(() => __awaiter(void 0, void 0, void 0, function* () {
         if (!isAccountAbstractionConnector(primaryWallet.connector)) {
             return false;
         }
-        return primaryWallet.connector.canSponsorTransactionGas(transaction);
-    }, {
+        const canSponsor = yield primaryWallet.connector.canSponsorTransactionGas(transaction);
+        return canSponsor !== null && canSponsor !== void 0 ? canSponsor : false;
+    }), {
         onReject: (error) => {
             logger.error(error);
         },
@@ -142,7 +144,7 @@ const TransactionConfirmationView = ({ transaction, mutation, onError, onSuccess
         transactionValue,
     });
     const isTransactionLoading = isTransactionValueLoading ||
-        isGasPriceLoading ||
+        (canSponsorTransactionGas ? false : isGasPriceLoading) ||
         isTransactionToAddressLoading ||
         isTransactionFromAddressLoading ||
         isGasSponsoredLoading;

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

@@ -18,12 +18,13 @@ require('../../../shared/utils/classes/storage/localStorage.cjs');
 require('viem');
 require('../../../shared/consts/index.cjs');
 
+const magicRpcError = -32603;
 const errorCodesMapping = {
-    '-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.',
     INSUFFICIENT_FUNDS: 'Insufficient funds for this transaction.',
+    [magicRpcError.toString()]: 'A network error has occurred. Please try again later',
 };
 const errorReasonsMapping = {
     'provided ENS name resolves to null': 'Invalid address. Please check that the entered address is correct.',
@@ -33,19 +34,26 @@ const getCode = (error) => {
     const err = error;
     return (err === null || err === void 0 ? void 0 : err.code) || ((_a = err === null || err === void 0 ? void 0 : err.cause) === null || _a === void 0 ? void 0 : _a.code);
 };
+const getMessage = (error) => {
+    const err = error;
+    return err === null || err === void 0 ? void 0 : err.message;
+};
 const hasReason = (error) => 'reason' in error && error.reason !== undefined;
 const transactionErrorMessage = (err) => {
     let error = err;
     if (viemUtils.isTransactionExecutionError(err)) {
         error = err.walk();
     }
-    logger.logger.debug('transaction error]:', error);
+    logger.logger.debug('transaction error:', error);
     if (utils.TransactionGasCannotBeSponsoredError.isInstance(error)) {
         return;
     }
     if (utils.InsufficientFundsError.isInstance(error)) {
         return errorCodesMapping.INSUFFICIENT_FUNDS;
     }
+    if (isMagicInsufficientFundsError(error)) {
+        return errorCodesMapping.INSUFFICIENT_FUNDS;
+    }
     const code = getCode(error);
     if (code !== undefined && errorCodesMapping[code]) {
         return errorCodesMapping[code];
@@ -55,5 +63,11 @@ const transactionErrorMessage = (err) => {
     }
     return 'Something went wrong.';
 };
+const isMagicInsufficientFundsError = (error) => {
+    const code = getCode(error);
+    const message = getMessage(error);
+    return (code === magicRpcError &&
+        Boolean(message === null || message === void 0 ? void 0 : message.includes('insufficient funds for gas * price + value')));
+};
 
 exports.transactionErrorMessage = transactionErrorMessage;

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

@@ -14,12 +14,13 @@ import '../../../shared/utils/classes/storage/localStorage.js';
 import 'viem';
 import '../../../shared/consts/index.js';
 
+const magicRpcError = -32603;
 const errorCodesMapping = {
-    '-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.',
     INSUFFICIENT_FUNDS: 'Insufficient funds for this transaction.',
+    [magicRpcError.toString()]: 'A network error has occurred. Please try again later',
 };
 const errorReasonsMapping = {
     'provided ENS name resolves to null': 'Invalid address. Please check that the entered address is correct.',
@@ -29,19 +30,26 @@ const getCode = (error) => {
     const err = error;
     return (err === null || err === void 0 ? void 0 : err.code) || ((_a = err === null || err === void 0 ? void 0 : err.cause) === null || _a === void 0 ? void 0 : _a.code);
 };
+const getMessage = (error) => {
+    const err = error;
+    return err === null || err === void 0 ? void 0 : err.message;
+};
 const hasReason = (error) => 'reason' in error && error.reason !== undefined;
 const transactionErrorMessage = (err) => {
     let error = err;
     if (isTransactionExecutionError(err)) {
         error = err.walk();
     }
-    logger.debug('transaction error]:', error);
+    logger.debug('transaction error:', error);
     if (TransactionGasCannotBeSponsoredError.isInstance(error)) {
         return;
     }
     if (InsufficientFundsError.isInstance(error)) {
         return errorCodesMapping.INSUFFICIENT_FUNDS;
     }
+    if (isMagicInsufficientFundsError(error)) {
+        return errorCodesMapping.INSUFFICIENT_FUNDS;
+    }
     const code = getCode(error);
     if (code !== undefined && errorCodesMapping[code]) {
         return errorCodesMapping[code];
@@ -51,5 +59,11 @@ const transactionErrorMessage = (err) => {
     }
     return 'Something went wrong.';
 };
+const isMagicInsufficientFundsError = (error) => {
+    const code = getCode(error);
+    const message = getMessage(error);
+    return (code === magicRpcError &&
+        Boolean(message === null || message === void 0 ? void 0 : message.includes('insufficient funds for gas * price + value')));
+};
 
 export { transactionErrorMessage };

package/src/lib/views/TransactionConfirmationView/hooks/useTransactionGas/useTransactionGas.cjs

@@ -2,9 +2,9 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var _tslib = require('../../../../../../_virtual/_tslib.cjs');
 var React = require('react');
 require('../../../../events/dynamicEvents.cjs');
+require('../../../../../../_virtual/_tslib.cjs');
 require('@dynamic-labs/utils');
 require('../../../../context/DynamicContext/DynamicContext.cjs');
 require('@dynamic-labs/sdk-api');
@@ -29,7 +29,6 @@ require('../../../../config/ApiEndpoint.cjs');
 require('../../../../context/EmailVerificationContext/EmailVerificationContext.cjs');
 require('react-dom');
 require('../../../../context/ThemeContext/ThemeContext.cjs');
-var usePromise = require('../../../../utils/hooks/usePromise/usePromise.cjs');
 require('@dynamic-labs/types');
 var useTransactionEstimatedGas = require('../../../../utils/hooks/useTransactionEstimatedGas/useTransactionEstimatedGas.cjs');
 require('yup');
@@ -67,22 +66,39 @@ require('../../../../context/FooterAnimationContext/index.cjs');
 require('../../../../widgets/DynamicWidget/components/DynamicWidgetHeader/DynamicWidgetHeader.cjs');
 require('../../../../widgets/DynamicWidget/context/DynamicWidgetContext.cjs');
 require('../../../../components/UserProfile/parts/UserProfileField/components/VerifiedEmailIcon/VerifiedEmailIcon.cjs');
-require('@dynamic-labs/viem-utils');
+var useEstimateL1Fee = require('../../../../utils/hooks/useEstimateL1Fee/useEstimateL1Fee.cjs');
+require('../../helpers/transactionErrorMessage.cjs');
+require('../../../../utils/hooks/useTransactionWithGasPrice/useTransactionWithGasPrice.cjs');
 require('../../../../widgets/DynamicWidget/views/ManagePasskeysWidgetView/PasskeyCard/PasskeyCard.cjs');
 
+/**
+ * Estimates the total gas price to be paid for the transaction.
+ */
 const useTransactionGas = ({ provider, transaction, }) => {
+    const { data: l1GasPrice } = useEstimateL1Fee.useEstimateL1Fee(provider, transaction);
     const { data: estimatedGas, isLoading: isEstimatedGasLoading } = useTransactionEstimatedGas.useTransactionEstimatedGas(provider, transaction);
-    const { data: gasPrice, isLoading: isLoadingGasPrice } = usePromise.usePromise(() => _tslib.__awaiter(void 0, void 0, void 0, function* () {
-        if (transaction.gasPrice) {
-            const { gasPrice } = transaction;
+    const gasPrice = React.useMemo(() => {
+        const { maxFeePerGas, gasPrice } = transaction;
+        if (gasPrice)
             return gasPrice;
+        if (!maxFeePerGas) {
+            return undefined;
         }
-        return provider.getGasPrice();
-    }), {
-        deps: [transaction.gasPrice],
-    });
-    const gasTotalPrice = React.useMemo(() => (gasPrice && estimatedGas ? gasPrice * estimatedGas : undefined), [gasPrice, estimatedGas]);
-    const isLoading = isEstimatedGasLoading || isLoadingGasPrice;
+        return maxFeePerGas;
+    }, [transaction]);
+    /**
+     * Generates the total gas price to be paid for the transaction.
+     * Gas price is calculated by multiplying the gas price by the estimated gas.
+     * If the chain is L1, the l1 extra gas price is added to the total gas price.
+     */
+    const gasTotalPrice = React.useMemo(() => {
+        const l2GasEstimate = gasPrice && estimatedGas ? gasPrice * estimatedGas : undefined;
+        if (l1GasPrice && l2GasEstimate) {
+            return l2GasEstimate + l1GasPrice;
+        }
+        return l2GasEstimate;
+    }, [gasPrice, estimatedGas, l1GasPrice]);
+    const isLoading = isEstimatedGasLoading;
     const isGasEstimated = Boolean(estimatedGas) && !transaction.gasPrice;
     return {
         gasTotalPrice,

package/src/lib/views/TransactionConfirmationView/hooks/useTransactionGas/useTransactionGas.d.ts

@@ -3,6 +3,9 @@ type UseTransactionGasProps = {
     provider: PublicClient;
     transaction: TransactionRequest;
 };
+/**
+ * Estimates the total gas price to be paid for the transaction.
+ */
 export declare const useTransactionGas: ({ provider, transaction, }: UseTransactionGasProps) => {
     gasTotalPrice: bigint | undefined;
     isGasEstimated: boolean;

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

@@ -1,6 +1,6 @@
-import { __awaiter } from '../../../../../../_virtual/_tslib.js';
 import { useMemo } from 'react';
 import '../../../../events/dynamicEvents.js';
+import '../../../../../../_virtual/_tslib.js';
 import '@dynamic-labs/utils';
 import '../../../../context/DynamicContext/DynamicContext.js';
 import '@dynamic-labs/sdk-api';
@@ -25,7 +25,6 @@ import '../../../../config/ApiEndpoint.js';
 import '../../../../context/EmailVerificationContext/EmailVerificationContext.js';
 import 'react-dom';
 import '../../../../context/ThemeContext/ThemeContext.js';
-import { usePromise } from '../../../../utils/hooks/usePromise/usePromise.js';
 import '@dynamic-labs/types';
 import { useTransactionEstimatedGas } from '../../../../utils/hooks/useTransactionEstimatedGas/useTransactionEstimatedGas.js';
 import 'yup';
@@ -63,22 +62,39 @@ import '../../../../context/FooterAnimationContext/index.js';
 import '../../../../widgets/DynamicWidget/components/DynamicWidgetHeader/DynamicWidgetHeader.js';
 import '../../../../widgets/DynamicWidget/context/DynamicWidgetContext.js';
 import '../../../../components/UserProfile/parts/UserProfileField/components/VerifiedEmailIcon/VerifiedEmailIcon.js';
-import '@dynamic-labs/viem-utils';
+import { useEstimateL1Fee } from '../../../../utils/hooks/useEstimateL1Fee/useEstimateL1Fee.js';
+import '../../helpers/transactionErrorMessage.js';
+import '../../../../utils/hooks/useTransactionWithGasPrice/useTransactionWithGasPrice.js';
 import '../../../../widgets/DynamicWidget/views/ManagePasskeysWidgetView/PasskeyCard/PasskeyCard.js';
 
+/**
+ * Estimates the total gas price to be paid for the transaction.
+ */
 const useTransactionGas = ({ provider, transaction, }) => {
+    const { data: l1GasPrice } = useEstimateL1Fee(provider, transaction);
     const { data: estimatedGas, isLoading: isEstimatedGasLoading } = useTransactionEstimatedGas(provider, transaction);
-    const { data: gasPrice, isLoading: isLoadingGasPrice } = usePromise(() => __awaiter(void 0, void 0, void 0, function* () {
-        if (transaction.gasPrice) {
-            const { gasPrice } = transaction;
+    const gasPrice = useMemo(() => {
+        const { maxFeePerGas, gasPrice } = transaction;
+        if (gasPrice)
             return gasPrice;
+        if (!maxFeePerGas) {
+            return undefined;
         }
-        return provider.getGasPrice();
-    }), {
-        deps: [transaction.gasPrice],
-    });
-    const gasTotalPrice = useMemo(() => (gasPrice && estimatedGas ? gasPrice * estimatedGas : undefined), [gasPrice, estimatedGas]);
-    const isLoading = isEstimatedGasLoading || isLoadingGasPrice;
+        return maxFeePerGas;
+    }, [transaction]);
+    /**
+     * Generates the total gas price to be paid for the transaction.
+     * Gas price is calculated by multiplying the gas price by the estimated gas.
+     * If the chain is L1, the l1 extra gas price is added to the total gas price.
+     */
+    const gasTotalPrice = useMemo(() => {
+        const l2GasEstimate = gasPrice && estimatedGas ? gasPrice * estimatedGas : undefined;
+        if (l1GasPrice && l2GasEstimate) {
+            return l2GasEstimate + l1GasPrice;
+        }
+        return l2GasEstimate;
+    }, [gasPrice, estimatedGas, l1GasPrice]);
+    const isLoading = isEstimatedGasLoading;
     const isGasEstimated = Boolean(estimatedGas) && !transaction.gasPrice;
     return {
         gasTotalPrice,

package/src/lib/views/UserFieldEditorView/UserFieldEditorView.cjs

@@ -62,6 +62,8 @@ require('../../components/Alert/Alert.cjs');
 require('../../components/PasskeyCreatedSuccessBanner/PasskeyCreatedSuccessBanner.cjs');
 require('../../context/PasskeyContext/PasskeyContext.cjs');
 require('@dynamic-labs/viem-utils');
+require('../TransactionConfirmationView/helpers/transactionErrorMessage.cjs');
+require('../../utils/hooks/useTransactionWithGasPrice/useTransactionWithGasPrice.cjs');
 require('../../widgets/DynamicWidget/views/ManagePasskeysWidgetView/PasskeyCard/PasskeyCard.cjs');
 var useAssignDefaultValues = require('./useAssignDefaultValues/useAssignDefaultValues.cjs');
 var UserFieldsToIcon = require('./UserFieldsToIcon/UserFieldsToIcon.cjs');

package/src/lib/views/UserFieldEditorView/UserFieldEditorView.js

@@ -58,6 +58,8 @@ import '../../components/Alert/Alert.js';
 import '../../components/PasskeyCreatedSuccessBanner/PasskeyCreatedSuccessBanner.js';
 import '../../context/PasskeyContext/PasskeyContext.js';
 import '@dynamic-labs/viem-utils';
+import '../TransactionConfirmationView/helpers/transactionErrorMessage.js';
+import '../../utils/hooks/useTransactionWithGasPrice/useTransactionWithGasPrice.js';
 import '../../widgets/DynamicWidget/views/ManagePasskeysWidgetView/PasskeyCard/PasskeyCard.js';
 import { useAssignDefaultValues } from './useAssignDefaultValues/useAssignDefaultValues.js';
 import { UserFieldsToIcon } from './UserFieldsToIcon/UserFieldsToIcon.js';

package/src/lib/views/UserFieldEditorView/useAssignDefaultValues/useAssignDefaultValues.cjs

@@ -66,6 +66,8 @@ require('../../../widgets/DynamicWidget/components/DynamicWidgetHeader/DynamicWi
 require('../../../widgets/DynamicWidget/context/DynamicWidgetContext.cjs');
 require('../../../components/UserProfile/parts/UserProfileField/components/VerifiedEmailIcon/VerifiedEmailIcon.cjs');
 require('@dynamic-labs/viem-utils');
+require('../../TransactionConfirmationView/helpers/transactionErrorMessage.cjs');
+require('../../../utils/hooks/useTransactionWithGasPrice/useTransactionWithGasPrice.cjs');
 require('../../../widgets/DynamicWidget/views/ManagePasskeysWidgetView/PasskeyCard/PasskeyCard.cjs');
 var splitCamelCase = require('../../../shared/utils/functions/splitCamelCase/splitCamelCase.cjs');
 var useInternalDynamicContext = require('../../../context/DynamicContext/useDynamicContext/useInternalDynamicContext.cjs');

package/src/lib/views/UserFieldEditorView/useAssignDefaultValues/useAssignDefaultValues.js

@@ -62,6 +62,8 @@ import '../../../widgets/DynamicWidget/components/DynamicWidgetHeader/DynamicWid
 import '../../../widgets/DynamicWidget/context/DynamicWidgetContext.js';
 import '../../../components/UserProfile/parts/UserProfileField/components/VerifiedEmailIcon/VerifiedEmailIcon.js';
 import '@dynamic-labs/viem-utils';
+import '../../TransactionConfirmationView/helpers/transactionErrorMessage.js';
+import '../../../utils/hooks/useTransactionWithGasPrice/useTransactionWithGasPrice.js';
 import '../../../widgets/DynamicWidget/views/ManagePasskeysWidgetView/PasskeyCard/PasskeyCard.js';
 import { splitCamelCase } from '../../../shared/utils/functions/splitCamelCase/splitCamelCase.js';
 import { useInternalDynamicContext } from '../../../context/DynamicContext/useDynamicContext/useInternalDynamicContext.js';

package/src/lib/views/WalletCannotBeTransferredView/WalletCannotBeTransferredView.cjs

@@ -61,6 +61,8 @@ require('../../components/Alert/Alert.cjs');
 require('../../components/PasskeyCreatedSuccessBanner/PasskeyCreatedSuccessBanner.cjs');
 require('../../context/PasskeyContext/PasskeyContext.cjs');
 require('@dynamic-labs/viem-utils');
+require('../TransactionConfirmationView/helpers/transactionErrorMessage.cjs');
+require('../../utils/hooks/useTransactionWithGasPrice/useTransactionWithGasPrice.cjs');
 require('../../widgets/DynamicWidget/views/ManagePasskeysWidgetView/PasskeyCard/PasskeyCard.cjs');
 require('../../components/InlineWidget/InlineWidget.cjs');
 require('../../components/IsBrowser/IsBrowser.cjs');

package/src/lib/views/WalletCannotBeTransferredView/WalletCannotBeTransferredView.js

@@ -57,6 +57,8 @@ import '../../components/Alert/Alert.js';
 import '../../components/PasskeyCreatedSuccessBanner/PasskeyCreatedSuccessBanner.js';
 import '../../context/PasskeyContext/PasskeyContext.js';
 import '@dynamic-labs/viem-utils';
+import '../TransactionConfirmationView/helpers/transactionErrorMessage.js';
+import '../../utils/hooks/useTransactionWithGasPrice/useTransactionWithGasPrice.js';
 import '../../widgets/DynamicWidget/views/ManagePasskeysWidgetView/PasskeyCard/PasskeyCard.js';
 import '../../components/InlineWidget/InlineWidget.js';
 import '../../components/IsBrowser/IsBrowser.js';

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

@@ -71,6 +71,8 @@ require('../../widgets/DynamicWidget/components/DynamicWidgetHeader/DynamicWidge
 require('../../widgets/DynamicWidget/context/DynamicWidgetContext.cjs');
 require('../../components/UserProfile/parts/UserProfileField/components/VerifiedEmailIcon/VerifiedEmailIcon.cjs');
 require('@dynamic-labs/viem-utils');
+require('../TransactionConfirmationView/helpers/transactionErrorMessage.cjs');
+require('../../utils/hooks/useTransactionWithGasPrice/useTransactionWithGasPrice.cjs');
 require('../../widgets/DynamicWidget/views/ManagePasskeysWidgetView/PasskeyCard/PasskeyCard.cjs');
 
 const WalletGroupView = () => {

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

@@ -67,6 +67,8 @@ import '../../widgets/DynamicWidget/components/DynamicWidgetHeader/DynamicWidget
 import '../../widgets/DynamicWidget/context/DynamicWidgetContext.js';
 import '../../components/UserProfile/parts/UserProfileField/components/VerifiedEmailIcon/VerifiedEmailIcon.js';
 import '@dynamic-labs/viem-utils';
+import '../TransactionConfirmationView/helpers/transactionErrorMessage.js';
+import '../../utils/hooks/useTransactionWithGasPrice/useTransactionWithGasPrice.js';
 import '../../widgets/DynamicWidget/views/ManagePasskeysWidgetView/PasskeyCard/PasskeyCard.js';
 
 const WalletGroupView = () => {

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

@@ -19,7 +19,9 @@ var stroke = require('../../../../shared/assets/stroke.cjs');
 require('../../../../shared/consts/index.cjs');
 var Icon = require('../../../../components/Icon/Icon.cjs');
 var pixelToRem = require('../../../../utils/functions/pixelToRem/pixelToRem.cjs');
+var Badge = require('../../../../components/Badge/Badge.cjs');
 var ListTileAnimatedTrailing = require('../../../../components/ListTileAnimatedTrailing/ListTileAnimatedTrailing.cjs');
+var Typography = require('../../../../components/Typography/Typography.cjs');
 require('../../../../events/dynamicEvents.cjs');
 require('../../../../../../_virtual/_tslib.cjs');
 require('../../../../context/DynamicContext/DynamicContext.cjs');
@@ -49,7 +51,6 @@ require('../../../../components/Transition/OpacityTransition/OpacityTransition.c
 require('../../../../components/ShadowDOM/ShadowDOM.cjs');
 require('../../../../components/OverlayCard/OverlayCard.context.cjs');
 require('../../../../context/FooterAnimationContext/index.cjs');
-var Typography = require('../../../../components/Typography/Typography.cjs');
 require('../../../../context/WalletGroupContext/WalletGroupContext.cjs');
 require('../../../../widgets/DynamicWidget/components/DynamicWidgetHeader/DynamicWidgetHeader.cjs');
 require('react-focus-lock');
@@ -64,8 +65,9 @@ require('../../../../components/Alert/Alert.cjs');
 require('../../../../components/PasskeyCreatedSuccessBanner/PasskeyCreatedSuccessBanner.cjs');
 require('../../../../context/PasskeyContext/PasskeyContext.cjs');
 require('@dynamic-labs/viem-utils');
+require('../../../TransactionConfirmationView/helpers/transactionErrorMessage.cjs');
+require('../../../../utils/hooks/useTransactionWithGasPrice/useTransactionWithGasPrice.cjs');
 require('../../../../widgets/DynamicWidget/views/ManagePasskeysWidgetView/PasskeyCard/PasskeyCard.cjs');
-var Badge = require('../../../../components/Badge/Badge.cjs');
 var ListTile = require('../../../../components/ListTile/ListTile.cjs');
 require('../../../../components/InlineWidget/InlineWidget.cjs');
 require('../../../../components/IsBrowser/IsBrowser.cjs');
@@ -84,12 +86,12 @@ const WalletGroupItem = ({ wallet, onClick, }) => {
     const walletOverride = wallet.group
         ? walletBook.findWalletGroupOverride(walletBook$1, wallet.group, wallet.key)
         : undefined;
-    const labelSettings = getWalletListItemLabel.getWalletListItemLabel({
+    const label = getWalletListItemLabel.getWalletListItemLabel({
         wallet,
     });
     const trailing = (jsxRuntime.jsx(ListTileAnimatedTrailing.ListTileAnimatedTrailing, { hoverElement: 
         // eslint-disable-next-line react/jsx-wrap-multilines
-        jsxRuntime.jsx(Icon.Icon, { color: 'text-tertiary', size: 'mini', children: jsxRuntime.jsx(stroke.ReactComponent, {}) }), children: labelSettings && (jsxRuntime.jsx(Badge.Badge, { dot: !labelSettings.isRecommended, variant: labelSettings.isRecommended ? 'primary' : 'secondary', text: jsxRuntime.jsx(Typography.Typography, { variant: 'body_small', children: labelSettings.label }) })) }));
+        jsxRuntime.jsx(Icon.Icon, { color: 'text-tertiary', size: 'mini', children: jsxRuntime.jsx(stroke.ReactComponent, {}) }), children: label && (jsxRuntime.jsx(Badge.Badge, { dot: true, text: jsxRuntime.jsx(Typography.Typography, { variant: 'body_small', children: label }) })) }));
     const renderChainIcon = React.useMemo(() => {
         const iconStyle = { height: pixelToRem.pixelToRem(28), width: pixelToRem.pixelToRem(28) };
         if (walletOverride === null || walletOverride === void 0 ? void 0 : walletOverride.brand) {

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

@@ -15,7 +15,9 @@ import { ReactComponent as SvgStroke } from '../../../../shared/assets/stroke.js
 import '../../../../shared/consts/index.js';
 import { Icon } from '../../../../components/Icon/Icon.js';
 import { pixelToRem } from '../../../../utils/functions/pixelToRem/pixelToRem.js';
+import { Badge } from '../../../../components/Badge/Badge.js';
 import { ListTileAnimatedTrailing } from '../../../../components/ListTileAnimatedTrailing/ListTileAnimatedTrailing.js';
+import { Typography } from '../../../../components/Typography/Typography.js';
 import '../../../../events/dynamicEvents.js';
 import '../../../../../../_virtual/_tslib.js';
 import '../../../../context/DynamicContext/DynamicContext.js';
@@ -45,7 +47,6 @@ import '../../../../components/Transition/OpacityTransition/OpacityTransition.js
 import '../../../../components/ShadowDOM/ShadowDOM.js';
 import '../../../../components/OverlayCard/OverlayCard.context.js';
 import '../../../../context/FooterAnimationContext/index.js';
-import { Typography } from '../../../../components/Typography/Typography.js';
 import '../../../../context/WalletGroupContext/WalletGroupContext.js';
 import '../../../../widgets/DynamicWidget/components/DynamicWidgetHeader/DynamicWidgetHeader.js';
 import 'react-focus-lock';
@@ -60,8 +61,9 @@ import '../../../../components/Alert/Alert.js';
 import '../../../../components/PasskeyCreatedSuccessBanner/PasskeyCreatedSuccessBanner.js';
 import '../../../../context/PasskeyContext/PasskeyContext.js';
 import '@dynamic-labs/viem-utils';
+import '../../../TransactionConfirmationView/helpers/transactionErrorMessage.js';
+import '../../../../utils/hooks/useTransactionWithGasPrice/useTransactionWithGasPrice.js';
 import '../../../../widgets/DynamicWidget/views/ManagePasskeysWidgetView/PasskeyCard/PasskeyCard.js';
-import { Badge } from '../../../../components/Badge/Badge.js';
 import { ListTile } from '../../../../components/ListTile/ListTile.js';
 import '../../../../components/InlineWidget/InlineWidget.js';
 import '../../../../components/IsBrowser/IsBrowser.js';
@@ -80,12 +82,12 @@ const WalletGroupItem = ({ wallet, onClick, }) => {
     const walletOverride = wallet.group
         ? findWalletGroupOverride(walletBook, wallet.group, wallet.key)
         : undefined;
-    const labelSettings = getWalletListItemLabel({
+    const label = getWalletListItemLabel({
         wallet,
     });
     const trailing = (jsx(ListTileAnimatedTrailing, { hoverElement: 
         // eslint-disable-next-line react/jsx-wrap-multilines
-        jsx(Icon, { color: 'text-tertiary', size: 'mini', children: jsx(SvgStroke, {}) }), children: labelSettings && (jsx(Badge, { dot: !labelSettings.isRecommended, variant: labelSettings.isRecommended ? 'primary' : 'secondary', text: jsx(Typography, { variant: 'body_small', children: labelSettings.label }) })) }));
+        jsx(Icon, { color: 'text-tertiary', size: 'mini', children: jsx(SvgStroke, {}) }), children: label && (jsx(Badge, { dot: true, text: jsx(Typography, { variant: 'body_small', children: label }) })) }));
     const renderChainIcon = useMemo(() => {
         const iconStyle = { height: pixelToRem(28), width: pixelToRem(28) };
         if (walletOverride === null || walletOverride === void 0 ? void 0 : walletOverride.brand) {