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

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

@@ -1,6 +1,7 @@
+import { __awaiter } from '../../../../_virtual/_tslib.js';
 import { jsx, jsxs } from 'react/jsx-runtime';
 import { useMemo } from 'react';
-import { parseEther } from 'viem';
+import { parseEther, isHex, hexToBigInt } from 'viem';
 import { DynamicError } from '@dynamic-labs/utils';
 import { useInternalDynamicContext } from '../../context/DynamicContext/useInternalDynamicContext.js';
 import '@dynamic-labs/sdk-api';
@@ -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';
@@ -50,23 +52,42 @@ import { usePromise } from '../../utils/hooks/usePromise/usePromise.js';
 import { useMutation } from '../../utils/hooks/useMutation/useMutation.js';
 import '../../utils/hooks/useUserUpdateRequest/useUserUpdateRequest.js';
 
-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();
     const appOrigin = getAppOrigin();
     if (!primaryWallet) {
         throw new DynamicError('Primary wallet is not available, transaction cannot be displayed');
     }
     const [currencySymbol] = useFetchCurrency(primaryWallet.connector);
-    const { data: balance } = usePromise(() => primaryWallet.connector
-        .getBalance()
-        .then((balanceText) => balanceText ? parseEther(balanceText) : undefined));
+    const { data: balance } = usePromise(() => __awaiter(void 0, void 0, void 0, function* () {
+        const balanceText = yield primaryWallet.connector.getBalance();
+        return balanceText ? parseEther(balanceText) : undefined;
+    }));
     const { mutate: send, isLoading, error: transactionError, } = 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({
+    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;
+        if (isHex(val)) {
+            return hexToBigInt(val);
+        }
+        return val ? val : undefined;
+    }));
+    const total = useTransactionTotal({
+        gasTotalPrice,
+        transactionValue,
+    });
+    const isTransactionLoading = isTransactionValueLoading ||
+        isGasPriceLoading ||
+        isTransactionToAddressLoading ||
+        isTransactionFromAddressLoading;
     const ChainIconComponent = getChainIcon(primaryWallet.chain);
     const chainIcon = (jsx(Icon, { size: 'small', children: jsx(ChainIconComponent, {}) }));
     const errorMessage = transactionError && transactionErrorMessage(transactionError);
