@dynamic-labs/sdk-react-core 3.0.0-alpha.6 → 3.0.0-alpha.7

package/src/lib/utils/hooks/useWalletEventListeners/useWalletEventListeners.cjs

@@ -18,7 +18,7 @@ require('../../../shared/utils/classes/storage/localStorage.cjs');
 require('../../../shared/utils/classes/storage/sessionStorage.cjs');
 require('@dynamic-labs/utils');
 require('../../../shared/consts/index.cjs');
-require('../../../events/dynamicEvents.cjs');
+var useDynamicEvents = require('../events/useDynamicEvents/useDynamicEvents.cjs');
 var useWalletConnectorEvent = require('../events/useWalletConnectorEvent/useWalletConnectorEvent.cjs');
 
 const useWalletEventListeners = ({ disconnectWallet, handleLogOut, multiWallet, multiWalletWidgetState, primaryWallet, secondaryWallets, selectedWalletConnector, selectedWalletWithAction, setSelectedWalletConnectorKey, setSelectedWalletWithAction, setMultiWalletWidgetState, user, setPrimaryWalletId, authMode, refreshConnectedWallet, }) => {
@@ -33,10 +33,29 @@ const useWalletEventListeners = ({ disconnectWallet, handleLogOut, multiWallet,
         }
         refreshConnectedWallet(primaryWallet.id, primaryWallet.connector);
     });
