@dynamic-labs/sdk-react-core 0.18.100-viem.0 → 0.18.100-viem.10

package/src/lib/views/NetworkNotSupported/NetworkNotSupported.js

@@ -49,11 +49,13 @@ import { SelectNetworkButton } from '../../components/SelectNetworkButton/Select
 import { useApplyWalletConnectorNetwork } from '../../utils/hooks/useApplyWalletConnectorNetwork/useApplyWalletConnectorNetwork.js';
 
 const NetworkNotSupported = () => {
-    const { network, onboardingImageUrl, selectedWalletConnector: walletConnector, connectedWallets, primaryWallet, isFullyConnected, setShowAuthFlow, } = useInternalDynamicContext();
+    const { network, onboardingImageUrl, selectedWalletConnector: walletConnector, connectedWallets, primaryWallet, isFullyConnected, setShowAuthFlow, walletsToConnectByChain, } = useInternalDynamicContext();
     // Refresh selectedWalletConnector network when primaryWallet or connectedWallets updates
     const { data: walletConnectorNetwork } = usePromise(() => walletConnector === null || walletConnector === void 0 ? void 0 : walletConnector.getNetwork(), { deps: [primaryWallet, walletConnector, connectedWallets] });
     const finishConnectAndSign = useConnectAndSign({
-        shouldUpdateWallets: !isFullyConnected,
+        shouldCallCallback: false,
+        shouldUpdateWallets: !isFullyConnected ||
+            (isFullyConnected && Boolean(walletsToConnectByChain === null || walletsToConnectByChain === void 0 ? void 0 : walletsToConnectByChain.length)),
     });
     const [isNetworkPickerOpen, setIsNetworkPickerOpen] = useState(false);
     // Finishes auth flow when wallet switches to proper network

package/src/lib/views/NetworkNotSupportedSwitchManual/NetworkNotSupportedSwitchManual.cjs

@@ -54,13 +54,15 @@ var useApplyWalletConnectorNetwork = require('../../utils/hooks/useApplyWalletCo
 //   as the wallet does not support programmatic network change.
 const NetworkNotSupportedSwitchManual = () => {
     var _a, _b;
-    const { user, selectedWalletConnector: walletConnector, connectedWallets, isFullyConnected, setShowAuthFlow, } = useInternalDynamicContext.useInternalDynamicContext();
+    const { user, selectedWalletConnector: walletConnector, connectedWallets, isFullyConnected, setShowAuthFlow, walletsToConnectByChain, } = useInternalDynamicContext.useInternalDynamicContext();
     // Refresh selectedWalletConnector network when primaryWallet or connectedWallets updates
     const { data: walletConnectorNetwork } = usePromise.usePromise(() => walletConnector === null || walletConnector === void 0 ? void 0 : walletConnector.getNetwork(), {
         deps: [walletConnector, connectedWallets],
     });
     const finishConnectAndSign = useConnectAndSign.useConnectAndSign({
-        shouldUpdateWallets: !isFullyConnected,
+        shouldCallCallback: false,
+        shouldUpdateWallets: !isFullyConnected ||
+            (isFullyConnected && Boolean(walletsToConnectByChain === null || walletsToConnectByChain === void 0 ? void 0 : walletsToConnectByChain.length)),
     });
     // Finishes auth flow when wallet switches to proper network
     React.useEffect(() => {

package/src/lib/views/NetworkNotSupportedSwitchManual/NetworkNotSupportedSwitchManual.js

@@ -50,13 +50,15 @@ import { useApplyWalletConnectorNetwork } from '../../utils/hooks/useApplyWallet
 //   as the wallet does not support programmatic network change.
 const NetworkNotSupportedSwitchManual = () => {
     var _a, _b;
-    const { user, selectedWalletConnector: walletConnector, connectedWallets, isFullyConnected, setShowAuthFlow, } = useInternalDynamicContext();
+    const { user, selectedWalletConnector: walletConnector, connectedWallets, isFullyConnected, setShowAuthFlow, walletsToConnectByChain, } = useInternalDynamicContext();
     // Refresh selectedWalletConnector network when primaryWallet or connectedWallets updates
     const { data: walletConnectorNetwork } = usePromise(() => walletConnector === null || walletConnector === void 0 ? void 0 : walletConnector.getNetwork(), {
         deps: [walletConnector, connectedWallets],
     });
     const finishConnectAndSign = useConnectAndSign({
-        shouldUpdateWallets: !isFullyConnected,
+        shouldCallCallback: false,
+        shouldUpdateWallets: !isFullyConnected ||
+            (isFullyConnected && Boolean(walletsToConnectByChain === null || walletsToConnectByChain === void 0 ? void 0 : walletsToConnectByChain.length)),
     });
     // Finishes auth flow when wallet switches to proper network
     useEffect(() => {

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

@@ -2,7 +2,6 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var _tslib = require('../../../../_virtual/_tslib.cjs');
 var jsxRuntime = require('react/jsx-runtime');
 var React = require('react');
 var viem = require('viem');
@@ -10,7 +9,7 @@ var utils = require('@dynamic-labs/utils');
 var walletConnectorCore = require('@dynamic-labs/wallet-connector-core');
 require('@dynamic-labs/sdk-api');
 require('../../config/ApiEndpoint.cjs');
-var logger = require('../../shared/logger.cjs');
+require('../../shared/logger.cjs');
 var getChainIcon = require('../../shared/utils/functions/chain/getChainIcon.cjs');
 require('@dynamic-labs/wallet-book');
 var shortenWalletAddress = require('../../shared/utils/functions/shortenWalletAddress/shortenWalletAddress.cjs');
@@ -42,9 +41,9 @@ require('../../components/Popper/PopperContext/PopperContext.cjs');
 var SendBalancePageLayout = require('../../components/SendBalancePageLayout/SendBalancePageLayout.cjs');
 require('../../components/InlineWidget/InlineWidget.cjs');
 require('../../components/MenuList/Dropdown/Dropdown.cjs');
-var TransactionConfirmationView = require('../TransactionConfirmationView/TransactionConfirmationView.cjs');
-var TransactionStatusLayout = require('../../components/TransactionStatusLayout/TransactionStatusLayout.cjs');
 var useFetchCurrency = require('../../widgets/DynamicWidget/hooks/useFetchCurrency/useFetchCurrency.cjs');
+var TransactionStatusLayout = require('../../components/TransactionStatusLayout/TransactionStatusLayout.cjs');
+var TransactionStage = require('./components/TransactionStage/TransactionStage.cjs');
 require('../../context/MockContext/MockContext.cjs');
 require('../../context/CaptchaContext/CaptchaContext.cjs');
 var usePromise = require('../../utils/hooks/usePromise/usePromise.cjs');
@@ -52,19 +51,19 @@ require('../../utils/hooks/useUserUpdateRequest/useUserUpdateRequest.cjs');
 
 const SendBalanceView = ({ initialRecipientAddress = '', initialValue, onClickBack, onClickClose, onError, onSuccess, onDone, displayPoweredByDynamicFooter = false, }) => {
     const [stage, setStage] = React.useState('form');
-    const { primaryWallet, walletUiUtils, network } = useInternalDynamicContext.useInternalDynamicContext();
+    const { primaryWallet, network } = useInternalDynamicContext.useInternalDynamicContext();
     const [value, setValue] = React.useState(initialValue !== null && initialValue !== void 0 ? initialValue : null);
     const [recipientAddress, setRecipientAddress] = React.useState(initialRecipientAddress);
     const transactionRef = React.useRef(null);
     if (!primaryWallet) {
         throw new utils.DynamicError('Primary wallet is not available, send balance cannot be displayed');
     }
-    const { data: balance } = usePromise.usePromise(() => primaryWallet.connector.getBalance());
-    const { data: provider } = usePromise.usePromise(() => primaryWallet.connector.getWeb3Provider());
-    const { data: publicClient } = usePromise.usePromise(() => primaryWallet.connector.getRpcProvider());
-    const evmNetworks = ((primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.connector) &&
-        primaryWallet.connector.evmNetworks) ||
-        [];
+    const walletConnector = primaryWallet.connector;
+    const { data: balance } = usePromise.usePromise(() => walletConnector.getBalance(), {
+        deps: [walletConnector],
+    });
+    const { data: provider } = usePromise.usePromise(() => primaryWallet.connector.getRpcProvider());
+    const evmNetworks = (walletConnector && walletConnector.evmNetworks) || [];
     const evmNetwork = evmNetworks.find((evmNetwork) => evmNetwork.chainId === network);
     const networkIcon = evmNetwork && (jsxRuntime.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);
@@ -76,7 +75,7 @@ const SendBalanceView = ({ initialRecipientAddress = '', initialValue, onClickBa
             amount: value === null ? '' : formatBigNumber.formatBigNumber(value),
             recipient: recipientAddress,
         }, balance: balance, onClickBack: onClickBack, chain: primaryWallet.chain, networkName: networkName, networkIcon: networkIcon, currencySymbol: currencySymbol, isLoading: false, walletAddress: shortenWalletAddress.shortenWalletAddress(primaryWallet.address, 3, 3), walletName: primaryWallet.connector.name, onClickClose: onClickClose, displayPoweredByDynamicFooter: displayPoweredByDynamicFooter, onSubmit: (data) => {
-            setValue(viem.parseEther(data.amount));
+            setValue(viem.parseEther(data.amount, 'wei'));
             setRecipientAddress(data.recipient);
             setStage('confirmation');
         } }));
@@ -85,36 +84,16 @@ const SendBalanceView = ({ initialRecipientAddress = '', initialValue, onClickBa
             return null;
         }
         const transaction = {
-            chain: undefined,
             from: primaryWallet.address,
             to: recipientAddress,
+            type: 'eip2930',
             value,
         };
-        return (jsxRuntime.jsx(TransactionConfirmationView.TransactionConfirmationView, { transaction: transaction, title: 'Confirm transaction', onClickBack: () => setStage('form'), onError: onError, displayPoweredByDynamicFooter: displayPoweredByDynamicFooter, onSuccess: (transaction) => {
+        return (jsxRuntime.jsx(TransactionStage.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: () => _tslib.__awaiter(void 0, void 0, void 0, function* () {
-                walletUiUtils.disabledConfirmationOnce();
-                const sentTransaction = yield provider.sendTransaction(Object.assign(Object.assign({ account: transaction.from }, transaction), { chain: utils.getChain(yield provider.getChainId()) }));
-                if (!publicClient) {
-                    throw new utils.DynamicError('Public client is not available, send balance cannot be displayed');
-                }
-                const sleep = (ms) => new Promise((resolve) => setTimeout(resolve, ms));
-                for (let i = 0; i < 120; i++) {
-                    try {
-                        const tx = yield publicClient.getTransactionReceipt({
-                            hash: sentTransaction,
-                        });
-                        return tx;
-                    }
-                    catch (_a) {
-                        logger.logger.debug(`Transaction not found for hash: ${sentTransaction} Retrying...`);
-                        yield sleep(1000);
-                    }
-                }
-                throw new Error(`Unable to find transaction for hash ${sentTransaction}`);
-            }) }));
+            } }));
     };
     const buildSuccessState = () => {
         var _a;

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

@@ -1,5 +1,5 @@
 import { FC, MouseEventHandler } from 'react';
-import { TransactionReceipt } from 'viem';
+import { Address } from 'viem';
 export type SendBalanceViewProps = {
     displayPoweredByDynamicFooter?: boolean;
     initialRecipientAddress?: string;
@@ -8,6 +8,6 @@ export type SendBalanceViewProps = {
     onClickClose?: MouseEventHandler<HTMLButtonElement>;
     onDone?: () => void;
     onError?: (error: unknown) => void;
-    onSuccess?: (transaction: TransactionReceipt) => void;
+    onSuccess?: (transaction: Address) => void;
 };
 export declare const SendBalanceView: FC<SendBalanceViewProps>;

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

@@ -1,12 +1,11 @@
-import { __awaiter } from '../../../../_virtual/_tslib.js';
 import { jsx } from 'react/jsx-runtime';
 import { useState, useRef } from 'react';
 import { parseEther } from 'viem';
-import { DynamicError, getChain } from '@dynamic-labs/utils';
+import { DynamicError } from '@dynamic-labs/utils';
 import { getChainInfo } from '@dynamic-labs/wallet-connector-core';
 import '@dynamic-labs/sdk-api';
 import '../../config/ApiEndpoint.js';
-import { logger } from '../../shared/logger.js';
+import '../../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';
@@ -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,19 +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 { data: publicClient } = usePromise(() => primaryWallet.connector.getRpcProvider());
-    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(() => primaryWallet.connector.getRpcProvider());
+    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);
@@ -72,7 +71,7 @@ const SendBalanceView = ({ initialRecipientAddress = '', initialValue, onClickBa
             amount: value === null ? '' : formatBigNumber(value),
             recipient: recipientAddress,
         }, balance: balance, onClickBack: onClickBack, chain: primaryWallet.chain, networkName: networkName, networkIcon: networkIcon, currencySymbol: currencySymbol, isLoading: false, walletAddress: shortenWalletAddress(primaryWallet.address, 3, 3), walletName: primaryWallet.connector.name, onClickClose: onClickClose, displayPoweredByDynamicFooter: displayPoweredByDynamicFooter, onSubmit: (data) => {
-            setValue(parseEther(data.amount));
+            setValue(parseEther(data.amount, 'wei'));
             setRecipientAddress(data.recipient);
             setStage('confirmation');
         } }));
@@ -81,36 +80,16 @@ const SendBalanceView = ({ initialRecipientAddress = '', initialValue, onClickBa
             return null;
         }
         const transaction = {
-            chain: undefined,
             from: primaryWallet.address,
             to: recipientAddress,
+            type: 'eip2930',
             value,
         };
-        return (jsx(TransactionConfirmationView, { 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 sentTransaction = yield provider.sendTransaction(Object.assign(Object.assign({ account: transaction.from }, transaction), { chain: getChain(yield provider.getChainId()) }));
-                if (!publicClient) {
-                    throw new DynamicError('Public client is not available, send balance cannot be displayed');
-                }
-                const sleep = (ms) => new Promise((resolve) => setTimeout(resolve, ms));
-                for (let i = 0; i < 120; i++) {
-                    try {
-                        const tx = yield publicClient.getTransactionReceipt({
-                            hash: sentTransaction,
-                        });
-                        return tx;
-                    }
-                    catch (_a) {
-                        logger.debug(`Transaction not found for hash: ${sentTransaction} Retrying...`);
-                        yield sleep(1000);
-                    }
-                }
-                throw new Error(`Unable to find transaction for hash ${sentTransaction}`);
-            }) }));
+            } }));
     };
     const buildSuccessState = () => {
         var _a;

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

@@ -0,0 +1,67 @@
+'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('viem');
+require('../../../../shared/consts/index.cjs');
+require('@dynamic-labs/multi-wallet');
+var isMagicConnector = require('../../../../utils/functions/isMagicConnector/isMagicConnector.cjs');
+var sendTransactionWithAutoNonce = require('../../../../utils/functions/sendTransactionWithAutoNonce/sendTransactionWithAutoNonce.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: () => sendTransactionWithAutoNonce.sendTransactionWithAutoNonce(walletConnector, transactionWithGasPrice, (transaction) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
+            walletUiUtils.disabledConfirmationOnce();
+            const signer = yield walletConnector.getSigner();
+            const sentTransaction = yield signer.sendTransaction(Object.assign(Object.assign({}, transaction), { account: transaction.from, chain: null }));
+            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,63 @@
+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 'viem';
+import '../../../../shared/consts/index.js';
+import '@dynamic-labs/multi-wallet';
+import { isMagicConnector } from '../../../../utils/functions/isMagicConnector/isMagicConnector.js';
+import { sendTransactionWithAutoNonce } from '../../../../utils/functions/sendTransactionWithAutoNonce/sendTransactionWithAutoNonce.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: () => sendTransactionWithAutoNonce(walletConnector, transactionWithGasPrice, (transaction) => __awaiter(void 0, void 0, void 0, function* () {
+            walletUiUtils.disabledConfirmationOnce();
+            const signer = yield walletConnector.getSigner();
+            const sentTransaction = yield signer.sendTransaction(Object.assign(Object.assign({}, transaction), { account: transaction.from, chain: null }));
+            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", { className: classNames.classNames('social-redirect-view__container'), children: [jsxRuntime.jsx(IconWithSpinner.IconWithSpinner, { iconSize: 64, Icon: getSocialIcon(socialProvider), isSpinning: true }), jsxRuntime.jsxs(Typography.Typography, { weight: 'medium', variant: 'title', className: classNames.classNames('social-redirect-view__title'), children: ["Connecting to ", capitalize(socialProvider), "..."] })] }));
+    return (jsxRuntime.jsxs("div", { className: classNames.classNames('social-redirect-view__container'), children: [jsxRuntime.jsx(IconWithSpinner.IconWithSpinner, { iconSize: 64, Icon: getSocialIcon(socialProvider), isSpinning: true }), jsxRuntime.jsx(Typography.Typography, { 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", { className: classNames('social-redirect-view__container'), children: [jsx(IconWithSpinner, { iconSize: 64, Icon: getSocialIcon(socialProvider), isSpinning: true }), jsxs(Typography, { weight: 'medium', variant: 'title', className: classNames('social-redirect-view__title'), children: ["Connecting to ", capitalize(socialProvider), "..."] })] }));
+    return (jsxs("div", { className: classNames('social-redirect-view__container'), children: [jsx(IconWithSpinner, { iconSize: 64, Icon: getSocialIcon(socialProvider), isSpinning: true }), jsx(Typography, { 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 viem = require('viem');
@@ -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');
@@ -54,23 +56,42 @@ var usePromise = require('../../utils/hooks/usePromise/usePromise.cjs');
 var useMutation = require('../../utils/hooks/useMutation/useMutation.cjs');
 require('../../utils/hooks/useUserUpdateRequest/useUserUpdateRequest.cjs');
 
-const TransactionConfirmationView = ({ transaction, mutation, onError, onSuccess, onClickBack, onClickClose, title, displayPoweredByDynamicFooter = false, }) => {
+const TransactionConfirmationView = ({ transaction, mutation, onError, onSuccess, onClickBack, onClickClose, title, displayPoweredByDynamicFooter = false, provider, }) => {
     const { appName, appLogoUrl, primaryWallet } = useInternalDynamicContext.useInternalDynamicContext();
     const appOrigin = getAppOrigin.getAppOrigin();
     if (!primaryWallet) {
         throw new utils.DynamicError('Primary wallet is not available, transaction cannot be displayed');
     }
     const [currencySymbol] = useFetchCurrency.useFetchCurrency(primaryWallet.connector);
-    const { data: balance } = usePromise.usePromise(() => primaryWallet.connector
-        .getBalance()
-        .then((balanceText) => balanceText ? viem.parseEther(balanceText) : undefined));
+    const { data: balance } = usePromise.usePromise(() => _tslib.__awaiter(void 0, void 0, void 0, function* () {
+        const balanceText = yield primaryWallet.connector.getBalance();
+        return balanceText ? viem.parseEther(balanceText) : undefined;
+    }));
     const { mutate: send, isLoading, error: transactionError, } = useMutation.useMutation(mutation, {
         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;
+        if (viem.isHex(val)) {
+            return viem.hexToBigInt(val);
+        }
+        return val ? 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, { size: 'small', children: jsxRuntime.jsx(ChainIconComponent, {}) }));
     const errorMessage = transactionError && transactionErrorMessage.transactionErrorMessage(transactionError);
@@ -91,8 +112,10 @@ const TransactionConfirmationView = ({ transaction, mutation, onError, onSuccess
         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, { 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, { label: 'From (You)', isLoading: isTransactionFromAddressLoading, title: transactionFromAddress, children: shortenWalletAddress.shortenWalletAddress(transactionFromAddress, 4, 4) }), jsxRuntime.jsx(TransactionRow.TransactionRow, { label: 'To', isLoading: isTransactionToAddressLoading, title: transactionToAddress, children: transactionToAddress &&
-                    shortenWalletAddress.shortenWalletAddress(transactionToAddress, 4, 4) }), jsxRuntime.jsx(TransactionRow.TransactionRow, { label: 'Amount', isLoading: isEffectiveValueLoading, isEmpty: !transactionValue, title: transactionValue ? formatBigNumber.formatBigNumber(transactionValue) : undefined, suffix: currencySymbol, icon: chainIcon, dataTestId: 'transaction-amount', children: transactionValue ? formatBigNumber.formatBigNumber(transactionValue, 10) : 0 }), jsxRuntime.jsx(TransactionRow.TransactionRow, { label: 'Gas (estimated)', isEmpty: !gasEstimate, isLoading: isGasPriceLoading, title: gasEstimate ? formatBigNumber.formatBigNumber(gasEstimate) : undefined, suffix: gasEstimate ? currencySymbol : undefined, icon: gasEstimate ? chainIcon : undefined, dataTestId: 'transaction-gas-free', children: gasEstimate ? formatBigNumber.formatBigNumber(gasEstimate, 10) : 'N/A' }), jsxRuntime.jsx(TransactionRow.TransactionRow, { label: 'Total', isEmpty: !total, title: total ? formatBigNumber.formatBigNumber(total) : undefined, suffix: total ? currencySymbol : undefined, icon: total ? chainIcon : undefined, dataTestId: 'transaction-total', children: total ? formatBigNumber.formatBigNumber(total, 10) : 'N/A' })] }));
+    return (jsxRuntime.jsxs(TransactionConfirmationPageLayout.TransactionConfirmationPageLayout, { 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, { label: 'From (You)', isLoading: isTransactionFromAddressLoading, title: transactionFromAddress, children: shortenWalletAddress.shortenWalletAddress(transactionFromAddress, 4, 4) }), jsxRuntime.jsx(TransactionRow.TransactionRow, { label: 'To', isLoading: isTransactionToAddressLoading, title: transactionToAddress, children: transactionToAddress &&
+                    shortenWalletAddress.shortenWalletAddress(transactionToAddress, 4, 4) }), jsxRuntime.jsx(TransactionRow.TransactionRow, { label: 'Amount', isLoading: isTransactionValueLoading, isEmpty: !transactionValue, title: transactionValue ? formatBigNumber.formatBigNumber(transactionValue) : undefined, suffix: currencySymbol, icon: chainIcon, dataTestId: 'transaction-amount', children: transactionValue ? formatBigNumber.formatBigNumber(transactionValue, 10) : 0 }), jsxRuntime.jsx(TransactionRow.TransactionRow, { label: isGasEstimated ? 'Gas (estimate)' : 'Gas', isEmpty: !gasTotalPrice, isLoading: isGasPriceLoading, title: gasTotalPrice ? formatBigNumber.formatBigNumber(gasTotalPrice) : undefined, suffix: gasTotalPrice ? currencySymbol : undefined, icon: gasTotalPrice ? chainIcon : undefined, dataTestId: isGasEstimated
+                    ? 'transaction-estimated-gas-fee'
+                    : 'transaction-gas-fee', children: gasTotalPrice ? formatBigNumber.formatBigNumber(gasTotalPrice, 10) : 'N/A' }), jsxRuntime.jsx(TransactionRow.TransactionRow, { label: 'Total', isEmpty: !total, title: total ? formatBigNumber.formatBigNumber(total) : undefined, suffix: total ? currencySymbol : undefined, icon: total ? chainIcon : undefined, dataTestId: 'transaction-total', children: total ? formatBigNumber.formatBigNumber(total, 10) : 'N/A' })] }));
 };
 
 exports.TransactionConfirmationView = TransactionConfirmationView;

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

@@ -1,13 +1,14 @@
 import { FC, MouseEventHandler, ReactNode } from 'react';
-import { TransactionReceipt, TransactionRequest } from 'viem';
+import { Address, PublicClient, TransactionRequest } from 'viem';
 export type TransactionConfirmationViewProps = {
     displayPoweredByDynamicFooter?: boolean;
-    mutation: () => Promise<TransactionReceipt>;
+    mutation: () => Promise<Address>;
     onClickBack?: MouseEventHandler<HTMLButtonElement>;
     onClickClose?: MouseEventHandler<HTMLButtonElement>;
     onError?: (error: unknown) => void;
-    onSuccess?: (transaction: TransactionReceipt) => void;
+    onSuccess?: (transactionAddress: Address) => void;
     title: ReactNode;
     transaction: TransactionRequest;
+    provider: PublicClient;
 };
 export declare const TransactionConfirmationView: FC<TransactionConfirmationViewProps>;