@@ -87,8 +108,10 @@ const TransactionConfirmationView = ({ transaction, mutation, onError, onSuccess
         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, { 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, { label: 'From (You)', isLoading: isTransactionFromAddressLoading, title: transactionFromAddress, children: shortenWalletAddress(transactionFromAddress, 4, 4) }), jsx(TransactionRow, { label: 'To', isLoading: isTransactionToAddressLoading, title: transactionToAddress, children: transactionToAddress &&
-                    shortenWalletAddress(transactionToAddress, 4, 4) }), jsx(TransactionRow, { label: 'Amount', isLoading: isEffectiveValueLoading, isEmpty: !transactionValue, title: transactionValue ? formatBigNumber(transactionValue) : undefined, suffix: currencySymbol, icon: chainIcon, dataTestId: 'transaction-amount', children: transactionValue ? formatBigNumber(transactionValue, 10) : 0 }), jsx(TransactionRow, { label: 'Gas (estimated)', isEmpty: !gasEstimate, isLoading: isGasPriceLoading, title: gasEstimate ? formatBigNumber(gasEstimate) : undefined, suffix: gasEstimate ? currencySymbol : undefined, icon: gasEstimate ? chainIcon : undefined, dataTestId: 'transaction-gas-free', children: gasEstimate ? formatBigNumber(gasEstimate, 10) : 'N/A' }), jsx(TransactionRow, { label: 'Total', isEmpty: !total, title: total ? formatBigNumber(total) : undefined, suffix: total ? currencySymbol : undefined, icon: total ? chainIcon : undefined, dataTestId: 'transaction-total', children: total ? formatBigNumber(total, 10) : 'N/A' })] }));
+    return (jsxs(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: [jsx(TransactionRow, { label: 'From (You)', isLoading: isTransactionFromAddressLoading, title: transactionFromAddress, children: shortenWalletAddress(transactionFromAddress, 4, 4) }), jsx(TransactionRow, { label: 'To', isLoading: isTransactionToAddressLoading, title: transactionToAddress, children: transactionToAddress &&
+                    shortenWalletAddress(transactionToAddress, 4, 4) }), jsx(TransactionRow, { label: 'Amount', isLoading: isTransactionValueLoading, isEmpty: !transactionValue, title: transactionValue ? formatBigNumber(transactionValue) : undefined, suffix: currencySymbol, icon: chainIcon, dataTestId: 'transaction-amount', children: transactionValue ? formatBigNumber(transactionValue, 10) : 0 }), jsx(TransactionRow, { label: isGasEstimated ? 'Gas (estimate)' : 'Gas', isEmpty: !gasTotalPrice, isLoading: isGasPriceLoading, title: gasTotalPrice ? formatBigNumber(gasTotalPrice) : undefined, suffix: gasTotalPrice ? currencySymbol : undefined, icon: gasTotalPrice ? chainIcon : undefined, dataTestId: isGasEstimated
+                    ? 'transaction-estimated-gas-fee'
+                    : 'transaction-gas-fee', children: gasTotalPrice ? formatBigNumber(gasTotalPrice, 10) : 'N/A' }), jsx(TransactionRow, { label: 'Total', isEmpty: !total, title: total ? formatBigNumber(total) : undefined, suffix: total ? currencySymbol : undefined, icon: total ? chainIcon : undefined, 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/useTransactionGas/useTransactionGas.cjs

@@ -0,0 +1,69 @@
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+var _tslib = require('../../../../../../_virtual/_tslib.cjs');
+var React = 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('react/jsx-runtime');
+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');
+require('@dynamic-labs/rpc-providers');
+require('../../../../utils/hooks/useWallets/utils/verifyMagicIsSetup/verifyMagicIsSetup.cjs');
+require('../../../../context/DynamicContext/DynamicContext.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');
+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 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 } = transaction;
+            return gasPrice;
+        }
+        return provider.getGasPrice();
+    }), {
+        deps: [transaction.gasPrice],
+    });
+    const gasTotalPrice = React.useMemo(() => (gasPrice && estimatedGas ? gasPrice * estimatedGas : undefined), [gasPrice, estimatedGas]);
+    const isLoading = isEstimatedGasLoading || isLoadingGasPrice;
+    const isGasEstimated = Boolean(estimatedGas) && !transaction.gasPrice;
+    return {
+        gasTotalPrice,
+        isGasEstimated,
+        isLoading,
+    };
+};
+
+exports.useTransactionGas = useTransactionGas;

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

@@ -0,0 +1,11 @@
+import { PublicClient, TransactionRequest } from 'viem';
+type UseTransactionGasProps = {
+    provider: PublicClient;
+    transaction: TransactionRequest;
+};
+export declare const useTransactionGas: ({ provider, transaction, }: UseTransactionGasProps) => {
+    gasTotalPrice: bigint | undefined;
+    isGasEstimated: boolean;
+    isLoading: boolean;
+};
+export {};

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

@@ -0,0 +1,65 @@
+import { __awaiter } from '../../../../../../_virtual/_tslib.js';
+import { useMemo } from '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 'react/jsx-runtime';
+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 '@dynamic-labs/rpc-providers';
+import '../../../../utils/hooks/useWallets/utils/verifyMagicIsSetup/verifyMagicIsSetup.js';
+import '../../../../context/DynamicContext/DynamicContext.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 '../../../../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 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 } = transaction;
+            return gasPrice;
+        }
+        return provider.getGasPrice();
+    }), {
+        deps: [transaction.gasPrice],
+    });
+    const gasTotalPrice = useMemo(() => (gasPrice && estimatedGas ? gasPrice * estimatedGas : undefined), [gasPrice, estimatedGas]);
+    const isLoading = isEstimatedGasLoading || isLoadingGasPrice;
+    const isGasEstimated = Boolean(estimatedGas) && !transaction.gasPrice;
+    return {
+        gasTotalPrice,
+        isGasEstimated,
+        isLoading,
+    };
+};
+
+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 + transactionValue;
+    }
+    return transactionValue || gasTotalPrice;
+}, [gasTotalPrice, transactionValue]);
+
+exports.useTransactionTotal = useTransactionTotal;

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

