@dynamic-labs/sdk-react-core 0.18.0-beta.32 → 0.18.0

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

@@ -1,4 +1,3 @@
-import { __awaiter } from '../../../../_virtual/_tslib.js';
 import { jsx } from 'react/jsx-runtime';
 import { useState, useRef } from 'react';
 import { utils } from 'ethers';
@@ -38,9 +37,9 @@ import '../../components/Popper/PopperContext/PopperContext.js';
 import { SendBalancePageLayout } from '../../components/SendBalancePageLayout/SendBalancePageLayout.js';
 import '../../components/InlineWidget/InlineWidget.js';
 import '../../components/MenuList/Dropdown/Dropdown.js';
-import { TransactionConfirmationView } from '../TransactionConfirmationView/TransactionConfirmationView.js';
-import { TransactionStatusLayout } from '../../components/TransactionStatusLayout/TransactionStatusLayout.js';
 import { useFetchCurrency } from '../../widgets/DynamicWidget/hooks/useFetchCurrency/useFetchCurrency.js';
+import { TransactionStatusLayout } from '../../components/TransactionStatusLayout/TransactionStatusLayout.js';
+import { TransactionStage } from './components/TransactionStage/TransactionStage.js';
 import '../../context/MockContext/MockContext.js';
 import '../../context/CaptchaContext/CaptchaContext.js';
 import { usePromise } from '../../utils/hooks/usePromise/usePromise.js';