-    useWalletConnectorEvent.useWalletConnectorEvent(primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.connector, 'accountChange', ({ accounts }) => {
-        logger.logger.debug('primary wallet account change', {
-            accounts,
-        });
+    const handleAccountChangeWhenAwaitingAccountSwitch = React.useCallback((isPrimaryWallet, newAddress) => {
+        const linkedSecondaryWallet = secondaryWallets.find((wallet) => walletConnectorCore.isSameAddress(wallet.address, newAddress, wallet.chain));
+        // this means the user is linking a new account, so we need proof of ownership...
+        if (!linkedSecondaryWallet) {
+            setMultiWalletWidgetState('awaiting_signature', undefined, 'linking_new_wallet');
+            if (isPrimaryWallet && primaryWallet) {
+                setSelectedWalletConnectorKey(primaryWallet.connector.key);
+            }
+            return;
+        }
+        // ...otherwise, the user is switching primary accounts betweeen the same wallet
+        setSelectedWalletWithAction(null);
+        setPrimaryWalletId(linkedSecondaryWallet.id);
+        setMultiWalletWidgetState('idle');
+    }, [
+        setMultiWalletWidgetState,
+        primaryWallet,
+        secondaryWallets,
+        setSelectedWalletConnectorKey,
+        setSelectedWalletWithAction,
+        setPrimaryWalletId,
+    ]);
+    const calculatePrimaryWalletMultiWalletStateFromAccounts = React.useCallback(({ accounts }) => {
         // change the api here
         if (!primaryWallet)
             return;
@@ -75,6 +94,26 @@ const useWalletEventListeners = ({ disconnectWallet, handleLogOut, multiWallet,
             logger.logger.error(`Unexpected multiWalletWidgetState (${multiWalletWidgetState}) and onAccountChange combination. Resetting state to idle.`);
             setMultiWalletWidgetState('idle');
         }
+    }, [
+        authMode,
+        handleAccountChangeWhenAwaitingAccountSwitch,
+        multiWallet,
+        multiWalletWidgetState,
+        primaryWallet,
+        refreshConnectedWallet,
+        secondaryWallets,
+        setMultiWalletWidgetState,
+        setPrimaryWalletId,
+        setSelectedWalletConnectorKey,
+        setSelectedWalletWithAction,
+        user,
+    ]);
+    useDynamicEvents.useInternalDynamicEvents('triggerComputePrimaryWalletMultiWalletStateFromAccounts', calculatePrimaryWalletMultiWalletStateFromAccounts);
+    useWalletConnectorEvent.useWalletConnectorEvent(primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.connector, 'accountChange', ({ accounts }) => {
+        logger.logger.debug('primary wallet account change', {
+            accounts,
+        });
+        calculatePrimaryWalletMultiWalletStateFromAccounts({ accounts });
     });
     const uniqueNonPrimaryWallets = React.useMemo(() => {
         const primaryConnector = primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.connector;
@@ -118,28 +157,6 @@ const useWalletEventListeners = ({ disconnectWallet, handleLogOut, multiWallet,
             }
         }
     });
-    const handleAccountChangeWhenAwaitingAccountSwitch = React.useCallback((isPrimaryWallet, newAddress) => {
-        const linkedSecondaryWallet = secondaryWallets.find((wallet) => walletConnectorCore.isSameAddress(wallet.address, newAddress, wallet.chain));
-        // this means the user is linking a new account, so we need proof of ownership...
-        if (!linkedSecondaryWallet) {
-            setMultiWalletWidgetState('awaiting_signature', undefined, 'linking_new_wallet');
-            if (isPrimaryWallet && primaryWallet) {
-                setSelectedWalletConnectorKey(primaryWallet.connector.key);
-            }
-            return;
-        }
-        // ...otherwise, the user is switching primary accounts betweeen the same wallet
-        setSelectedWalletWithAction(null);
-        setPrimaryWalletId(linkedSecondaryWallet.id);
-        setMultiWalletWidgetState('idle');
-    }, [
-        setMultiWalletWidgetState,
-        primaryWallet,
-        secondaryWallets,
-        setSelectedWalletConnectorKey,
-        setSelectedWalletWithAction,
-        setPrimaryWalletId,
-    ]);
 };
 
 exports.useWalletEventListeners = useWalletEventListeners;

package/src/lib/utils/hooks/useWalletEventListeners/useWalletEventListeners.js

@@ -1,6 +1,6 @@
 'use client'
 import { __awaiter } from '../../../../../_virtual/_tslib.js';
-import { useMemo, useCallback } from 'react';
+import { useCallback, useMemo } from 'react';
 import { isSameAddress } from '@dynamic-labs/wallet-connector-core';
 import '@dynamic-labs/sdk-api-core';
 import { logger } from '../../../shared/logger.js';
@@ -14,7 +14,7 @@ import '../../../shared/utils/classes/storage/localStorage.js';
 import '../../../shared/utils/classes/storage/sessionStorage.js';
 import '@dynamic-labs/utils';
 import '../../../shared/consts/index.js';
-import '../../../events/dynamicEvents.js';
+import { useInternalDynamicEvents } from '../events/useDynamicEvents/useDynamicEvents.js';
 import { useWalletConnectorEvent } from '../events/useWalletConnectorEvent/useWalletConnectorEvent.js';
 
 const useWalletEventListeners = ({ disconnectWallet, handleLogOut, multiWallet, multiWalletWidgetState, primaryWallet, secondaryWallets, selectedWalletConnector, selectedWalletWithAction, setSelectedWalletConnectorKey, setSelectedWalletWithAction, setMultiWalletWidgetState, user, setPrimaryWalletId, authMode, refreshConnectedWallet, }) => {
@@ -29,10 +29,29 @@ const useWalletEventListeners = ({ disconnectWallet, handleLogOut, multiWallet,
         }
         refreshConnectedWallet(primaryWallet.id, primaryWallet.connector);
     });
-    useWalletConnectorEvent(primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.connector, 'accountChange', ({ accounts }) => {
-        logger.debug('primary wallet account change', {
-            accounts,
-        });
+    const handleAccountChangeWhenAwaitingAccountSwitch = useCallback((isPrimaryWallet, newAddress) => {
+        const linkedSecondaryWallet = secondaryWallets.find((wallet) => isSameAddress(wallet.address, newAddress, wallet.chain));
+        // this means the user is linking a new account, so we need proof of ownership...
+        if (!linkedSecondaryWallet) {
+            setMultiWalletWidgetState('awaiting_signature', undefined, 'linking_new_wallet');
+            if (isPrimaryWallet && primaryWallet) {
+                setSelectedWalletConnectorKey(primaryWallet.connector.key);
+            }
+            return;
+        }
+        // ...otherwise, the user is switching primary accounts betweeen the same wallet
+        setSelectedWalletWithAction(null);
+        setPrimaryWalletId(linkedSecondaryWallet.id);
+        setMultiWalletWidgetState('idle');
+    }, [
+        setMultiWalletWidgetState,
+        primaryWallet,
+        secondaryWallets,
+        setSelectedWalletConnectorKey,
+        setSelectedWalletWithAction,
+        setPrimaryWalletId,
+    ]);
+    const calculatePrimaryWalletMultiWalletStateFromAccounts = useCallback(({ accounts }) => {
         // change the api here
         if (!primaryWallet)
             return;
@@ -71,6 +90,26 @@ const useWalletEventListeners = ({ disconnectWallet, handleLogOut, multiWallet,
             logger.error(`Unexpected multiWalletWidgetState (${multiWalletWidgetState}) and onAccountChange combination. Resetting state to idle.`);
             setMultiWalletWidgetState('idle');
         }
+    }, [
+        authMode,
+        handleAccountChangeWhenAwaitingAccountSwitch,
+        multiWallet,
+        multiWalletWidgetState,
+        primaryWallet,
+        refreshConnectedWallet,
+        secondaryWallets,
+        setMultiWalletWidgetState,
+        setPrimaryWalletId,
+        setSelectedWalletConnectorKey,
+        setSelectedWalletWithAction,
+        user,
+    ]);
+    useInternalDynamicEvents('triggerComputePrimaryWalletMultiWalletStateFromAccounts', calculatePrimaryWalletMultiWalletStateFromAccounts);
+    useWalletConnectorEvent(primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.connector, 'accountChange', ({ accounts }) => {
+        logger.debug('primary wallet account change', {
+            accounts,
+        });
+        calculatePrimaryWalletMultiWalletStateFromAccounts({ accounts });
     });
     const uniqueNonPrimaryWallets = useMemo(() => {
         const primaryConnector = primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.connector;
@@ -114,28 +153,6 @@ const useWalletEventListeners = ({ disconnectWallet, handleLogOut, multiWallet,
             }
         }
     });
-    const handleAccountChangeWhenAwaitingAccountSwitch = useCallback((isPrimaryWallet, newAddress) => {
-        const linkedSecondaryWallet = secondaryWallets.find((wallet) => isSameAddress(wallet.address, newAddress, wallet.chain));
-        // this means the user is linking a new account, so we need proof of ownership...
-        if (!linkedSecondaryWallet) {
-            setMultiWalletWidgetState('awaiting_signature', undefined, 'linking_new_wallet');
-            if (isPrimaryWallet && primaryWallet) {
-                setSelectedWalletConnectorKey(primaryWallet.connector.key);
-            }
-            return;
-        }
-        // ...otherwise, the user is switching primary accounts betweeen the same wallet
-        setSelectedWalletWithAction(null);
-        setPrimaryWalletId(linkedSecondaryWallet.id);
-        setMultiWalletWidgetState('idle');
-    }, [
-        setMultiWalletWidgetState,
-        primaryWallet,
-        secondaryWallets,
-        setSelectedWalletConnectorKey,
-        setSelectedWalletWithAction,
-        setPrimaryWalletId,
-    ]);
 };
 
 export { useWalletEventListeners };

package/src/lib/views/MergeUserAccountsView/MergeUserAccountsView.cjs

@@ -7,23 +7,20 @@ var _tslib = require('../../../../_virtual/_tslib.cjs');
 var jsxRuntime = require('react/jsx-runtime');
 var React = require('react');
 var reactI18next = require('react-i18next');
-var walletBook = require('@dynamic-labs/wallet-book');
-var iconic = require('@dynamic-labs/iconic');
 require('../../events/dynamicEvents.cjs');
 require('@dynamic-labs/utils');
 require('../../context/DynamicContext/DynamicContext.cjs');
 require('@dynamic-labs/sdk-api-core');
 var logger = require('../../shared/logger.cjs');
+require('@dynamic-labs/iconic');
 require('@dynamic-labs/wallet-connector-core');
 var ViewContext = require('../../context/ViewContext/ViewContext.cjs');
-var add = require('../../shared/assets/add.cjs');
-var shortenWalletAddress = require('../../shared/utils/functions/shortenWalletAddress/shortenWalletAddress.cjs');
+require('@dynamic-labs/wallet-book');
 require('../../utils/constants/colors.cjs');
 require('../../utils/constants/values.cjs');
 require('../../shared/utils/classes/storage/localStorage.cjs');
 require('../../shared/utils/classes/storage/sessionStorage.cjs');
 require('../../shared/consts/index.cjs');
-var useInternalDynamicContext = require('../../context/DynamicContext/useDynamicContext/useInternalDynamicContext.cjs');
 require('../../context/CaptchaContext/CaptchaContext.cjs');
 require('../../context/ErrorContext/ErrorContext.cjs');
 require('@dynamic-labs/multi-wallet');
@@ -83,12 +80,11 @@ require('../../widgets/DynamicWidget/views/ManagePasskeysWidgetView/PasskeyCard/
 var useMergeUserAccounts = require('../../utils/hooks/useMergeUserAccounts/useMergeUserAccounts.cjs');
 
 const MergeUserAccountsView = (props) => {
-    const { selectedWalletConnector } = useInternalDynamicContext.useInternalDynamicContext();
     const { setView } = ViewContext.useViewContext();
     const { mergeUserAccounts } = useMergeUserAccounts.useMergeUserAccounts();
     const { t } = reactI18next.useTranslation();
     const [error, setError] = React.useState('');
-    const { mergeConflicts, walletAddress } = props;
+    const { mergeConflicts } = props;
     const goToConflictsResolutionView = () => {
         // back button on conflicts resolution view should go back to this view
         const onConflictsResolutionBackClick = () => {
@@ -112,13 +108,7 @@ const MergeUserAccountsView = (props) => {
             setError(t('dyn_merge_user_accounts.errors.merge_error'));
         }
     });
-    const renderDuplicatedInfo = () => {
-        if (walletAddress) {
-            return (jsxRuntime.jsxs(jsxRuntime.Fragment, { children: [jsxRuntime.jsx(walletBook.WalletIcon, { walletKey: selectedWalletConnector === null || selectedWalletConnector === void 0 ? void 0 : selectedWalletConnector.key, className: 'merge-user-accounts__accounts__item__icon' }), jsxRuntime.jsx(Typography.Typography, { variant: 'body_small', weight: 'bold', color: 'secondary', className: 'merge-user-accounts__accounts__item__text', children: shortenWalletAddress.shortenWalletAddress(walletAddress, 3, 3) })] }));
-        }
-        return (jsxRuntime.jsx(iconic.UserProfileIcon, { className: 'merge-user-accounts__accounts__item__icon' }));
-    };
-    return (jsxRuntime.jsxs("div", { className: 'merge-user-accounts', children: [error && (jsxRuntime.jsx(Alert.Alert, { icon: 'error', variant: 'error', className: 'merge-user-accounts__error', children: error })), jsxRuntime.jsxs("div", { className: 'merge-user-accounts__container', children: [jsxRuntime.jsx(Typography.Typography, { variant: 'body_normal', weight: 'regular', color: 'secondary', className: 'merge-user-accounts__title', copykey: 'dyn_merge_user_accounts.wallet.content', children: t('dyn_merge_user_accounts.wallet.content') }), jsxRuntime.jsxs("div", { className: 'merge-user-accounts__accounts', children: [jsxRuntime.jsx("div", { className: 'merge-user-accounts__accounts__item', children: renderDuplicatedInfo() }), jsxRuntime.jsxs("div", { className: 'merge-user-accounts__accounts__divider', children: [jsxRuntime.jsx("div", { className: 'merge-user-accounts__accounts__divider__dash' }), jsxRuntime.jsx("div", { className: 'merge-user-accounts__accounts__divider__icon', children: jsxRuntime.jsx(add.ReactComponent, {}) })] }), jsxRuntime.jsx("div", { className: 'merge-user-accounts__accounts__item', children: renderDuplicatedInfo() })] }), jsxRuntime.jsx(TypographyButton.TypographyButton, { onClick: handleMergeConfirm, buttonClassName: 'merge-user-accounts__button', buttonVariant: 'brand-primary', buttonPadding: 'large', typographyProps: {
+    return (jsxRuntime.jsxs("div", { className: 'merge-user-accounts', children: [error && (jsxRuntime.jsx(Alert.Alert, { icon: 'error', variant: 'error', className: 'merge-user-accounts__error', children: error })), jsxRuntime.jsxs("div", { className: 'merge-user-accounts__container', children: [jsxRuntime.jsx(Typography.Typography, { variant: 'body_normal', weight: 'regular', color: 'secondary', className: 'merge-user-accounts__title', copykey: 'dyn_merge_user_accounts.wallet.content', children: t('dyn_merge_user_accounts.wallet.content') }), jsxRuntime.jsx(TypographyButton.TypographyButton, { onClick: handleMergeConfirm, buttonClassName: 'merge-user-accounts__button', buttonVariant: 'brand-primary', buttonPadding: 'large', typographyProps: {
                             color: 'inherit',
                         }, expanded: true, copykey: 'dyn_merge_user_accounts.confirm_button', children: t('dyn_merge_user_accounts.confirm_button') })] })] }));
 };

package/src/lib/views/MergeUserAccountsView/MergeUserAccountsView.js

@@ -1,25 +1,22 @@
 'use client'
 import { __awaiter } from '../../../../_virtual/_tslib.js';
-import { jsxs, jsx, Fragment } from 'react/jsx-runtime';
+import { jsxs, jsx } from 'react/jsx-runtime';
 import { useState } from 'react';
 import { useTranslation } from 'react-i18next';
-import { WalletIcon } from '@dynamic-labs/wallet-book';
-import { UserProfileIcon } from '@dynamic-labs/iconic';
 import '../../events/dynamicEvents.js';
 import '@dynamic-labs/utils';
 import '../../context/DynamicContext/DynamicContext.js';
 import '@dynamic-labs/sdk-api-core';
 import { logger } from '../../shared/logger.js';
+import '@dynamic-labs/iconic';
 import '@dynamic-labs/wallet-connector-core';
 import { useViewContext } from '../../context/ViewContext/ViewContext.js';
-import { ReactComponent as SvgAdd } from '../../shared/assets/add.js';
-import { shortenWalletAddress } from '../../shared/utils/functions/shortenWalletAddress/shortenWalletAddress.js';
+import '@dynamic-labs/wallet-book';
 import '../../utils/constants/colors.js';
 import '../../utils/constants/values.js';
 import '../../shared/utils/classes/storage/localStorage.js';
 import '../../shared/utils/classes/storage/sessionStorage.js';
 import '../../shared/consts/index.js';
-import { useInternalDynamicContext } from '../../context/DynamicContext/useDynamicContext/useInternalDynamicContext.js';
 import '../../context/CaptchaContext/CaptchaContext.js';
 import '../../context/ErrorContext/ErrorContext.js';
 import '@dynamic-labs/multi-wallet';
@@ -79,12 +76,11 @@ import '../../widgets/DynamicWidget/views/ManagePasskeysWidgetView/PasskeyCard/P
 import { useMergeUserAccounts } from '../../utils/hooks/useMergeUserAccounts/useMergeUserAccounts.js';
 
 const MergeUserAccountsView = (props) => {
-    const { selectedWalletConnector } = useInternalDynamicContext();
     const { setView } = useViewContext();
     const { mergeUserAccounts } = useMergeUserAccounts();
     const { t } = useTranslation();
     const [error, setError] = useState('');
-    const { mergeConflicts, walletAddress } = props;
+    const { mergeConflicts } = props;
     const goToConflictsResolutionView = () => {
         // back button on conflicts resolution view should go back to this view
         const onConflictsResolutionBackClick = () => {
@@ -108,13 +104,7 @@ const MergeUserAccountsView = (props) => {
             setError(t('dyn_merge_user_accounts.errors.merge_error'));
         }
     });
-    const renderDuplicatedInfo = () => {
-        if (walletAddress) {
-            return (jsxs(Fragment, { children: [jsx(WalletIcon, { walletKey: selectedWalletConnector === null || selectedWalletConnector === void 0 ? void 0 : selectedWalletConnector.key, className: 'merge-user-accounts__accounts__item__icon' }), jsx(Typography, { variant: 'body_small', weight: 'bold', color: 'secondary', className: 'merge-user-accounts__accounts__item__text', children: shortenWalletAddress(walletAddress, 3, 3) })] }));
-        }
-        return (jsx(UserProfileIcon, { className: 'merge-user-accounts__accounts__item__icon' }));
-    };
-    return (jsxs("div", { className: 'merge-user-accounts', children: [error && (jsx(Alert, { icon: 'error', variant: 'error', className: 'merge-user-accounts__error', children: error })), jsxs("div", { className: 'merge-user-accounts__container', children: [jsx(Typography, { variant: 'body_normal', weight: 'regular', color: 'secondary', className: 'merge-user-accounts__title', copykey: 'dyn_merge_user_accounts.wallet.content', children: t('dyn_merge_user_accounts.wallet.content') }), jsxs("div", { className: 'merge-user-accounts__accounts', children: [jsx("div", { className: 'merge-user-accounts__accounts__item', children: renderDuplicatedInfo() }), jsxs("div", { className: 'merge-user-accounts__accounts__divider', children: [jsx("div", { className: 'merge-user-accounts__accounts__divider__dash' }), jsx("div", { className: 'merge-user-accounts__accounts__divider__icon', children: jsx(SvgAdd, {}) })] }), jsx("div", { className: 'merge-user-accounts__accounts__item', children: renderDuplicatedInfo() })] }), jsx(TypographyButton, { onClick: handleMergeConfirm, buttonClassName: 'merge-user-accounts__button', buttonVariant: 'brand-primary', buttonPadding: 'large', typographyProps: {
+    return (jsxs("div", { className: 'merge-user-accounts', children: [error && (jsx(Alert, { icon: 'error', variant: 'error', className: 'merge-user-accounts__error', children: error })), jsxs("div", { className: 'merge-user-accounts__container', children: [jsx(Typography, { variant: 'body_normal', weight: 'regular', color: 'secondary', className: 'merge-user-accounts__title', copykey: 'dyn_merge_user_accounts.wallet.content', children: t('dyn_merge_user_accounts.wallet.content') }), jsx(TypographyButton, { onClick: handleMergeConfirm, buttonClassName: 'merge-user-accounts__button', buttonVariant: 'brand-primary', buttonPadding: 'large', typographyProps: {
                             color: 'inherit',
                         }, expanded: true, copykey: 'dyn_merge_user_accounts.confirm_button', children: t('dyn_merge_user_accounts.confirm_button') })] })] }));
 };

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

@@ -104,6 +104,8 @@ const TransactionConfirmationView = ({ transaction, onError, onSuccess, mutation
      * to reflect the new fee on the UI
      */
     const fetchTransactionFee = () => {
+        if (chainName === 'Solana' && transaction.fee)
+            return;
         transaction.fetchFee().finally(update);
     };
     const { isLoading: isGasSponsoredLoading } = usePromise.usePromise(() => {
@@ -135,7 +137,7 @@ const TransactionConfirmationView = ({ transaction, onError, onSuccess, mutation
         },
         onSuccess: (tx) => onSuccess === null || onSuccess === void 0 ? void 0 : onSuccess(tx),
     });
-    // Refresh transaction fee
+    // Refresh transaction fee, Solana fees are static based on transaction data, dont need to refresh them
     useInterval.useInterval(fetchTransactionFee, isLoading ? null : FEE_REFRESH_INTERVAL);
     useEffectOnce.useEffectOnce(fetchTransactionFee);
     const total = useTransactionTotal.useTransactionTotal({

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

@@ -100,6 +100,8 @@ const TransactionConfirmationView = ({ transaction, onError, onSuccess, mutation
      * to reflect the new fee on the UI
      */
     const fetchTransactionFee = () => {
+        if (chainName === 'Solana' && transaction.fee)
+            return;
         transaction.fetchFee().finally(update);
     };
     const { isLoading: isGasSponsoredLoading } = usePromise(() => {
@@ -131,7 +133,7 @@ const TransactionConfirmationView = ({ transaction, onError, onSuccess, mutation
         },
         onSuccess: (tx) => onSuccess === null || onSuccess === void 0 ? void 0 : onSuccess(tx),
     });
-    // Refresh transaction fee
+    // Refresh transaction fee, Solana fees are static based on transaction data, dont need to refresh them
     useInterval(fetchTransactionFee, isLoading ? null : FEE_REFRESH_INTERVAL);
     useEffectOnce(fetchTransactionFee);
     const total = useTransactionTotal({

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

@@ -88,16 +88,14 @@ var useInternalDynamicContext = require('../../context/DynamicContext/useDynamic
 var index = require('../../utils/functions/walletFilters/index.cjs');
 var SearchNotFoundMessage = require('./SearchNotFoundMessage/SearchNotFoundMessage.cjs');
 var WalletListGridTabs = require('./WalletListGridTabs/WalletListGridTabs.cjs');
-var useTabState = require('./hooks/useTabState.cjs');
 var getEffectiveWalletFilter = require('./utils/getEffectiveWalletFilter.cjs');
 var getEffectiveRecommendedWallets = require('./utils/getEffectiveRecommendedWallets.cjs');
 
 localStorage.LocalStorage.setToLS(localStorage$1.WALLET_PICKER_SEARCH_KEY, '');
 const WalletList = ({ isWalletConnectList = false, }) => {
     var _a;
-    const { walletsFilter, signWithEmailWalletName, walletConnectorOptions, projectSettings, defaultNumberOfWalletsToShow, bridgeChainsToConnect, authMode, multiWallet, recommendedWallets, } = useInternalDynamicContext.useInternalDynamicContext();
+    const { walletsFilter, signWithEmailWalletName, walletConnectorOptions, projectSettings, defaultNumberOfWalletsToShow, bridgeChainsToConnect, authMode, multiWallet, recommendedWallets, selectedTabIndex, setSelectedTabIndex, selectedTabSettings, tabsItems, } = useInternalDynamicContext.useInternalDynamicContext();
     const userWallets = UserWalletsContext.useUserWallets();
-    const { selectedTabIndex, setSelectedTabIndex, selectedTabSettings, tabsItems, } = useTabState.useTabState();
     const { walletBook: walletBook$1 } = walletBook.useWalletBookContext();
     const { error } = ErrorContext.useErrorContext();
     const { showDefaultFooter } = useAuthLayoutChecks.useAuthLayoutChecks();

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

@@ -84,16 +84,14 @@ import { useInternalDynamicContext } from '../../context/DynamicContext/useDynam
 import { FilterBridgeChainsName } from '../../utils/functions/walletFilters/index.js';
 import { SearchNotFoundMessage } from './SearchNotFoundMessage/SearchNotFoundMessage.js';
 import { WalletListGridTabs } from './WalletListGridTabs/WalletListGridTabs.js';
-import { useTabState } from './hooks/useTabState.js';
 import { getEffectiveWalletFilter } from './utils/getEffectiveWalletFilter.js';
 import { getEffectiveRecommendedWallets } from './utils/getEffectiveRecommendedWallets.js';
 
 LocalStorage.setToLS(WALLET_PICKER_SEARCH_KEY, '');
 const WalletList = ({ isWalletConnectList = false, }) => {
     var _a;
-    const { walletsFilter, signWithEmailWalletName, walletConnectorOptions, projectSettings, defaultNumberOfWalletsToShow, bridgeChainsToConnect, authMode, multiWallet, recommendedWallets, } = useInternalDynamicContext();
+    const { walletsFilter, signWithEmailWalletName, walletConnectorOptions, projectSettings, defaultNumberOfWalletsToShow, bridgeChainsToConnect, authMode, multiWallet, recommendedWallets, selectedTabIndex, setSelectedTabIndex, selectedTabSettings, tabsItems, } = useInternalDynamicContext();
     const userWallets = useUserWallets();
-    const { selectedTabIndex, setSelectedTabIndex, selectedTabSettings, tabsItems, } = useTabState();
     const { walletBook } = useWalletBookContext();
     const { error } = useErrorContext();
     const { showDefaultFooter } = useAuthLayoutChecks();

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

@@ -4,94 +4,19 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 var React = require('react');
-require('../../../events/dynamicEvents.cjs');
-require('../../../../../_virtual/_tslib.cjs');
-require('@dynamic-labs/utils');
-require('../../../context/DynamicContext/DynamicContext.cjs');
-require('@dynamic-labs/sdk-api-core');
-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('../../../utils/constants/values.cjs');
-require('../../../shared/utils/classes/storage/localStorage.cjs');
-require('../../../shared/utils/classes/storage/sessionStorage.cjs');
-require('../../../shared/consts/index.cjs');
-var useInternalDynamicContext = require('../../../context/DynamicContext/useDynamicContext/useInternalDynamicContext.cjs');
-require('../../../context/CaptchaContext/CaptchaContext.cjs');
-require('../../../context/ErrorContext/ErrorContext.cjs');
-require('@dynamic-labs/multi-wallet');
-require('react-international-phone');
-require('../../../config/ApiEndpoint.cjs');
-require('@dynamic-labs/store');
-require('../../../locale/locale.cjs');
-require('../../../context/AccessDeniedContext/AccessDeniedContext.cjs');
-require('../../../context/AccountExistsContext/AccountExistsContext.cjs');
-require('../../../context/UserWalletsContext/UserWalletsContext.cjs');
-require('../../../context/VerificationContext/VerificationContext.cjs');
-require('react-dom');
-require('../../../context/WalletContext/WalletContext.cjs');
-require('../../../context/ThemeContext/ThemeContext.cjs');
-require('../../../utils/hooks/useUserUpdateRequest/useUpdateUser/userFieldsSchema.cjs');
-require('@dynamic-labs/types');
-require('../../../context/LoadingContext/LoadingContext.cjs');
-require('yup');
-require('../../../context/MockContext/MockContext.cjs');
-require('../../CollectUserDataView/useFields.cjs');
-require('../../../context/FieldsStateContext/FieldsStateContext.cjs');
-require('../../../context/UserFieldEditorContext/UserFieldEditorContext.cjs');
-require('@dynamic-labs/rpc-providers');
-require('react-i18next');
-require('../../../components/Accordion/components/AccordionItem/AccordionItem.cjs');
-require('../../../components/Alert/Alert.cjs');
-require('../../../components/ShadowDOM/ShadowDOM.cjs');
-require('../../../components/IconButton/IconButton.cjs');
-require('../../../components/InlineWidget/InlineWidget.cjs');
-require('../../../components/Input/Input.cjs');
-require('../../../components/IsBrowser/IsBrowser.cjs');
-require('../../../components/MenuList/Dropdown/Dropdown.cjs');
-require('../../../components/Transition/ZoomTransition/ZoomTransition.cjs');
-require('../../../components/Transition/SlideInUpTransition/SlideInUpTransition.cjs');
-require('../../../components/Transition/OpacityTransition/OpacityTransition.cjs');
-require('../../../components/OverlayCard/OverlayCardTarget/OverlayCardTarget.cjs');
-require('../../../components/PasskeyCreatedSuccessBanner/PasskeyCreatedSuccessBanner.cjs');
-require('../../../components/Popper/Popper/Popper.cjs');
-require('../../../components/Popper/PopperContext/PopperContext.cjs');
-require('react-focus-lock');
-require('qrcode');
-require('formik');
-require('../WalletList.cjs');
-require('../../../context/SocialRedirectContext/SocialRedirectContext.cjs');
-require('../../../widgets/DynamicBridgeWidget/views/WalletsView/components/SecondaryWallets/SecondaryWallets.cjs');
-require('@hcaptcha/react-hcaptcha');
-require('../../../context/FooterAnimationContext/index.cjs');
-require('../../../context/WalletGroupContext/WalletGroupContext.cjs');
-require('../../../context/MfaSettingsContext/MfaSettingsContext.cjs');
-require('../../../context/IpConfigurationContext/IpConfigurationContext.cjs');
-require('../../../context/PasskeyContext/PasskeyContext.cjs');
-require('../../../widgets/DynamicWidget/components/DynamicWidgetHeader/DynamicWidgetHeader.cjs');
-require('../../../widgets/DynamicWidget/context/DynamicWidgetContext.cjs');
-require('../../TransactionConfirmationView/helpers/transactionErrorMessage.cjs');
-require('../../../widgets/DynamicWidget/views/ManagePasskeysWidgetView/PasskeyCard/PasskeyCard.cjs');
-var useViewSettings = require('../../../utils/hooks/useViewSettings/useViewSettings.cjs');
-var getInitialTabIndex = require('../utils/getInitialTabIndex/getInitialTabIndex.cjs');
 
-const useTabState = () => {
-    var _a, _b;
-    const { defaultTabIndex } = useInternalDynamicContext.useInternalDynamicContext();
-    const walletListViewSettings = useViewSettings.useViewSettings('wallet-list');
-    const [selectedTabIndex, setSelectedTabIndex] = React.useState(() => getInitialTabIndex.getInitialTabIndex(walletListViewSettings, defaultTabIndex));
+const useTabState = ({ settingsOverrides, }) => {
+    var _a, _b, _c;
+    const walletListViewSettings = (_a = settingsOverrides === null || settingsOverrides === void 0 ? void 0 : settingsOverrides.views) === null || _a === void 0 ? void 0 : _a.find((view) => view.type === 'wallet-list');
+    const [selectedTabIndex, setSelectedTabIndex] = React.useState(0);
     const selectedTabSettings = selectedTabIndex === null
         ? undefined
-        : (_a = walletListViewSettings === null || walletListViewSettings === void 0 ? void 0 : walletListViewSettings.tabs) === null || _a === void 0 ? void 0 : _a.items[selectedTabIndex];
+        : (_b = walletListViewSettings === null || walletListViewSettings === void 0 ? void 0 : walletListViewSettings.tabs) === null || _b === void 0 ? void 0 : _b.items[selectedTabIndex];
     return {
         selectedTabIndex,
         selectedTabSettings,
         setSelectedTabIndex,
-        tabsItems: (_b = walletListViewSettings === null || walletListViewSettings === void 0 ? void 0 : walletListViewSettings.tabs) === null || _b === void 0 ? void 0 : _b.items,
+        tabsItems: (_c = walletListViewSettings === null || walletListViewSettings === void 0 ? void 0 : walletListViewSettings.tabs) === null || _c === void 0 ? void 0 : _c.items,
     };
 };
 

package/src/lib/views/WalletList/hooks/useTabState.d.ts

@@ -1,7 +1,10 @@
 /// <reference types="react" />
-export declare const useTabState: () => {
-    selectedTabIndex: number | null;
+import { SettingsOverrides } from '../../../context/DynamicContext/types';
+export declare const useTabState: ({ settingsOverrides, }: {
+    settingsOverrides: SettingsOverrides | undefined;
+}) => {
+    selectedTabIndex: number;
     selectedTabSettings: import("../../../context/DynamicContext/types").WalletListViewTabItem | undefined;
-    setSelectedTabIndex: import("react").Dispatch<import("react").SetStateAction<number | null>>;
+    setSelectedTabIndex: import("react").Dispatch<import("react").SetStateAction<number>>;
     tabsItems: import("../../../context/DynamicContext/types").WalletListViewTabItem[] | undefined;
 };

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

@@ -1,93 +1,18 @@
 'use client'
 import { useState } from 'react';
-import '../../../events/dynamicEvents.js';
-import '../../../../../_virtual/_tslib.js';
-import '@dynamic-labs/utils';
-import '../../../context/DynamicContext/DynamicContext.js';
-import '@dynamic-labs/sdk-api-core';
-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 '../../../utils/constants/values.js';
-import '../../../shared/utils/classes/storage/localStorage.js';
-import '../../../shared/utils/classes/storage/sessionStorage.js';
-import '../../../shared/consts/index.js';
-import { useInternalDynamicContext } from '../../../context/DynamicContext/useDynamicContext/useInternalDynamicContext.js';
-import '../../../context/CaptchaContext/CaptchaContext.js';
-import '../../../context/ErrorContext/ErrorContext.js';
-import '@dynamic-labs/multi-wallet';
-import 'react-international-phone';
-import '../../../config/ApiEndpoint.js';
-import '@dynamic-labs/store';
-import '../../../locale/locale.js';
-import '../../../context/AccessDeniedContext/AccessDeniedContext.js';
-import '../../../context/AccountExistsContext/AccountExistsContext.js';
-import '../../../context/UserWalletsContext/UserWalletsContext.js';
-import '../../../context/VerificationContext/VerificationContext.js';
-import 'react-dom';
-import '../../../context/WalletContext/WalletContext.js';
-import '../../../context/ThemeContext/ThemeContext.js';
-import '../../../utils/hooks/useUserUpdateRequest/useUpdateUser/userFieldsSchema.js';
-import '@dynamic-labs/types';
-import '../../../context/LoadingContext/LoadingContext.js';
-import 'yup';
-import '../../../context/MockContext/MockContext.js';
-import '../../CollectUserDataView/useFields.js';
-import '../../../context/FieldsStateContext/FieldsStateContext.js';
-import '../../../context/UserFieldEditorContext/UserFieldEditorContext.js';
-import '@dynamic-labs/rpc-providers';
-import 'react-i18next';
-import '../../../components/Accordion/components/AccordionItem/AccordionItem.js';
-import '../../../components/Alert/Alert.js';
-import '../../../components/ShadowDOM/ShadowDOM.js';
-import '../../../components/IconButton/IconButton.js';
-import '../../../components/InlineWidget/InlineWidget.js';
-import '../../../components/Input/Input.js';
-import '../../../components/IsBrowser/IsBrowser.js';
-import '../../../components/MenuList/Dropdown/Dropdown.js';
-import '../../../components/Transition/ZoomTransition/ZoomTransition.js';
-import '../../../components/Transition/SlideInUpTransition/SlideInUpTransition.js';
-import '../../../components/Transition/OpacityTransition/OpacityTransition.js';
-import '../../../components/OverlayCard/OverlayCardTarget/OverlayCardTarget.js';
-import '../../../components/PasskeyCreatedSuccessBanner/PasskeyCreatedSuccessBanner.js';
-import '../../../components/Popper/Popper/Popper.js';
-import '../../../components/Popper/PopperContext/PopperContext.js';
-import 'react-focus-lock';
-import 'qrcode';
-import 'formik';
-import '../WalletList.js';
-import '../../../context/SocialRedirectContext/SocialRedirectContext.js';
-import '../../../widgets/DynamicBridgeWidget/views/WalletsView/components/SecondaryWallets/SecondaryWallets.js';
-import '@hcaptcha/react-hcaptcha';
-import '../../../context/FooterAnimationContext/index.js';
-import '../../../context/WalletGroupContext/WalletGroupContext.js';
-import '../../../context/MfaSettingsContext/MfaSettingsContext.js';
-import '../../../context/IpConfigurationContext/IpConfigurationContext.js';
-import '../../../context/PasskeyContext/PasskeyContext.js';
-import '../../../widgets/DynamicWidget/components/DynamicWidgetHeader/DynamicWidgetHeader.js';
-import '../../../widgets/DynamicWidget/context/DynamicWidgetContext.js';
-import '../../TransactionConfirmationView/helpers/transactionErrorMessage.js';
-import '../../../widgets/DynamicWidget/views/ManagePasskeysWidgetView/PasskeyCard/PasskeyCard.js';
-import { useViewSettings } from '../../../utils/hooks/useViewSettings/useViewSettings.js';
-import { getInitialTabIndex } from '../utils/getInitialTabIndex/getInitialTabIndex.js';
 
-const useTabState = () => {
-    var _a, _b;
-    const { defaultTabIndex } = useInternalDynamicContext();
-    const walletListViewSettings = useViewSettings('wallet-list');
-    const [selectedTabIndex, setSelectedTabIndex] = useState(() => getInitialTabIndex(walletListViewSettings, defaultTabIndex));
+const useTabState = ({ settingsOverrides, }) => {
+    var _a, _b, _c;
+    const walletListViewSettings = (_a = settingsOverrides === null || settingsOverrides === void 0 ? void 0 : settingsOverrides.views) === null || _a === void 0 ? void 0 : _a.find((view) => view.type === 'wallet-list');
+    const [selectedTabIndex, setSelectedTabIndex] = useState(0);
     const selectedTabSettings = selectedTabIndex === null
         ? undefined
-        : (_a = walletListViewSettings === null || walletListViewSettings === void 0 ? void 0 : walletListViewSettings.tabs) === null || _a === void 0 ? void 0 : _a.items[selectedTabIndex];
+        : (_b = walletListViewSettings === null || walletListViewSettings === void 0 ? void 0 : walletListViewSettings.tabs) === null || _b === void 0 ? void 0 : _b.items[selectedTabIndex];
     return {
         selectedTabIndex,
         selectedTabSettings,
         setSelectedTabIndex,
-        tabsItems: (_b = walletListViewSettings === null || walletListViewSettings === void 0 ? void 0 : walletListViewSettings.tabs) === null || _b === void 0 ? void 0 : _b.items,
+        tabsItems: (_c = walletListViewSettings === null || walletListViewSettings === void 0 ? void 0 : walletListViewSettings.tabs) === null || _c === void 0 ? void 0 : _c.items,
     };
 };