@@ -0,0 +1,6 @@
+type UseTransactionTotalProps = {
+    transactionValue?: bigint;
+    gasTotalPrice?: bigint;
+};
+export declare const useTransactionTotal: ({ transactionValue, gasTotalPrice, }: UseTransactionTotalProps) => bigint | 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 + transactionValue;
+    }
+    return transactionValue || gasTotalPrice;
+}, [gasTotalPrice, transactionValue]);
+
+export { useTransactionTotal };

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

@@ -13,6 +13,7 @@ require('@dynamic-labs/wallet-book');
 var getWalletListItemLabel = require('../../../../shared/utils/functions/getWalletListItemLabel/getWalletListItemLabel.cjs');
 require('viem');
 require('../../../../shared/utils/classes/storage/localStorage.cjs');
+require('@dynamic-labs/utils');
 require('../../../../context/ViewContext/ViewContext.cjs');
 var stroke = require('../../../../shared/assets/stroke.cjs');
 require('../../../../shared/consts/index.cjs');

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

@@ -9,6 +9,7 @@ import '@dynamic-labs/wallet-book';
 import { getWalletListItemLabel } from '../../../../shared/utils/functions/getWalletListItemLabel/getWalletListItemLabel.js';
 import 'viem';
 import '../../../../shared/utils/classes/storage/localStorage.js';
+import '@dynamic-labs/utils';
 import '../../../../context/ViewContext/ViewContext.js';
 import { ReactComponent as SvgStroke } from '../../../../shared/assets/stroke.js';
 import '../../../../shared/consts/index.js';

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