@@ -48,18 +47,19 @@ import '../../utils/hooks/useUserUpdateRequest/useUserUpdateRequest.js';
 
 const SendBalanceView = ({ initialRecipientAddress = '', initialValue, onClickBack, onClickClose, onError, onSuccess, onDone, displayPoweredByDynamicFooter = false, }) => {
     const [stage, setStage] = useState('form');
-    const { primaryWallet, walletUiUtils, network } = useInternalDynamicContext();
+    const { primaryWallet, network } = useInternalDynamicContext();
     const [value, setValue] = useState(initialValue !== null && initialValue !== void 0 ? initialValue : null);
     const [recipientAddress, setRecipientAddress] = useState(initialRecipientAddress);
     const transactionRef = useRef(null);
     if (!primaryWallet) {
         throw new DynamicError('Primary wallet is not available, send balance cannot be displayed');
     }
-    const { data: balance } = usePromise(() => primaryWallet.connector.getBalance());
-    const { data: provider } = usePromise(() => primaryWallet.connector.getWeb3Provider());
-    const evmNetworks = ((primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.connector) &&
-        primaryWallet.connector.evmNetworks) ||
-        [];
+    const walletConnector = primaryWallet.connector;
+    const { data: balance } = usePromise(() => walletConnector.getBalance(), {
+        deps: [walletConnector],
+    });
+    const { data: provider } = usePromise(() => walletConnector.getWeb3Provider(), { deps: [walletConnector] });
+    const evmNetworks = (walletConnector && walletConnector.evmNetworks) || [];
     const evmNetwork = evmNetworks.find((evmNetwork) => evmNetwork.chainId === network);
     const networkIcon = evmNetwork && (jsx("img", { src: evmNetwork === null || evmNetwork === void 0 ? void 0 : evmNetwork.iconUrls[0], alt: `${evmNetwork === null || evmNetwork === void 0 ? void 0 : evmNetwork.name} icon` }));
     const networkName = (evmNetwork === null || evmNetwork === void 0 ? void 0 : evmNetwork.vanityName) || (evmNetwork === null || evmNetwork === void 0 ? void 0 : evmNetwork.name);
@@ -84,16 +84,11 @@ const SendBalanceView = ({ initialRecipientAddress = '', initialValue, onClickBa
             to: recipientAddress,
             value,
         };
-        return (jsx(TransactionConfirmationView, { provider: provider, transaction: transaction, title: 'Confirm transaction', onClickBack: () => setStage('form'), onError: onError, displayPoweredByDynamicFooter: displayPoweredByDynamicFooter, onSuccess: (transaction) => {
+        return (jsx(TransactionStage, { walletConnector: walletConnector, provider: provider, transaction: transaction, title: 'Confirm transaction', onClickBack: () => setStage('form'), onError: onError, displayPoweredByDynamicFooter: displayPoweredByDynamicFooter, onSuccess: (transaction) => {
                 transactionRef.current = transaction;
                 setStage('success');
                 onSuccess === null || onSuccess === void 0 ? void 0 : onSuccess(transactionRef.current);
-            }, mutation: () => __awaiter(void 0, void 0, void 0, function* () {
-                walletUiUtils.disabledConfirmationOnce();
-                const signer = provider.getSigner();
-                const sentTransaction = yield signer.sendTransaction(transaction);
-                return sentTransaction;
-            }) }));
+            } }));
     };
     const buildSuccessState = () => {
         var _a;

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

@@ -0,0 +1,66 @@
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+var _tslib = require('../../../../../../_virtual/_tslib.cjs');
+var jsxRuntime = require('react/jsx-runtime');
+require('react');
+require('@dynamic-labs/utils');
+require('@dynamic-labs/sdk-api');
+require('../../../../config/ApiEndpoint.cjs');
+require('../../../../shared/logger.cjs');
+require('@dynamic-labs/iconic');
+require('@dynamic-labs/wallet-connector-core');
+require('../../../../context/ViewContext/ViewContext.cjs');
+require('@dynamic-labs/wallet-book');
+require('../../../../utils/constants/colors.cjs');
+require('../../../../shared/utils/classes/storage/localStorage.cjs');
+require('ethers');
+require('../../../../shared/consts/index.cjs');
+require('@dynamic-labs/multi-wallet');
+var isMagicConnector = require('../../../../utils/functions/isMagicConnector/isMagicConnector.cjs');
+require('@dynamic-labs/rpc-providers');
+require('../../../../utils/hooks/useWallets/utils/verifyMagicIsSetup/verifyMagicIsSetup.cjs');
+var useInternalDynamicContext = require('../../../../context/DynamicContext/useInternalDynamicContext.cjs');
+require('../../../../context/ErrorContext/ErrorContext.cjs');
+require('../../../../context/AccessDeniedContext/AccessDeniedContext.cjs');
+require('../../../../context/AccountExistsContext/AccountExistsContext.cjs');
+require('react-dom');
+require('../../../../components/ShadowDOM/ShadowDOM.cjs');
+require('../../../../context/ThemeContext/ThemeContext.cjs');
+require('react-focus-lock');
+require('../../../../components/Transition/ZoomTransition/ZoomTransition.cjs');
+require('../../../../components/Transition/SlideInUpTransition/SlideInUpTransition.cjs');
+require('../../../../components/Transition/OpacityTransition/OpacityTransition.cjs');
+require('../../../../components/IconButton/IconButton.cjs');
+require('../../../../components/Alert/Alert.cjs');
+require('../../../../components/Popper/Popper/Popper.cjs');
+require('../../../../components/Popper/PopperContext/PopperContext.cjs');
+require('formik');
+require('yup');
+require('../../../../components/InlineWidget/InlineWidget.cjs');
+require('../../../../components/MenuList/Dropdown/Dropdown.cjs');
+var TransactionConfirmationView = require('../../../TransactionConfirmationView/TransactionConfirmationView.cjs');
+require('../../../../context/MockContext/MockContext.cjs');
+require('../../../../context/CaptchaContext/CaptchaContext.cjs');
+require('../../../../utils/hooks/useUserUpdateRequest/useUserUpdateRequest.cjs');
+var useTransactionWithGasPrice = require('../../../../utils/hooks/useTransactionWithGasPrice/useTransactionWithGasPrice.cjs');
+
+const TransactionStage = (_a) => {
+    var { transaction, provider, walletConnector } = _a, rest = _tslib.__rest(_a, ["transaction", "provider", "walletConnector"]);
+    const { walletUiUtils } = useInternalDynamicContext.useInternalDynamicContext();
+    const transactionWithGasPrice = useTransactionWithGasPrice.useTransactionWithGasPrice({
+        enabled: isMagicConnector.isMagicConnector(walletConnector),
+        increasePercentage: 5,
+        provider,
+        transaction,
+    });
+    return (jsxRuntime.jsx(TransactionConfirmationView.TransactionConfirmationView, Object.assign({ provider: provider, transaction: transactionWithGasPrice, mutation: () => _tslib.__awaiter(void 0, void 0, void 0, function* () {
+            walletUiUtils.disabledConfirmationOnce();
+            const signer = provider.getSigner();
+            const sentTransaction = yield signer.sendTransaction(transactionWithGasPrice);
+            return sentTransaction;
+        }) }, rest)));
+};
+
+exports.TransactionStage = TransactionStage;

package/src/lib/views/SendBalanceView/components/TransactionStage/TransactionStage.d.ts

@@ -0,0 +1,8 @@
+import { FC } from 'react';
+import { WalletConnector } from '@dynamic-labs/wallet-connector-core';
+import { TransactionConfirmationViewProps } from '../../../TransactionConfirmationView';
+type TransactionStageProps = Omit<TransactionConfirmationViewProps, 'mutation'> & {
+    walletConnector: WalletConnector;
+};
+export declare const TransactionStage: FC<TransactionStageProps>;
+export {};

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

@@ -0,0 +1,62 @@
+import { __rest, __awaiter } from '../../../../../../_virtual/_tslib.js';
+import { jsx } from 'react/jsx-runtime';
+import 'react';
+import '@dynamic-labs/utils';
+import '@dynamic-labs/sdk-api';
+import '../../../../config/ApiEndpoint.js';
+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 '../../../../shared/utils/classes/storage/localStorage.js';
+import 'ethers';
+import '../../../../shared/consts/index.js';
+import '@dynamic-labs/multi-wallet';
+import { isMagicConnector } from '../../../../utils/functions/isMagicConnector/isMagicConnector.js';
+import '@dynamic-labs/rpc-providers';
+import '../../../../utils/hooks/useWallets/utils/verifyMagicIsSetup/verifyMagicIsSetup.js';
+import { useInternalDynamicContext } from '../../../../context/DynamicContext/useInternalDynamicContext.js';
+import '../../../../context/ErrorContext/ErrorContext.js';
+import '../../../../context/AccessDeniedContext/AccessDeniedContext.js';
+import '../../../../context/AccountExistsContext/AccountExistsContext.js';
+import 'react-dom';
+import '../../../../components/ShadowDOM/ShadowDOM.js';
+import '../../../../context/ThemeContext/ThemeContext.js';
+import 'react-focus-lock';
+import '../../../../components/Transition/ZoomTransition/ZoomTransition.js';
+import '../../../../components/Transition/SlideInUpTransition/SlideInUpTransition.js';
+import '../../../../components/Transition/OpacityTransition/OpacityTransition.js';
+import '../../../../components/IconButton/IconButton.js';
+import '../../../../components/Alert/Alert.js';
+import '../../../../components/Popper/Popper/Popper.js';
+import '../../../../components/Popper/PopperContext/PopperContext.js';
+import 'formik';
+import 'yup';
+import '../../../../components/InlineWidget/InlineWidget.js';
+import '../../../../components/MenuList/Dropdown/Dropdown.js';
+import { TransactionConfirmationView } from '../../../TransactionConfirmationView/TransactionConfirmationView.js';
+import '../../../../context/MockContext/MockContext.js';
+import '../../../../context/CaptchaContext/CaptchaContext.js';
+import '../../../../utils/hooks/useUserUpdateRequest/useUserUpdateRequest.js';
+import { useTransactionWithGasPrice } from '../../../../utils/hooks/useTransactionWithGasPrice/useTransactionWithGasPrice.js';
+
+const TransactionStage = (_a) => {
+    var { transaction, provider, walletConnector } = _a, rest = __rest(_a, ["transaction", "provider", "walletConnector"]);
+    const { walletUiUtils } = useInternalDynamicContext();
+    const transactionWithGasPrice = useTransactionWithGasPrice({
+        enabled: isMagicConnector(walletConnector),
+        increasePercentage: 5,
+        provider,
+        transaction,
+    });
+    return (jsx(TransactionConfirmationView, Object.assign({ provider: provider, transaction: transactionWithGasPrice, mutation: () => __awaiter(void 0, void 0, void 0, function* () {
+            walletUiUtils.disabledConfirmationOnce();
+            const signer = provider.getSigner();
+            const sentTransaction = yield signer.sendTransaction(transactionWithGasPrice);
+            return sentTransaction;
+        }) }, rest)));
+};
+
+export { TransactionStage };

package/src/lib/views/SendBalanceView/components/TransactionStage/index.d.ts

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

package/src/lib/views/SendBalanceView/components/index.d.ts

@@ -0,0 +1 @@
+export * from './TransactionStage';

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

@@ -47,14 +47,13 @@ require('../../components/InlineWidget/InlineWidget.cjs');
 require('../../components/MenuList/Dropdown/Dropdown.cjs');
 var SocialRedirectContext = require('../../context/SocialRedirectContext/SocialRedirectContext.cjs');
 
-const capitalize = (str) => str.charAt(0).toUpperCase() + str.slice(1);
 const SocialRedirectView = () => {
     const { socialProvider, socialWalletConnector } = SocialRedirectContext.useSocialRedirectContext();
     const getSocialIcon = useGetSocialIcon.useGetSocialIcon();
     if (!socialWalletConnector || !socialProvider) {
         return null;
     }
-    return (jsxRuntime.jsxs("div", Object.assign({ className: classNames.classNames('social-redirect-view__container') }, { children: [jsxRuntime.jsx(IconWithSpinner.IconWithSpinner, { iconSize: 64, Icon: getSocialIcon(socialProvider), isSpinning: true }), jsxRuntime.jsxs(Typography.Typography, Object.assign({ weight: 'medium', variant: 'title', className: classNames.classNames('social-redirect-view__title') }, { children: ["Connecting to ", capitalize(socialProvider), "..."] }))] })));
+    return (jsxRuntime.jsxs("div", Object.assign({ className: classNames.classNames('social-redirect-view__container') }, { children: [jsxRuntime.jsx(IconWithSpinner.IconWithSpinner, { iconSize: 64, Icon: getSocialIcon(socialProvider), isSpinning: true }), jsxRuntime.jsx(Typography.Typography, Object.assign({ weight: 'medium', variant: 'title', className: classNames.classNames('social-redirect-view__title') }, { children: "Logging you in" }))] })));
 };
 
 exports.SocialRedirectView = SocialRedirectView;

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

@@ -43,14 +43,13 @@ import '../../components/InlineWidget/InlineWidget.js';
 import '../../components/MenuList/Dropdown/Dropdown.js';
 import { useSocialRedirectContext } from '../../context/SocialRedirectContext/SocialRedirectContext.js';
 
-const capitalize = (str) => str.charAt(0).toUpperCase() + str.slice(1);
 const SocialRedirectView = () => {
     const { socialProvider, socialWalletConnector } = useSocialRedirectContext();
     const getSocialIcon = useGetSocialIcon();
     if (!socialWalletConnector || !socialProvider) {
         return null;
     }
-    return (jsxs("div", Object.assign({ className: classNames('social-redirect-view__container') }, { children: [jsx(IconWithSpinner, { iconSize: 64, Icon: getSocialIcon(socialProvider), isSpinning: true }), jsxs(Typography, Object.assign({ weight: 'medium', variant: 'title', className: classNames('social-redirect-view__title') }, { children: ["Connecting to ", capitalize(socialProvider), "..."] }))] })));
+    return (jsxs("div", Object.assign({ className: classNames('social-redirect-view__container') }, { children: [jsx(IconWithSpinner, { iconSize: 64, Icon: getSocialIcon(socialProvider), isSpinning: true }), jsx(Typography, Object.assign({ weight: 'medium', variant: 'title', className: classNames('social-redirect-view__title') }, { children: "Logging you in" }))] })));
 };
 
 export { SocialRedirectView };

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

@@ -2,6 +2,7 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
+var _tslib = require('../../../../_virtual/_tslib.cjs');
 var jsxRuntime = require('react/jsx-runtime');
 var React = require('react');
 var ethers = require('ethers');
@@ -46,7 +47,8 @@ require('yup');
 require('../../components/InlineWidget/InlineWidget.cjs');
 require('../../components/MenuList/Dropdown/Dropdown.cjs');
 var useFetchCurrency = require('../../widgets/DynamicWidget/hooks/useFetchCurrency/useFetchCurrency.cjs');
-var useTransactionData = require('./hooks/useTransactionData/useTransactionData.cjs');
+var useTransactionGas = require('./hooks/useTransactionGas/useTransactionGas.cjs');
+var useTransactionTotal = require('./hooks/useTransactionTotal/useTransactionTotal.cjs');
 var transactionErrorMessage = require('./helpers/transactionErrorMessage.cjs');
 require('../../context/MockContext/MockContext.cjs');
 require('../../context/CaptchaContext/CaptchaContext.cjs');
@@ -68,10 +70,24 @@ const TransactionConfirmationView = ({ provider, transaction, mutation, onError,
         onFailure: (error) => onError === null || onError === void 0 ? void 0 : onError(error),
         onSuccess: (tx) => onSuccess === null || onSuccess === void 0 ? void 0 : onSuccess(tx),
     });
-    const { isLoading: isLoadingTransaction, isTransactionFromAddressLoading, isTransactionToAddressLoading, transactionFromAddress, transactionToAddress, isEffectiveValueLoading, transactionValue, gasEstimate, isGasPriceLoading, total, } = useTransactionData.useTransactionData({
+    const { isLoading: isGasPriceLoading, gasTotalPrice, isGasEstimated, } = useTransactionGas.useTransactionGas({
         provider,
         transaction,
     });
+    const { data: transactionToAddress, isLoading: isTransactionToAddressLoading, } = usePromise.usePromise(() => transaction.to);
+    const { data: transactionFromAddress, isLoading: isTransactionFromAddressLoading, } = usePromise.usePromise(() => transaction.from);
+    const { data: transactionValue, isLoading: isTransactionValueLoading } = usePromise.usePromise(() => _tslib.__awaiter(void 0, void 0, void 0, function* () {
+        const val = yield transaction.value;
+        return val ? ethers.ethers.BigNumber.from(val) : undefined;
+    }));
+    const total = useTransactionTotal.useTransactionTotal({
+        gasTotalPrice,
+        transactionValue,
+    });
+    const isTransactionLoading = isTransactionValueLoading ||
+        isGasPriceLoading ||
+        isTransactionToAddressLoading ||
+        isTransactionFromAddressLoading;
     const ChainIconComponent = getChainIcon.getChainIcon(primaryWallet.chain);
     const chainIcon = (jsxRuntime.jsx(Icon.Icon, Object.assign({ size: 'small' }, { children: jsxRuntime.jsx(ChainIconComponent, {}) })));
     const errorMessage = transactionError && transactionErrorMessage.transactionErrorMessage(transactionError);
@@ -92,8 +108,10 @@ const TransactionConfirmationView = ({ provider, transaction, mutation, onError,
         const amountLeft = formatBigNumber.formatBigNumber(missingFunds, 5);
         return `Insufficient funds due to gas price increase from estimate. Please add ${amountLeft} ${currencySymbol} to continue.`;
     }, [currencySymbol, hasInsufficientFunds, missingFunds]);
-    return (jsxRuntime.jsxs(TransactionConfirmationPageLayout.TransactionConfirmationPageLayout, Object.assign({ onClickBack: onClickBack, onClickClose: onClickClose, title: title, appOrigin: appOrigin, appName: appName, appLogoUrl: appLogoUrl, isLoading: isLoading, onClickSend: () => send(), displayPoweredByDynamicFooter: displayPoweredByDynamicFooter, disableSendButton: isLoadingTransaction || hasInsufficientFunds, error: errorMessage, warningMessage: warningMessage }, { children: [jsxRuntime.jsx(TransactionRow.TransactionRow, Object.assign({ label: 'From (You)', isLoading: isTransactionFromAddressLoading, title: transactionFromAddress }, { children: shortenWalletAddress.shortenWalletAddress(transactionFromAddress, 4, 4) })), jsxRuntime.jsx(TransactionRow.TransactionRow, Object.assign({ label: 'To', isLoading: isTransactionToAddressLoading, title: transactionToAddress }, { children: transactionToAddress &&
-                    shortenWalletAddress.shortenWalletAddress(transactionToAddress, 4, 4) })), jsxRuntime.jsx(TransactionRow.TransactionRow, Object.assign({ label: 'Amount', isLoading: isEffectiveValueLoading, isEmpty: !transactionValue, title: transactionValue && formatBigNumber.formatBigNumber(transactionValue), suffix: currencySymbol, icon: chainIcon, dataTestId: 'transaction-amount' }, { children: transactionValue ? formatBigNumber.formatBigNumber(transactionValue, 10) : 0 })), jsxRuntime.jsx(TransactionRow.TransactionRow, Object.assign({ label: 'Gas (estimated)', isEmpty: !gasEstimate, isLoading: isGasPriceLoading, title: gasEstimate && formatBigNumber.formatBigNumber(gasEstimate), suffix: gasEstimate && currencySymbol, icon: gasEstimate && chainIcon, dataTestId: 'transaction-gas-free' }, { children: gasEstimate ? formatBigNumber.formatBigNumber(gasEstimate, 10) : 'N/A' })), jsxRuntime.jsx(TransactionRow.TransactionRow, Object.assign({ label: 'Total', isEmpty: !total, title: total && formatBigNumber.formatBigNumber(total), suffix: total && currencySymbol, icon: total && chainIcon, dataTestId: 'transaction-total' }, { children: total ? formatBigNumber.formatBigNumber(total, 10) : 'N/A' }))] })));
+    return (jsxRuntime.jsxs(TransactionConfirmationPageLayout.TransactionConfirmationPageLayout, Object.assign({ onClickBack: onClickBack, onClickClose: onClickClose, title: title, appOrigin: appOrigin, appName: appName, appLogoUrl: appLogoUrl, isLoading: isLoading, onClickSend: () => send(), displayPoweredByDynamicFooter: displayPoweredByDynamicFooter, disableSendButton: isTransactionLoading || hasInsufficientFunds, error: errorMessage, warningMessage: warningMessage }, { children: [jsxRuntime.jsx(TransactionRow.TransactionRow, Object.assign({ label: 'From (You)', isLoading: isTransactionFromAddressLoading, title: transactionFromAddress }, { children: shortenWalletAddress.shortenWalletAddress(transactionFromAddress, 4, 4) })), jsxRuntime.jsx(TransactionRow.TransactionRow, Object.assign({ label: 'To', isLoading: isTransactionToAddressLoading, title: transactionToAddress }, { children: transactionToAddress &&
+                    shortenWalletAddress.shortenWalletAddress(transactionToAddress, 4, 4) })), jsxRuntime.jsx(TransactionRow.TransactionRow, Object.assign({ label: 'Amount', isLoading: isTransactionValueLoading, isEmpty: !transactionValue, title: transactionValue && formatBigNumber.formatBigNumber(transactionValue), suffix: currencySymbol, icon: chainIcon, dataTestId: 'transaction-amount' }, { children: transactionValue ? formatBigNumber.formatBigNumber(transactionValue, 10) : 0 })), jsxRuntime.jsx(TransactionRow.TransactionRow, Object.assign({ label: isGasEstimated ? 'Gas (estimate)' : 'Gas', isEmpty: !gasTotalPrice, isLoading: isGasPriceLoading, title: gasTotalPrice && formatBigNumber.formatBigNumber(gasTotalPrice), suffix: gasTotalPrice && currencySymbol, icon: gasTotalPrice && chainIcon, dataTestId: isGasEstimated
+                    ? 'transaction-estimated-gas-fee'
+                    : 'transaction-gas-fee' }, { children: gasTotalPrice ? formatBigNumber.formatBigNumber(gasTotalPrice, 10) : 'N/A' })), jsxRuntime.jsx(TransactionRow.TransactionRow, Object.assign({ label: 'Total', isEmpty: !total, title: total && formatBigNumber.formatBigNumber(total), suffix: total && currencySymbol, icon: total && chainIcon, dataTestId: 'transaction-total' }, { children: total ? formatBigNumber.formatBigNumber(total, 10) : 'N/A' }))] })));
 };
 
 exports.TransactionConfirmationView = TransactionConfirmationView;

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

@@ -1,3 +1,4 @@
+import { __awaiter } from '../../../../_virtual/_tslib.js';
 import { jsx, jsxs } from 'react/jsx-runtime';
 import { useMemo } from 'react';
 import { ethers } from 'ethers';
@@ -42,7 +43,8 @@ import 'yup';
 import '../../components/InlineWidget/InlineWidget.js';
 import '../../components/MenuList/Dropdown/Dropdown.js';
 import { useFetchCurrency } from '../../widgets/DynamicWidget/hooks/useFetchCurrency/useFetchCurrency.js';
-import { useTransactionData } from './hooks/useTransactionData/useTransactionData.js';
+import { useTransactionGas } from './hooks/useTransactionGas/useTransactionGas.js';
+import { useTransactionTotal } from './hooks/useTransactionTotal/useTransactionTotal.js';
 import { transactionErrorMessage } from './helpers/transactionErrorMessage.js';
 import '../../context/MockContext/MockContext.js';
 import '../../context/CaptchaContext/CaptchaContext.js';
@@ -64,10 +66,24 @@ const TransactionConfirmationView = ({ provider, transaction, mutation, onError,
         onFailure: (error) => onError === null || onError === void 0 ? void 0 : onError(error),
         onSuccess: (tx) => onSuccess === null || onSuccess === void 0 ? void 0 : onSuccess(tx),
     });
-    const { isLoading: isLoadingTransaction, isTransactionFromAddressLoading, isTransactionToAddressLoading, transactionFromAddress, transactionToAddress, isEffectiveValueLoading, transactionValue, gasEstimate, isGasPriceLoading, total, } = useTransactionData({
+    const { isLoading: isGasPriceLoading, gasTotalPrice, isGasEstimated, } = useTransactionGas({
         provider,
         transaction,
     });
+    const { data: transactionToAddress, isLoading: isTransactionToAddressLoading, } = usePromise(() => transaction.to);
+    const { data: transactionFromAddress, isLoading: isTransactionFromAddressLoading, } = usePromise(() => transaction.from);
+    const { data: transactionValue, isLoading: isTransactionValueLoading } = usePromise(() => __awaiter(void 0, void 0, void 0, function* () {
+        const val = yield transaction.value;
+        return val ? ethers.BigNumber.from(val) : undefined;
+    }));
+    const total = useTransactionTotal({
+        gasTotalPrice,
+        transactionValue,
+    });
+    const isTransactionLoading = isTransactionValueLoading ||
+        isGasPriceLoading ||
+        isTransactionToAddressLoading ||
+        isTransactionFromAddressLoading;
     const ChainIconComponent = getChainIcon(primaryWallet.chain);
     const chainIcon = (jsx(Icon, Object.assign({ size: 'small' }, { children: jsx(ChainIconComponent, {}) })));
     const errorMessage = transactionError && transactionErrorMessage(transactionError);
@@ -88,8 +104,10 @@ const TransactionConfirmationView = ({ provider, transaction, mutation, onError,
         const amountLeft = formatBigNumber(missingFunds, 5);
         return `Insufficient funds due to gas price increase from estimate. Please add ${amountLeft} ${currencySymbol} to continue.`;
     }, [currencySymbol, hasInsufficientFunds, missingFunds]);
-    return (jsxs(TransactionConfirmationPageLayout, Object.assign({ onClickBack: onClickBack, onClickClose: onClickClose, title: title, appOrigin: appOrigin, appName: appName, appLogoUrl: appLogoUrl, isLoading: isLoading, onClickSend: () => send(), displayPoweredByDynamicFooter: displayPoweredByDynamicFooter, disableSendButton: isLoadingTransaction || hasInsufficientFunds, error: errorMessage, warningMessage: warningMessage }, { children: [jsx(TransactionRow, Object.assign({ label: 'From (You)', isLoading: isTransactionFromAddressLoading, title: transactionFromAddress }, { children: shortenWalletAddress(transactionFromAddress, 4, 4) })), jsx(TransactionRow, Object.assign({ label: 'To', isLoading: isTransactionToAddressLoading, title: transactionToAddress }, { children: transactionToAddress &&
-                    shortenWalletAddress(transactionToAddress, 4, 4) })), jsx(TransactionRow, Object.assign({ label: 'Amount', isLoading: isEffectiveValueLoading, isEmpty: !transactionValue, title: transactionValue && formatBigNumber(transactionValue), suffix: currencySymbol, icon: chainIcon, dataTestId: 'transaction-amount' }, { children: transactionValue ? formatBigNumber(transactionValue, 10) : 0 })), jsx(TransactionRow, Object.assign({ label: 'Gas (estimated)', isEmpty: !gasEstimate, isLoading: isGasPriceLoading, title: gasEstimate && formatBigNumber(gasEstimate), suffix: gasEstimate && currencySymbol, icon: gasEstimate && chainIcon, dataTestId: 'transaction-gas-free' }, { children: gasEstimate ? formatBigNumber(gasEstimate, 10) : 'N/A' })), jsx(TransactionRow, Object.assign({ label: 'Total', isEmpty: !total, title: total && formatBigNumber(total), suffix: total && currencySymbol, icon: total && chainIcon, dataTestId: 'transaction-total' }, { children: total ? formatBigNumber(total, 10) : 'N/A' }))] })));
+    return (jsxs(TransactionConfirmationPageLayout, Object.assign({ onClickBack: onClickBack, onClickClose: onClickClose, title: title, appOrigin: appOrigin, appName: appName, appLogoUrl: appLogoUrl, isLoading: isLoading, onClickSend: () => send(), displayPoweredByDynamicFooter: displayPoweredByDynamicFooter, disableSendButton: isTransactionLoading || hasInsufficientFunds, error: errorMessage, warningMessage: warningMessage }, { children: [jsx(TransactionRow, Object.assign({ label: 'From (You)', isLoading: isTransactionFromAddressLoading, title: transactionFromAddress }, { children: shortenWalletAddress(transactionFromAddress, 4, 4) })), jsx(TransactionRow, Object.assign({ label: 'To', isLoading: isTransactionToAddressLoading, title: transactionToAddress }, { children: transactionToAddress &&
+                    shortenWalletAddress(transactionToAddress, 4, 4) })), jsx(TransactionRow, Object.assign({ label: 'Amount', isLoading: isTransactionValueLoading, isEmpty: !transactionValue, title: transactionValue && formatBigNumber(transactionValue), suffix: currencySymbol, icon: chainIcon, dataTestId: 'transaction-amount' }, { children: transactionValue ? formatBigNumber(transactionValue, 10) : 0 })), jsx(TransactionRow, Object.assign({ label: isGasEstimated ? 'Gas (estimate)' : 'Gas', isEmpty: !gasTotalPrice, isLoading: isGasPriceLoading, title: gasTotalPrice && formatBigNumber(gasTotalPrice), suffix: gasTotalPrice && currencySymbol, icon: gasTotalPrice && chainIcon, dataTestId: isGasEstimated
+                    ? 'transaction-estimated-gas-fee'
+                    : 'transaction-gas-fee' }, { children: gasTotalPrice ? formatBigNumber(gasTotalPrice, 10) : 'N/A' })), jsx(TransactionRow, Object.assign({ label: 'Total', isEmpty: !total, title: total && formatBigNumber(total), suffix: total && currencySymbol, icon: total && chainIcon, dataTestId: 'transaction-total' }, { children: total ? formatBigNumber(total, 10) : 'N/A' }))] })));
 };
 
 export { TransactionConfirmationView };

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

@@ -1 +1,2 @@
-export * from './useTransactionData';
+export * from './useTransactionGas';
+export * from './useTransactionTotal';

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

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

package/src/lib/views/TransactionConfirmationView/hooks/{useTransactionData/useTransactionData.cjs → useTransactionGas/useTransactionGas.cjs}

@@ -43,54 +43,29 @@ require('../../../../context/MockContext/MockContext.cjs');
 require('../../../../context/CaptchaContext/CaptchaContext.cjs');
 var usePromise = require('../../../../utils/hooks/usePromise/usePromise.cjs');
 require('../../../../utils/hooks/useUserUpdateRequest/useUserUpdateRequest.cjs');
+var useTransactionEstimatedGas = require('../../../../utils/hooks/useTransactionEstimatedGas/useTransactionEstimatedGas.cjs');
 
-const useTransactionData = ({ provider, transaction, }) => {
-    const { data: transactionValue, isLoading: isEffectiveValueLoading } = usePromise.usePromise(() => _tslib.__awaiter(void 0, void 0, void 0, function* () {
-        const val = yield transaction.value;
-        return val ? ethers.ethers.BigNumber.from(val) : undefined;
-    }));
-    const { data: estimatedGas, isLoading: isEstimatedGasLoading } = usePromise.usePromise(() => {
-        // To safely run estimateGas using alchemy, we need to remove the from address
-        // because alchemy checks the origin address funds and can return an error if
-        // origin wallet has no funds for the transaction
-        // https://docs.alchemy.com/reference/eth-estimategas
-        const transactionWithNoOrigin = _tslib.__rest(transaction, ["from"]);
-        return provider.estimateGas(transactionWithNoOrigin);
+const useTransactionGas = ({ 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 = yield transaction.gasPrice;
+            return gasPrice ? ethers.ethers.BigNumber.from(gasPrice) : undefined;
+        }
+        return provider.getGasPrice();
+    }), {
+        deps: [transaction.gasPrice],
     });
-    const { data: gasPrice, isLoading: isFeeDataLoading } = usePromise.usePromise(() => provider.getGasPrice());
-    const isGasPriceLoading = isEstimatedGasLoading || isFeeDataLoading;
-    const gasEstimate = React.useMemo(() => gasPrice && estimatedGas
+    const gasTotalPrice = React.useMemo(() => gasPrice && estimatedGas
         ? ethers.ethers.BigNumber.from(gasPrice).mul(estimatedGas)
         : undefined, [gasPrice, estimatedGas]);
-    const { data: transactionToAddress, isLoading: isTransactionToAddressLoading, } = usePromise.usePromise(() => transaction.to);
-    const { data: transactionFromAddress, isLoading: isTransactionFromAddressLoading, } = usePromise.usePromise(() => transaction.from);
-    const total = React.useMemo(() => {
-        if (gasEstimate !== undefined && transactionValue !== undefined) {
-            return gasEstimate.add(transactionValue);
-        }
-        return transactionValue || gasEstimate;
-    }, [gasEstimate, transactionValue]);
-    const isLoading = React.useMemo(() => isEffectiveValueLoading ||
-        isGasPriceLoading ||
-        isTransactionToAddressLoading ||
-        isTransactionFromAddressLoading, [
-        isEffectiveValueLoading,
-        isGasPriceLoading,
-        isTransactionToAddressLoading,
-        isTransactionFromAddressLoading,
-    ]);
+    const isLoading = isEstimatedGasLoading || isLoadingGasPrice;
+    const isGasEstimated = Boolean(estimatedGas) && !transaction.gasPrice;
     return {
-        gasEstimate,
-        isEffectiveValueLoading,
-        isGasPriceLoading,
+        gasTotalPrice,
+        isGasEstimated,
         isLoading,
-        isTransactionFromAddressLoading,
-        isTransactionToAddressLoading,
-        total,
-        transactionFromAddress,
-        transactionToAddress,
-        transactionValue,
     };
 };
 
-exports.useTransactionData = useTransactionData;
+exports.useTransactionGas = useTransactionGas;

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

@@ -0,0 +1,11 @@
+import { ethers } from 'ethers';
+type UseTransactionGasProps = {
+    provider: ethers.providers.Web3Provider;
+    transaction: ethers.utils.Deferrable<ethers.providers.TransactionRequest>;
+};
+export declare const useTransactionGas: ({ provider, transaction, }: UseTransactionGasProps) => {
+    gasTotalPrice: ethers.BigNumber | undefined;
+    isGasEstimated: boolean;
+    isLoading: boolean;
+};
+export {};

package/src/lib/views/TransactionConfirmationView/hooks/{useTransactionData/useTransactionData.js → useTransactionGas/useTransactionGas.js}

@@ -1,4 +1,4 @@
-import { __awaiter, __rest } from '../../../../../../_virtual/_tslib.js';
+import { __awaiter } from '../../../../../../_virtual/_tslib.js';
 import { useMemo } from 'react';
 import { ethers } from 'ethers';
 import '@dynamic-labs/utils';
@@ -39,54 +39,29 @@ import '../../../../context/MockContext/MockContext.js';
 import '../../../../context/CaptchaContext/CaptchaContext.js';
 import { usePromise } from '../../../../utils/hooks/usePromise/usePromise.js';
 import '../../../../utils/hooks/useUserUpdateRequest/useUserUpdateRequest.js';
+import { useTransactionEstimatedGas } from '../../../../utils/hooks/useTransactionEstimatedGas/useTransactionEstimatedGas.js';
 
-const useTransactionData = ({ provider, transaction, }) => {
-    const { data: transactionValue, isLoading: isEffectiveValueLoading } = usePromise(() => __awaiter(void 0, void 0, void 0, function* () {
-        const val = yield transaction.value;
-        return val ? ethers.BigNumber.from(val) : undefined;
-    }));
-    const { data: estimatedGas, isLoading: isEstimatedGasLoading } = usePromise(() => {
-        // To safely run estimateGas using alchemy, we need to remove the from address
-        // because alchemy checks the origin address funds and can return an error if
-        // origin wallet has no funds for the transaction
-        // https://docs.alchemy.com/reference/eth-estimategas
-        const transactionWithNoOrigin = __rest(transaction, ["from"]);
-        return provider.estimateGas(transactionWithNoOrigin);
+const useTransactionGas = ({ 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 = yield transaction.gasPrice;
+            return gasPrice ? ethers.BigNumber.from(gasPrice) : undefined;
+        }
+        return provider.getGasPrice();
+    }), {
+        deps: [transaction.gasPrice],
     });
-    const { data: gasPrice, isLoading: isFeeDataLoading } = usePromise(() => provider.getGasPrice());
-    const isGasPriceLoading = isEstimatedGasLoading || isFeeDataLoading;
-    const gasEstimate = useMemo(() => gasPrice && estimatedGas
+    const gasTotalPrice = useMemo(() => gasPrice && estimatedGas
         ? ethers.BigNumber.from(gasPrice).mul(estimatedGas)
         : undefined, [gasPrice, estimatedGas]);
-    const { data: transactionToAddress, isLoading: isTransactionToAddressLoading, } = usePromise(() => transaction.to);
-    const { data: transactionFromAddress, isLoading: isTransactionFromAddressLoading, } = usePromise(() => transaction.from);
-    const total = useMemo(() => {
-        if (gasEstimate !== undefined && transactionValue !== undefined) {
-            return gasEstimate.add(transactionValue);
-        }
-        return transactionValue || gasEstimate;
-    }, [gasEstimate, transactionValue]);
-    const isLoading = useMemo(() => isEffectiveValueLoading ||
-        isGasPriceLoading ||
-        isTransactionToAddressLoading ||
-        isTransactionFromAddressLoading, [
-        isEffectiveValueLoading,
-        isGasPriceLoading,
-        isTransactionToAddressLoading,
-        isTransactionFromAddressLoading,
-    ]);
+    const isLoading = isEstimatedGasLoading || isLoadingGasPrice;
+    const isGasEstimated = Boolean(estimatedGas) && !transaction.gasPrice;
     return {
-        gasEstimate,
-        isEffectiveValueLoading,
-        isGasPriceLoading,
+        gasTotalPrice,
+        isGasEstimated,
         isLoading,
-        isTransactionFromAddressLoading,
-        isTransactionToAddressLoading,
-        total,
-        transactionFromAddress,
-        transactionToAddress,
-        transactionValue,
     };
 };
 
-export { useTransactionData };
+export { useTransactionGas };

package/src/lib/views/TransactionConfirmationView/hooks/useTransactionTotal/index.d.ts

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

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

@@ -0,0 +1,14 @@
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+var React = require('react');
+
+const useTransactionTotal = ({ transactionValue, gasTotalPrice, }) => React.useMemo(() => {
+    if (gasTotalPrice !== undefined && transactionValue !== undefined) {
+        return gasTotalPrice.add(transactionValue);
+    }
+    return transactionValue || gasTotalPrice;
+}, [gasTotalPrice, transactionValue]);
+
+exports.useTransactionTotal = useTransactionTotal;

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

@@ -0,0 +1,7 @@
+import { ethers } from 'ethers';
+type UseTransactionTotalProps = {
+    transactionValue?: ethers.BigNumber;
+    gasTotalPrice?: ethers.BigNumber;
+};
+export declare const useTransactionTotal: ({ transactionValue, gasTotalPrice, }: UseTransactionTotalProps) => ethers.BigNumber | undefined;
+export {};

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

@@ -0,0 +1,10 @@
+import { useMemo } from 'react';
+
+const useTransactionTotal = ({ transactionValue, gasTotalPrice, }) => useMemo(() => {
+    if (gasTotalPrice !== undefined && transactionValue !== undefined) {
+        return gasTotalPrice.add(transactionValue);
+    }
+    return transactionValue || gasTotalPrice;
+}, [gasTotalPrice, transactionValue]);
+
+export { useTransactionTotal };

package/src/lib/views/WalletList/WalletList.cjs

@@ -78,7 +78,10 @@ const WalletList = ({ isWalletConnectList = false, }) => {
     };
     return (jsxRuntime.jsxs(jsxRuntime.Fragment, { children: [jsxRuntime.jsxs("div", Object.assign({ className: 'wallet-list__container' }, { children: [error && jsxRuntime.jsx(ErrorContainer.ErrorContainer, { children: error }), !projectSettings ? (jsxRuntime.jsx(Skeleton.Skeleton, { className: 'wallet-list__search-skeleton' })) : (isSearchEnabled && (jsxRuntime.jsx(Search.Search, { label: `Search through ${numberOfWallets} wallets...`, value: filterValue, onChange: ({ target: { value } }) => handleFilterValueChange(value), onClickClear: () => handleFilterValueChange('') }))), jsxRuntime.jsxs("div", Object.assign({ className: classNames.classNames('wallet-list__scroll-container', {
                             'wallet-list__scroll-container--full-height': isSearchEnabled,
-                        }), "data-testid": 'wallet-list-scroll-container', ref: walletListScrollRef, onScroll: handleScroll }, { children: [!projectSettings ? (jsxRuntime.jsx(Skeleton.Skeleton, { count: 10, className: 'wallet-list__tile-skeleton' })) : (jsxRuntime.jsxs(jsxRuntime.Fragment, { children: [wallets.length === 0 && (jsxRuntime.jsx(ErrorContainer.ErrorContainer, { children: "Oops, no login methods have been configured." })), wallets.length && walletsList.length === 0 ? (jsxRuntime.jsx(SearchNotFoundMessage.SearchNotFoundMessage, { title: 'No wallet found.', subtitle: 'Try searching for a different wallet', image: jsxRuntime.jsx(noWalletFound.ReactComponent, {}) })) : (walletsList.map((wallet) => (jsxRuntime.jsx(WalletListItem.WalletListItem, { wallet: wallet, usingMultiWallet: isUsingMultiWallet, onResetSearchValue: () => handleFilterValueChange('') }, wallet.key))))] })), isSearchEnabled && !filterValue && projectSettings && (jsxRuntime.jsx(SearchNotFoundMessage.SearchNotFoundMessage, {}))] }))] })), noDefaultFooter && (jsxRuntime.jsx("div", { className: classNames.classNames('wallet-list__tiny-footer', {
+                        }), "data-testid": 'wallet-list-scroll-container', ref: walletListScrollRef, onScroll: handleScroll }, { children: [!projectSettings ? (jsxRuntime.jsx(Skeleton.Skeleton, { count: 10, className: 'wallet-list__tile-skeleton' })) : (jsxRuntime.jsxs(jsxRuntime.Fragment, { children: [wallets.length === 0 && (jsxRuntime.jsx(ErrorContainer.ErrorContainer, { children: "Oops, no login methods have been configured." })), wallets.length && walletsList.length === 0 ? (jsxRuntime.jsx(SearchNotFoundMessage.SearchNotFoundMessage, { title: 'No wallet found.', subtitle: 'Try searching for a different wallet', image: jsxRuntime.jsx(noWalletFound.ReactComponent, {}) })) : (walletsList.map((wallet) => {
+                                        var _a;
+                                        return (jsxRuntime.jsx(WalletListItem.WalletListItem, { wallet: wallet, usingMultiWallet: isUsingMultiWallet, onResetSearchValue: () => handleFilterValueChange('') }, wallet.key + ((_a = wallet.groupedWallets) === null || _a === void 0 ? void 0 : _a.length)));
+                                    }))] })), isSearchEnabled && !filterValue && projectSettings && (jsxRuntime.jsx(SearchNotFoundMessage.SearchNotFoundMessage, {}))] }))] })), noDefaultFooter && (jsxRuntime.jsx("div", { className: classNames.classNames('wallet-list__tiny-footer', {
                     'wallet-list__tiny-footer--hidden': footerIsVisible,
                 }), "data-testid": 'wallet-list-tiny-footer' }))] }));
 };