@@ -78,7 +78,10 @@ const WalletList = ({ isWalletConnectList = false, }) => {
     };
     return (jsxRuntime.jsxs(jsxRuntime.Fragment, { children: [jsxRuntime.jsxs("div", { 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", { 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' }))] }));
 };

package/src/lib/views/WalletList/WalletList.js

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

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

@@ -16,11 +16,11 @@ require('@dynamic-labs/wallet-connector-core');
 var getWalletListItemLabel = require('../../../shared/utils/functions/getWalletListItemLabel/getWalletListItemLabel.cjs');
 require('viem');
 require('../../../shared/utils/classes/storage/localStorage.cjs');
+require('@dynamic-labs/utils');
 require('../../../shared/consts/index.cjs');
 require('../../../context/DynamicContext/DynamicContext.cjs');
 require('../../../utils/constants/colors.cjs');
 require('@dynamic-labs/multi-wallet');
-require('@dynamic-labs/utils');
 var pixelToRem = require('../../../utils/functions/pixelToRem/pixelToRem.cjs');
 require('../../../components/ShadowDOM/ShadowDOM.cjs');
 require('../../../context/ThemeContext/ThemeContext.cjs');

package/src/lib/views/WalletList/WalletListItem/WalletListItem.js

@@ -12,11 +12,11 @@ import '@dynamic-labs/wallet-connector-core';
 import { getWalletListItemLabel } from '../../../shared/utils/functions/getWalletListItemLabel/getWalletListItemLabel.js';
 import 'viem';
 import '../../../shared/utils/classes/storage/localStorage.js';
+import '@dynamic-labs/utils';
 import '../../../shared/consts/index.js';
 import '../../../context/DynamicContext/DynamicContext.js';
 import '../../../utils/constants/colors.js';
 import '@dynamic-labs/multi-wallet';
-import '@dynamic-labs/utils';
 import { pixelToRem } from '../../../utils/functions/pixelToRem/pixelToRem.js';
 import '../../../components/ShadowDOM/ShadowDOM.js';
 import '../../../context/ThemeContext/ThemeContext.js';

package/src/lib/views/WalletLockedView/WalletLockedView.cjs

@@ -2,12 +2,13 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
+var _tslib = require('../../../../_virtual/_tslib.cjs');
 var jsxRuntime = require('react/jsx-runtime');
+var React = require('react');
 var walletBook = require('@dynamic-labs/wallet-book');
-require('react');
 var Typography = require('../../components/Typography/Typography.cjs');
 require('@dynamic-labs/sdk-api');
-require('../../shared/logger.cjs');
+var logger = require('../../shared/logger.cjs');
 require('@dynamic-labs/iconic');
 require('@dynamic-labs/wallet-connector-core');
 require('../../context/ViewContext/ViewContext.cjs');
@@ -51,15 +52,30 @@ require('../../components/MenuList/Dropdown/Dropdown.cjs');
 
 const iconSize = 64;
 const WalletLockedView = () => {
-    const { handleLogOut, primaryWallet, setShowAuthFlow } = useInternalDynamicContext.useInternalDynamicContext();
+    const { handleLogOut, primaryWallet, setShowAuthFlow, appName, authToken } = useInternalDynamicContext.useInternalDynamicContext();
+    React.useEffect(() => {
+        // when there is no valid session, we want to log user out
+        if (!authToken) {
+            handleLogOut();
+        }
+    }, [authToken, handleLogOut]);
     if (!primaryWallet) {
         return null;
     }
+    const handleConnectWallet = () => _tslib.__awaiter(void 0, void 0, void 0, function* () {
+        try {
+            yield primaryWallet.connector.connect();
+            setShowAuthFlow(false);
+        }
+        catch (_a) {
+            logger.logger.info('could not connect wallet');
+        }
+    });
     const icon = (jsxRuntime.jsx(walletBook.WalletIcon, { walletName: primaryWallet.connector.name, style: {
             height: pixelToRem.pixelToRem(iconSize * IconWithSpinner.iconRatio),
             width: pixelToRem.pixelToRem(iconSize * IconWithSpinner.iconRatio),
         } }));
-    return (jsxRuntime.jsxs("div", { "data-testid": 'wallet-locked-view', children: [jsxRuntime.jsx(ErrorContainer.ErrorContainer, { withIcon: false, className: 'wallet-locked-view__error-container', children: "We cannot connect to your wallet" }), jsxRuntime.jsxs("div", { className: 'wallet-locked-view__content', children: [jsxRuntime.jsx(IconWithSpinner.IconWithSpinner, { Icon: icon, iconSize: iconSize, className: 'wallet-locked-view__icon', isSpinning: true }), jsxRuntime.jsx(Typography.Typography, { variant: 'title', color: 'primary', weight: 'medium', className: 'wallet-locked-view__title', children: "Unlock your Wallet extension" }), jsxRuntime.jsx(Typography.Typography, { variant: 'body_normal', color: 'secondary', weight: 'regular', children: "Your wallet extension is locked. To continue, open your extension and unlock your wallet." }), jsxRuntime.jsx(Typography.Typography, { variant: 'body_normal', color: 'secondary', weight: 'regular', className: 'wallet-locked-view__button-header', children: "Once unlocked, click here" }), jsxRuntime.jsx(Button.Button, { buttonRounded: 'default', onClick: () => setShowAuthFlow(false), buttonClassName: 'wallet-locked-view__button', children: "I unlocked the wallet" }), jsxRuntime.jsx(Divider.Divider, { text: 'Or' }), jsxRuntime.jsx(TextButton.TextButton, { className: 'wallet-locked-view__log-out', onClick: handleLogOut, children: "Log out" })] })] }));
+    return (jsxRuntime.jsxs("div", { "data-testid": 'wallet-locked-view', children: [jsxRuntime.jsx(ErrorContainer.ErrorContainer, { withIcon: false, variant: 'success', className: 'wallet-locked-view__error-container', children: "Connect your wallet to continue" }), jsxRuntime.jsxs("div", { className: 'wallet-locked-view__content', children: [jsxRuntime.jsx(IconWithSpinner.IconWithSpinner, { Icon: icon, iconSize: iconSize, className: 'wallet-locked-view__icon', isSpinning: true }), jsxRuntime.jsx(Typography.Typography, { variant: 'title', color: 'primary', weight: 'medium', className: 'wallet-locked-view__title', children: "Welcome back." }), jsxRuntime.jsxs(Typography.Typography, { variant: 'body_normal', color: 'secondary', weight: 'regular', children: ["We couldn't connect to your wallet. Click connect to retry the connection ", appName, "."] }), jsxRuntime.jsx(Button.Button, { buttonRounded: 'default', onClick: () => handleConnectWallet(), buttonClassName: 'wallet-locked-view__button', children: "Connect wallet" }), jsxRuntime.jsx(Divider.Divider, { text: 'Or' }), jsxRuntime.jsx(TextButton.TextButton, { className: 'wallet-locked-view__log-out', onClick: handleLogOut, children: "Log out" })] })] }));
 };
 
 exports.WalletLockedView = WalletLockedView;

package/src/lib/views/WalletLockedView/WalletLockedView.js

@@ -1,9 +1,10 @@
+import { __awaiter } from '../../../../_virtual/_tslib.js';
 import { jsx, jsxs } from 'react/jsx-runtime';
+import { useEffect } from 'react';
 import { WalletIcon } from '@dynamic-labs/wallet-book';
-import 'react';
 import { Typography } from '../../components/Typography/Typography.js';
 import '@dynamic-labs/sdk-api';
-import '../../shared/logger.js';
+import { logger } from '../../shared/logger.js';
 import '@dynamic-labs/iconic';
 import '@dynamic-labs/wallet-connector-core';
 import '../../context/ViewContext/ViewContext.js';
@@ -47,15 +48,30 @@ import '../../components/MenuList/Dropdown/Dropdown.js';
 
 const iconSize = 64;
 const WalletLockedView = () => {
-    const { handleLogOut, primaryWallet, setShowAuthFlow } = useInternalDynamicContext();
+    const { handleLogOut, primaryWallet, setShowAuthFlow, appName, authToken } = useInternalDynamicContext();
+    useEffect(() => {
+        // when there is no valid session, we want to log user out
+        if (!authToken) {
+            handleLogOut();
+        }
+    }, [authToken, handleLogOut]);
     if (!primaryWallet) {
         return null;
     }
+    const handleConnectWallet = () => __awaiter(void 0, void 0, void 0, function* () {
+        try {
+            yield primaryWallet.connector.connect();
+            setShowAuthFlow(false);
+        }
+        catch (_a) {
+            logger.info('could not connect wallet');
+        }
+    });
     const icon = (jsx(WalletIcon, { walletName: primaryWallet.connector.name, style: {
             height: pixelToRem(iconSize * iconRatio),
             width: pixelToRem(iconSize * iconRatio),
         } }));
-    return (jsxs("div", { "data-testid": 'wallet-locked-view', children: [jsx(ErrorContainer, { withIcon: false, className: 'wallet-locked-view__error-container', children: "We cannot connect to your wallet" }), jsxs("div", { className: 'wallet-locked-view__content', children: [jsx(IconWithSpinner, { Icon: icon, iconSize: iconSize, className: 'wallet-locked-view__icon', isSpinning: true }), jsx(Typography, { variant: 'title', color: 'primary', weight: 'medium', className: 'wallet-locked-view__title', children: "Unlock your Wallet extension" }), jsx(Typography, { variant: 'body_normal', color: 'secondary', weight: 'regular', children: "Your wallet extension is locked. To continue, open your extension and unlock your wallet." }), jsx(Typography, { variant: 'body_normal', color: 'secondary', weight: 'regular', className: 'wallet-locked-view__button-header', children: "Once unlocked, click here" }), jsx(Button, { buttonRounded: 'default', onClick: () => setShowAuthFlow(false), buttonClassName: 'wallet-locked-view__button', children: "I unlocked the wallet" }), jsx(Divider, { text: 'Or' }), jsx(TextButton, { className: 'wallet-locked-view__log-out', onClick: handleLogOut, children: "Log out" })] })] }));
+    return (jsxs("div", { "data-testid": 'wallet-locked-view', children: [jsx(ErrorContainer, { withIcon: false, variant: 'success', className: 'wallet-locked-view__error-container', children: "Connect your wallet to continue" }), jsxs("div", { className: 'wallet-locked-view__content', children: [jsx(IconWithSpinner, { Icon: icon, iconSize: iconSize, className: 'wallet-locked-view__icon', isSpinning: true }), jsx(Typography, { variant: 'title', color: 'primary', weight: 'medium', className: 'wallet-locked-view__title', children: "Welcome back." }), jsxs(Typography, { variant: 'body_normal', color: 'secondary', weight: 'regular', children: ["We couldn't connect to your wallet. Click connect to retry the connection ", appName, "."] }), jsx(Button, { buttonRounded: 'default', onClick: () => handleConnectWallet(), buttonClassName: 'wallet-locked-view__button', children: "Connect wallet" }), jsx(Divider, { text: 'Or' }), jsx(TextButton, { className: 'wallet-locked-view__log-out', onClick: handleLogOut, children: "Log out" })] })] }));
 };
 
 export { WalletLockedView };

package/src/lib/views/viewToComponentMap.cjs

@@ -29,6 +29,7 @@ var BridgeWelcomeView = require('./BridgeWelcomeView/BridgeWelcomeView.cjs');
 var BridgeSummaryView = require('./BridgeSummaryView/BridgeSummaryView.cjs');
 var BridgeNextWalletConnectionView = require('./BridgeNextWalletConnectionView/BridgeNextWalletConnectionView.cjs');
 var AccountExistsView = require('./AccountExistsView/AccountExistsView.cjs');
+var MergeUserAccountsView = require('./MergeUserAccountsView/MergeUserAccountsView.cjs');
 
 const viewToComponentMap = {
     'account-exists': jsxRuntime.jsx(AccountExistsView.AccountExistsView, {}),
@@ -44,6 +45,7 @@ const viewToComponentMap = {
     'login-with-email-or-wallet': jsxRuntime.jsx(LoginWithEmailView.LoginWithEmailView, {}),
     'login-with-email-or-wallet-full-wallet-list': jsxRuntime.jsx(WalletList.WalletList, {}),
     'login-with-email-verification': jsxRuntime.jsx(EmailVerification.EmailVerification, {}),
+    'merge-user-accounts': jsxRuntime.jsx(MergeUserAccountsView.MergeUserAccountsView, {}),
     'network-not-supported': jsxRuntime.jsx(NetworkNotSupported.NetworkNotSupported, {}),
     'network-not-supported-manual': jsxRuntime.jsx(NetworkNotSupportedSwitchManual.NetworkNotSupportedSwitchManual, {}),
     'no-access': jsxRuntime.jsx(NoAccess.NoAccess, {}),

package/src/lib/views/viewToComponentMap.js

@@ -25,6 +25,7 @@ import { BridgeWelcomeView } from './BridgeWelcomeView/BridgeWelcomeView.js';
 import { BridgeSummaryView } from './BridgeSummaryView/BridgeSummaryView.js';
 import { BridgeNextWalletConnectionView } from './BridgeNextWalletConnectionView/BridgeNextWalletConnectionView.js';
 import { AccountExistsView } from './AccountExistsView/AccountExistsView.js';
+import { MergeUserAccountsView } from './MergeUserAccountsView/MergeUserAccountsView.js';
 
 const viewToComponentMap = {
     'account-exists': jsx(AccountExistsView, {}),
@@ -40,6 +41,7 @@ const viewToComponentMap = {
     'login-with-email-or-wallet': jsx(LoginWithEmailView, {}),
     'login-with-email-or-wallet-full-wallet-list': jsx(WalletList, {}),
     'login-with-email-verification': jsx(EmailVerification, {}),
+    'merge-user-accounts': jsx(MergeUserAccountsView, {}),
     'network-not-supported': jsx(NetworkNotSupported, {}),
     'network-not-supported-manual': jsx(NetworkNotSupportedSwitchManual, {}),
     'no-access': jsx(NoAccess, {}),

package/src/lib/widgets/DynamicWidget/hooks/useFetchCurrency/useFetchCurrency.cjs

@@ -18,7 +18,10 @@ const useFetchCurrency = (connector, network) => {
                 setCurrency(chainInfo === null || chainInfo === void 0 ? void 0 : chainInfo.symbol);
                 return;
             }
-            const result = (_b = connector.evmNetworks) === null || _b === void 0 ? void 0 : _b.find((element) => element.chainId === chainId);
+            const network = connector.connectedChain === 'STARK'
+                ? 'starknetNetworks'
+                : 'evmNetworks';
+            const result = (_b = connector[network]) === null || _b === void 0 ? void 0 : _b.find((element) => element.chainId === chainId);
             setCurrency((_d = (_c = result === null || result === void 0 ? void 0 : result.nativeCurrency) === null || _c === void 0 ? void 0 : _c.symbol) !== null && _d !== void 0 ? _d : chainInfo === null || chainInfo === void 0 ? void 0 : chainInfo.symbol);
             return [currency];
         });

package/src/lib/widgets/DynamicWidget/hooks/useFetchCurrency/useFetchCurrency.js

@@ -14,7 +14,10 @@ const useFetchCurrency = (connector, network) => {
                 setCurrency(chainInfo === null || chainInfo === void 0 ? void 0 : chainInfo.symbol);
                 return;
             }
-            const result = (_b = connector.evmNetworks) === null || _b === void 0 ? void 0 : _b.find((element) => element.chainId === chainId);
+            const network = connector.connectedChain === 'STARK'
+                ? 'starknetNetworks'
+                : 'evmNetworks';
+            const result = (_b = connector[network]) === null || _b === void 0 ? void 0 : _b.find((element) => element.chainId === chainId);
             setCurrency((_d = (_c = result === null || result === void 0 ? void 0 : result.nativeCurrency) === null || _c === void 0 ? void 0 : _c.symbol) !== null && _d !== void 0 ? _d : chainInfo === null || chainInfo === void 0 ? void 0 : chainInfo.symbol);
             return [currency];
         });

package/src/lib/widgets/OAuthIFrameContainer/OAuthIFrameContainer.cjs

@@ -0,0 +1,13 @@
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+var jsxRuntime = require('react/jsx-runtime');
+
+// we need to use an iframe to be the intermediary in communications between the oauth popup and the sdk
+// because of twitter limitations with accessing the window.opener and BroadcastChannel not working between
+// different origins (our api redirect page and the app where the sdk is running)
+// https://linear.app/dynamic-labs/issue/GVTY-17/[frontend]-fix-twitter-linking
+const OAuthIFrameContainer = () => (jsxRuntime.jsx("div", { id: 'oauth-iframe-container', "data-testid": 'oauth-iframe-container', style: { height: 0, visibility: 'hidden', width: 0 } }));
+
+exports.OAuthIFrameContainer = OAuthIFrameContainer;

package/src/lib/widgets/OAuthIFrameContainer/OAuthIFrameContainer.d.ts

@@ -0,0 +1,2 @@
+/// <reference types="react" />
+export declare const OAuthIFrameContainer: () => JSX.Element;

package/src/lib/widgets/OAuthIFrameContainer/OAuthIFrameContainer.js

@@ -0,0 +1,9 @@
+import { jsx } from 'react/jsx-runtime';
+
+// we need to use an iframe to be the intermediary in communications between the oauth popup and the sdk
+// because of twitter limitations with accessing the window.opener and BroadcastChannel not working between
+// different origins (our api redirect page and the app where the sdk is running)
+// https://linear.app/dynamic-labs/issue/GVTY-17/[frontend]-fix-twitter-linking
+const OAuthIFrameContainer = () => (jsx("div", { id: 'oauth-iframe-container', "data-testid": 'oauth-iframe-container', style: { height: 0, visibility: 'hidden', width: 0 } }));
+
+export { OAuthIFrameContainer };

package/src/lib/widgets/OAuthIFrameContainer/index.d.ts

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

package/src/lib/widgets/index.d.ts

@@ -1,3 +1,4 @@
 export * from './DynamicWidget';
 export * from './FundingWidget';
 export * from './DynamicBridgeWidget';
+export * from './OAuthIFrameContainer';

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

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