@dynamic-labs/sdk-react-core 4.88.1 → 4.88.3

package/src/lib/utils/hooks/useWalletList/buildWalletsList.js

@@ -0,0 +1,38 @@
+'use client'
+import { pipe } from '@dynamic-labs/utils';
+import { FilterBridgeChainsName } from '../../functions/walletFilters/index.js';
+import { walletListBuilder } from '../../functions/walletListBuilder/walletListBuilder.js';
+import { getEffectiveRecommendedWallets } from './utils/getEffectiveRecommendedWallets/getEffectiveRecommendedWallets.js';
+import { getEffectiveWalletFilter } from './utils/getEffectiveWalletFilter/getEffectiveWalletFilter.js';
+
+const buildWalletsList = ({ bridgeChainsToConnect, defaultNumberOfWalletsToShow, isWalletConnectList, lastUsedWalletKey, multiWallet, recommendedWallets, searchFilter, selectedTabSettings, userWallets, viewWalletsFilter, walletConnectorOptions, walletGroups, walletsFilter, }) => {
+    const getFilteredBridgeChains = (bridgeChainsToConnect === null || bridgeChainsToConnect === void 0 ? void 0 : bridgeChainsToConnect.length) &&
+        FilterBridgeChainsName(bridgeChainsToConnect[0].chain);
+    const filteredBridgeChains = getFilteredBridgeChains && getFilteredBridgeChains(walletConnectorOptions);
+    const effectiveRecommendedWallets = getEffectiveRecommendedWallets(selectedTabSettings, recommendedWallets);
+    const effectiveWalletsFilter = getEffectiveWalletFilter(selectedTabSettings, walletsFilter);
+    const { numberOfWallets, walletsList } = walletListBuilder({
+        groupWallets: true,
+        inputList: filteredBridgeChains || walletConnectorOptions,
+        isWalletConnectList,
+        lastUsedWalletKey,
+        multiWallet,
+        numberOfWalletsToShow: defaultNumberOfWalletsToShow,
+        recommendedWallets: effectiveRecommendedWallets,
+        searchFilter,
+        showMoreWalletsWithFilter: true,
+        userWallets,
+        walletGroups,
+        // use both filters if available, else use the viewWalletsFilter or effectiveWalletsFilter
+        walletsFilter: viewWalletsFilter && effectiveWalletsFilter
+            ? pipe(viewWalletsFilter).pipe(effectiveWalletsFilter)
+            : viewWalletsFilter || effectiveWalletsFilter,
+    });
+    return {
+        numberOfWallets,
+        recommendedWallets: effectiveRecommendedWallets,
+        walletsList,
+    };
+};
+
+export { buildWalletsList };

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

@@ -3,47 +3,48 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var utils = require('@dynamic-labs/utils');
+var React = require('react');
 require('../../../context/DynamicContext/useDynamicContext/useDynamicContext.cjs');
 var useInternalDynamicContext = require('../../../context/DynamicContext/useDynamicContext/useInternalDynamicContext/useInternalDynamicContext.cjs');
 var UserWalletsContext = require('../../../context/UserWalletsContext/UserWalletsContext.cjs');
 var walletOptions = require('../../../store/state/walletOptions/walletOptions.cjs');
-var index = require('../../functions/walletFilters/index.cjs');
-var walletListBuilder = require('../../functions/walletListBuilder/walletListBuilder.cjs');
-var getEffectiveRecommendedWallets = require('./utils/getEffectiveRecommendedWallets/getEffectiveRecommendedWallets.cjs');
-var getEffectiveWalletFilter = require('./utils/getEffectiveWalletFilter/getEffectiveWalletFilter.cjs');
+var buildWalletsList = require('./buildWalletsList.cjs');
 
 const useWalletList = ({ isWalletConnectList = false, viewWalletsFilter, searchFilter, lastUsedWalletKey, }) => {
     const { walletsFilter, walletConnectorOptions, defaultNumberOfWalletsToShow, bridgeChainsToConnect, multiWallet, recommendedWallets, selectedTabSettings, } = useInternalDynamicContext.useInternalDynamicContext();
     const { userWallets } = UserWalletsContext.useInternalUserWallets();
     const walletGroups = walletOptions.useWalletGroups();
-    const getFilteredBridgeChains = (bridgeChainsToConnect === null || bridgeChainsToConnect === void 0 ? void 0 : bridgeChainsToConnect.length) &&
-        index.FilterBridgeChainsName(bridgeChainsToConnect[0].chain);
-    const filteredBridgeChains = getFilteredBridgeChains && getFilteredBridgeChains(walletConnectorOptions);
-    const effectiveRecommendedWallets = getEffectiveRecommendedWallets.getEffectiveRecommendedWallets(selectedTabSettings, recommendedWallets);
-    const effectiveWalletsFilter = getEffectiveWalletFilter.getEffectiveWalletFilter(selectedTabSettings, walletsFilter);
-    const { numberOfWallets, walletsList } = walletListBuilder.walletListBuilder({
-        groupWallets: true,
-        inputList: filteredBridgeChains || walletConnectorOptions,
+    // Run the heavy list build once per real input change, not on every render —
+    // a modal close animation re-renders this hundreds of times.
+    return React.useMemo(() => buildWalletsList.buildWalletsList({
+        bridgeChainsToConnect,
+        defaultNumberOfWalletsToShow,
         isWalletConnectList,
         lastUsedWalletKey,
         multiWallet,
-        numberOfWalletsToShow: defaultNumberOfWalletsToShow,
-        recommendedWallets: effectiveRecommendedWallets,
+        recommendedWallets,
         searchFilter,
-        showMoreWalletsWithFilter: true,
+        selectedTabSettings,
         userWallets,
+        viewWalletsFilter,
+        walletConnectorOptions,
         walletGroups,
-        // use both filters if available, else use the viewWalletsFilter or effectiveWalletsFilter
-        walletsFilter: viewWalletsFilter && effectiveWalletsFilter
-            ? utils.pipe(viewWalletsFilter).pipe(effectiveWalletsFilter)
-            : viewWalletsFilter || effectiveWalletsFilter,
-    });
-    return {
-        numberOfWallets,
-        recommendedWallets: effectiveRecommendedWallets,
-        walletsList,
-    };
+        walletsFilter,
+    }), [
+        bridgeChainsToConnect,
+        defaultNumberOfWalletsToShow,
+        isWalletConnectList,
+        lastUsedWalletKey,
+        multiWallet,
+        recommendedWallets,
+        searchFilter,
+        selectedTabSettings,
+        userWallets,
+        viewWalletsFilter,
+        walletConnectorOptions,
+        walletGroups,
+        walletsFilter,
+    ]);
 };
 
 exports.useWalletList = useWalletList;

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

@@ -1,45 +1,46 @@
 'use client'
-import { pipe } from '@dynamic-labs/utils';
+import { useMemo } from 'react';
 import '../../../context/DynamicContext/useDynamicContext/useDynamicContext.js';
 import { useInternalDynamicContext } from '../../../context/DynamicContext/useDynamicContext/useInternalDynamicContext/useInternalDynamicContext.js';
 import { useInternalUserWallets } from '../../../context/UserWalletsContext/UserWalletsContext.js';
 import { useWalletGroups } from '../../../store/state/walletOptions/walletOptions.js';
-import { FilterBridgeChainsName } from '../../functions/walletFilters/index.js';
-import { walletListBuilder } from '../../functions/walletListBuilder/walletListBuilder.js';
-import { getEffectiveRecommendedWallets } from './utils/getEffectiveRecommendedWallets/getEffectiveRecommendedWallets.js';
-import { getEffectiveWalletFilter } from './utils/getEffectiveWalletFilter/getEffectiveWalletFilter.js';
+import { buildWalletsList } from './buildWalletsList.js';
 
 const useWalletList = ({ isWalletConnectList = false, viewWalletsFilter, searchFilter, lastUsedWalletKey, }) => {
     const { walletsFilter, walletConnectorOptions, defaultNumberOfWalletsToShow, bridgeChainsToConnect, multiWallet, recommendedWallets, selectedTabSettings, } = useInternalDynamicContext();
     const { userWallets } = useInternalUserWallets();
     const walletGroups = useWalletGroups();
-    const getFilteredBridgeChains = (bridgeChainsToConnect === null || bridgeChainsToConnect === void 0 ? void 0 : bridgeChainsToConnect.length) &&
-        FilterBridgeChainsName(bridgeChainsToConnect[0].chain);
-    const filteredBridgeChains = getFilteredBridgeChains && getFilteredBridgeChains(walletConnectorOptions);
-    const effectiveRecommendedWallets = getEffectiveRecommendedWallets(selectedTabSettings, recommendedWallets);
-    const effectiveWalletsFilter = getEffectiveWalletFilter(selectedTabSettings, walletsFilter);
-    const { numberOfWallets, walletsList } = walletListBuilder({
-        groupWallets: true,
-        inputList: filteredBridgeChains || walletConnectorOptions,
+    // Run the heavy list build once per real input change, not on every render —
+    // a modal close animation re-renders this hundreds of times.
+    return useMemo(() => buildWalletsList({
+        bridgeChainsToConnect,
+        defaultNumberOfWalletsToShow,
         isWalletConnectList,
         lastUsedWalletKey,
         multiWallet,
-        numberOfWalletsToShow: defaultNumberOfWalletsToShow,
-        recommendedWallets: effectiveRecommendedWallets,
+        recommendedWallets,
         searchFilter,
-        showMoreWalletsWithFilter: true,
+        selectedTabSettings,
         userWallets,
+        viewWalletsFilter,
+        walletConnectorOptions,
         walletGroups,
-        // use both filters if available, else use the viewWalletsFilter or effectiveWalletsFilter
-        walletsFilter: viewWalletsFilter && effectiveWalletsFilter
-            ? pipe(viewWalletsFilter).pipe(effectiveWalletsFilter)
-            : viewWalletsFilter || effectiveWalletsFilter,
-    });
-    return {
-        numberOfWallets,
-        recommendedWallets: effectiveRecommendedWallets,
-        walletsList,
-    };
+        walletsFilter,
+    }), [
+        bridgeChainsToConnect,
+        defaultNumberOfWalletsToShow,
+        isWalletConnectList,
+        lastUsedWalletKey,
+        multiWallet,
+        recommendedWallets,
+        searchFilter,
+        selectedTabSettings,
+        userWallets,
+        viewWalletsFilter,
+        walletConnectorOptions,
+        walletGroups,
+        walletsFilter,
+    ]);
 };
 
 export { useWalletList };

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

@@ -10,7 +10,6 @@ var reactI18next = require('react-i18next');
 var bs58 = require('bs58');
 var walletConnectorCore = require('@dynamic-labs/wallet-connector-core');
 var utils = require('@dynamic-labs/utils');
-var sdkApiCore = require('@dynamic-labs/sdk-api-core');
 require('../../context/DynamicContext/useDynamicContext/useDynamicContext.cjs');
 var useInternalDynamicContext = require('../../context/DynamicContext/useDynamicContext/useInternalDynamicContext/useInternalDynamicContext.cjs');
 require('../../events/dynamicEvents.cjs');
@@ -22,6 +21,7 @@ var logger = require('../../shared/logger.cjs');
 require('@dynamic-labs/wallet-book');
 require('../../utils/constants/colors.cjs');
 require('../../utils/constants/values.cjs');
+require('@dynamic-labs/sdk-api-core');
 require('../../shared/consts/index.cjs');
 require('@dynamic-labs/multi-wallet');
 require('react-international-phone');
@@ -138,6 +138,12 @@ var SimulationStatus;
 const TransactionConfirmationView = ({ transaction, onError, onSuccess, mutation, onClickBack, walletConnector, onClickClose, title, displayPoweredByDynamicFooter = false, copykey, hideModal, currentToken, isNativeToken, transactionValue, isModal, sendBalanceTransaction, }) => {
     var _a, _b, _c;
     const { primaryWallet, environmentId } = useInternalDynamicContext.useInternalDynamicContext();
+    // The connector that is actually signing this transaction. A transaction can
+    // be sent from a non-primary wallet (e.g. an EVM wallet while the primary
+    // wallet is BTC), so chain, key and simulation must be derived from this
+    // connector and never from primaryWallet, which would resolve the wrong
+    // chain/wallet and fail simulation.
+    const activeConnector = walletConnector !== null && walletConnector !== void 0 ? walletConnector : primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.connector;
     const projectSettings = useProjectSettings.useProjectSettings();
     const svmGasSponsorshipEnabled = (_c = (_b = (_a = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk) === null || _a === void 0 ? void 0 : _a.embeddedWallets) === null || _b === void 0 ? void 0 : _b.svmGasSponsorshipEnabled) !== null && _c !== void 0 ? _c : false;
     const [isGasSponsored, setIsGasSponsored] = React.useState(false);
@@ -147,12 +153,12 @@ const TransactionConfirmationView = ({ transaction, onError, onSuccess, mutation
     const { currency } = useFetchCurrency.useFetchCurrency(walletConnector);
     // Update the chainId access to handle undefined case
     const chainId = React.useMemo(() => {
-        if (!(primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.connector)) {
+        if (!activeConnector) {
             return undefined;
         }
-        const connector = primaryWallet.connector;
+        const connector = activeConnector;
         return connector._selectedChainId || connector.lastUsedChainId;
-    }, [primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.connector]);
+    }, [activeConnector]);
     const [simulationState, setSimulationState] = React.useState({
         status: SimulationStatus.LOADING,
     });
@@ -161,7 +167,7 @@ const TransactionConfirmationView = ({ transaction, onError, onSuccess, mutation
     const [preSubmitValidationError, setPreSubmitValidationError] = React.useState(undefined);
     const isFetchingSimulationRef = React.useRef(false);
     const fetchSimulationResult = React.useCallback(() => _tslib.__awaiter(void 0, void 0, void 0, function* () {
-        var _d, _e, _f, _g, _h, _j, _k;
+        var _d, _e, _f, _g, _h, _j;
         if (simulationState.status !== SimulationStatus.LOADING) {
             return;
         }
@@ -175,14 +181,14 @@ const TransactionConfirmationView = ({ transaction, onError, onSuccess, mutation
             isFetchingSimulationRef.current = false;
             return;
         }
-        if (!primaryWallet ||
+        if (!activeConnector ||
             (!chainId &&
-                (primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.chain) !== 'SOL' &&
-                (primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.chain) !== 'TON')) {
+                activeConnector.connectedChain !== 'SOL' &&
+                activeConnector.connectedChain !== 'TON')) {
             logger.logger.error('[TransactionConfirmationView] Simulation failed:', {
-                chain: primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.chain,
+                chain: activeConnector === null || activeConnector === void 0 ? void 0 : activeConnector.connectedChain,
                 chainId,
-                primaryWallet,
+                walletConnector: activeConnector,
             });
             setSimulationState({ status: SimulationStatus.FAILED });
             isFetchingSimulationRef.current = false;
@@ -190,8 +196,8 @@ const TransactionConfirmationView = ({ transaction, onError, onSuccess, mutation
         }
         try {
             let result;
-            if (primaryWallet.connector.key === 'zerodev') {
-                const connector = primaryWallet.connector;
+            if (activeConnector.key === 'zerodev') {
+                const connector = activeConnector;
                 const { userOperation, sponsored } = yield connector.getCurrentUserOperation(transaction);
                 setIsGasSponsored(sponsored);
                 setIsGasSponsoredLoading(false);
@@ -252,7 +258,7 @@ const TransactionConfirmationView = ({ transaction, onError, onSuccess, mutation
                     return;
                 }
             }
-            if (!result && ((_k = primaryWallet.connector) === null || _k === void 0 ? void 0 : _k.key) !== 'zerodev') {
+            if (!result && activeConnector.key !== 'zerodev') {
                 logger.logger.warn('[TransactionConfirmationView] Simulation failed: No result');
                 setSimulationState({ status: SimulationStatus.FAILED });
                 return;
@@ -271,7 +277,7 @@ const TransactionConfirmationView = ({ transaction, onError, onSuccess, mutation
     }), [
         sendBalanceTransaction,
         hideModal,
-        primaryWallet,
+        activeConnector,
         chainId,
         environmentId,
         transaction,
@@ -285,7 +291,7 @@ const TransactionConfirmationView = ({ transaction, onError, onSuccess, mutation
             return;
         }
         fetchSimulationResult();
-    }, [fetchSimulationResult, primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.connector, simulationState.status]);
+    }, [fetchSimulationResult, activeConnector, simulationState.status]);
     // Check destination account for chains that require it (e.g., Stellar)
     React.useEffect(() => {
         const checkDestination = () => _tslib.__awaiter(void 0, void 0, void 0, function* () {
@@ -303,10 +309,9 @@ const TransactionConfirmationView = ({ transaction, onError, onSuccess, mutation
      * to reflect the new fee on the UI
      */
     const fetchTransactionFee = React.useCallback(() => {
-        var _a;
-        if (((primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.chain) === sdkApiCore.ChainEnum.Sol &&
+        if (((activeConnector === null || activeConnector === void 0 ? void 0 : activeConnector.connectedChain) === 'SOL' &&
             transaction.fee.gas !== undefined) ||
-            (primaryWallet && ((_a = primaryWallet.connector) === null || _a === void 0 ? void 0 : _a.key) === 'zerodev')) {
+            (activeConnector === null || activeConnector === void 0 ? void 0 : activeConnector.key) === 'zerodev') {
             return;
         }
         if (transaction.fetchFee) {
@@ -331,7 +336,7 @@ const TransactionConfirmationView = ({ transaction, onError, onSuccess, mutation
                 });
             }
         }
-    }, [primaryWallet, transaction, update]);
+    }, [activeConnector, transaction, update]);
     React.useEffect(() => {
         // If SVM gas sponsorship is enabled in project settings, treat as sponsored
         // before the fee payer is actually replaced (which happens at send time)
@@ -489,7 +494,7 @@ const TransactionConfirmationView = ({ transaction, onError, onSuccess, mutation
             transactionSignature: transactionSignatureForLink,
             transactionValue,
             walletConnector,
-            walletKey: (primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.key) || '',
+            walletKey: (activeConnector === null || activeConnector === void 0 ? void 0 : activeConnector.key) || '',
         });
     }, [
         total,
@@ -513,7 +518,7 @@ const TransactionConfirmationView = ({ transaction, onError, onSuccess, mutation
         transaction,
         isGasSponsored,
         isGasSponsoredLoading,
-        primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.key,
+        activeConnector === null || activeConnector === void 0 ? void 0 : activeConnector.key,
         simulationState.result,
         sendBalanceTransaction,
         fetchTransactionFee,

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

@@ -6,7 +6,6 @@ import { useTranslation } from 'react-i18next';
 import bs58 from 'bs58';
 import { isAccountAbstractionConnector } from '@dynamic-labs/wallet-connector-core';
 import { TransactionGasCannotBeSponsoredError } from '@dynamic-labs/utils';
-import { ChainEnum } from '@dynamic-labs/sdk-api-core';
 import '../../context/DynamicContext/useDynamicContext/useDynamicContext.js';
 import { useInternalDynamicContext } from '../../context/DynamicContext/useDynamicContext/useInternalDynamicContext/useInternalDynamicContext.js';
 import '../../events/dynamicEvents.js';
@@ -18,6 +17,7 @@ import { logger } from '../../shared/logger.js';
 import '@dynamic-labs/wallet-book';
 import '../../utils/constants/colors.js';
 import '../../utils/constants/values.js';
+import '@dynamic-labs/sdk-api-core';
 import '../../shared/consts/index.js';
 import '@dynamic-labs/multi-wallet';
 import 'react-international-phone';
@@ -130,6 +130,12 @@ var SimulationStatus;
 const TransactionConfirmationView = ({ transaction, onError, onSuccess, mutation, onClickBack, walletConnector, onClickClose, title, displayPoweredByDynamicFooter = false, copykey, hideModal, currentToken, isNativeToken, transactionValue, isModal, sendBalanceTransaction, }) => {
     var _a, _b, _c;
     const { primaryWallet, environmentId } = useInternalDynamicContext();
+    // The connector that is actually signing this transaction. A transaction can
+    // be sent from a non-primary wallet (e.g. an EVM wallet while the primary
+    // wallet is BTC), so chain, key and simulation must be derived from this
+    // connector and never from primaryWallet, which would resolve the wrong
+    // chain/wallet and fail simulation.
+    const activeConnector = walletConnector !== null && walletConnector !== void 0 ? walletConnector : primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.connector;
     const projectSettings = useProjectSettings();
     const svmGasSponsorshipEnabled = (_c = (_b = (_a = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk) === null || _a === void 0 ? void 0 : _a.embeddedWallets) === null || _b === void 0 ? void 0 : _b.svmGasSponsorshipEnabled) !== null && _c !== void 0 ? _c : false;
     const [isGasSponsored, setIsGasSponsored] = useState(false);
@@ -139,12 +145,12 @@ const TransactionConfirmationView = ({ transaction, onError, onSuccess, mutation
     const { currency } = useFetchCurrency(walletConnector);
     // Update the chainId access to handle undefined case
     const chainId = useMemo(() => {
-        if (!(primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.connector)) {
+        if (!activeConnector) {
             return undefined;
         }
-        const connector = primaryWallet.connector;
+        const connector = activeConnector;
         return connector._selectedChainId || connector.lastUsedChainId;
-    }, [primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.connector]);
+    }, [activeConnector]);
     const [simulationState, setSimulationState] = useState({
         status: SimulationStatus.LOADING,
     });
@@ -153,7 +159,7 @@ const TransactionConfirmationView = ({ transaction, onError, onSuccess, mutation
     const [preSubmitValidationError, setPreSubmitValidationError] = useState(undefined);
     const isFetchingSimulationRef = useRef(false);
     const fetchSimulationResult = useCallback(() => __awaiter(void 0, void 0, void 0, function* () {
-        var _d, _e, _f, _g, _h, _j, _k;
+        var _d, _e, _f, _g, _h, _j;
         if (simulationState.status !== SimulationStatus.LOADING) {
             return;
         }
@@ -167,14 +173,14 @@ const TransactionConfirmationView = ({ transaction, onError, onSuccess, mutation
             isFetchingSimulationRef.current = false;
             return;
         }
-        if (!primaryWallet ||
+        if (!activeConnector ||
             (!chainId &&
-                (primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.chain) !== 'SOL' &&
-                (primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.chain) !== 'TON')) {
+                activeConnector.connectedChain !== 'SOL' &&
+                activeConnector.connectedChain !== 'TON')) {
             logger.error('[TransactionConfirmationView] Simulation failed:', {
-                chain: primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.chain,
+                chain: activeConnector === null || activeConnector === void 0 ? void 0 : activeConnector.connectedChain,
                 chainId,
-                primaryWallet,
+                walletConnector: activeConnector,
             });
             setSimulationState({ status: SimulationStatus.FAILED });
             isFetchingSimulationRef.current = false;
@@ -182,8 +188,8 @@ const TransactionConfirmationView = ({ transaction, onError, onSuccess, mutation
         }
         try {
             let result;
-            if (primaryWallet.connector.key === 'zerodev') {
-                const connector = primaryWallet.connector;
+            if (activeConnector.key === 'zerodev') {
+                const connector = activeConnector;
                 const { userOperation, sponsored } = yield connector.getCurrentUserOperation(transaction);
                 setIsGasSponsored(sponsored);
                 setIsGasSponsoredLoading(false);
@@ -244,7 +250,7 @@ const TransactionConfirmationView = ({ transaction, onError, onSuccess, mutation
                     return;
                 }
             }
-            if (!result && ((_k = primaryWallet.connector) === null || _k === void 0 ? void 0 : _k.key) !== 'zerodev') {
+            if (!result && activeConnector.key !== 'zerodev') {
                 logger.warn('[TransactionConfirmationView] Simulation failed: No result');
                 setSimulationState({ status: SimulationStatus.FAILED });
                 return;
@@ -263,7 +269,7 @@ const TransactionConfirmationView = ({ transaction, onError, onSuccess, mutation
     }), [
         sendBalanceTransaction,
         hideModal,
-        primaryWallet,
+        activeConnector,
         chainId,
         environmentId,
         transaction,
@@ -277,7 +283,7 @@ const TransactionConfirmationView = ({ transaction, onError, onSuccess, mutation
             return;
         }
         fetchSimulationResult();
-    }, [fetchSimulationResult, primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.connector, simulationState.status]);
+    }, [fetchSimulationResult, activeConnector, simulationState.status]);
     // Check destination account for chains that require it (e.g., Stellar)
     useEffect(() => {
         const checkDestination = () => __awaiter(void 0, void 0, void 0, function* () {
@@ -295,10 +301,9 @@ const TransactionConfirmationView = ({ transaction, onError, onSuccess, mutation
      * to reflect the new fee on the UI
      */
     const fetchTransactionFee = useCallback(() => {
-        var _a;
-        if (((primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.chain) === ChainEnum.Sol &&
+        if (((activeConnector === null || activeConnector === void 0 ? void 0 : activeConnector.connectedChain) === 'SOL' &&
             transaction.fee.gas !== undefined) ||
-            (primaryWallet && ((_a = primaryWallet.connector) === null || _a === void 0 ? void 0 : _a.key) === 'zerodev')) {
+            (activeConnector === null || activeConnector === void 0 ? void 0 : activeConnector.key) === 'zerodev') {
             return;
         }
         if (transaction.fetchFee) {
@@ -323,7 +328,7 @@ const TransactionConfirmationView = ({ transaction, onError, onSuccess, mutation
                 });
             }
         }
-    }, [primaryWallet, transaction, update]);
+    }, [activeConnector, transaction, update]);
     useEffect(() => {
         // If SVM gas sponsorship is enabled in project settings, treat as sponsored
         // before the fee payer is actually replaced (which happens at send time)
@@ -481,7 +486,7 @@ const TransactionConfirmationView = ({ transaction, onError, onSuccess, mutation
             transactionSignature: transactionSignatureForLink,
             transactionValue,
             walletConnector,
-            walletKey: (primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.key) || '',
+            walletKey: (activeConnector === null || activeConnector === void 0 ? void 0 : activeConnector.key) || '',
         });
     }, [
         total,
@@ -505,7 +510,7 @@ const TransactionConfirmationView = ({ transaction, onError, onSuccess, mutation
         transaction,
         isGasSponsored,
         isGasSponsoredLoading,
-        primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.key,
+        activeConnector === null || activeConnector === void 0 ? void 0 : activeConnector.key,
         simulationState.result,
         sendBalanceTransaction,
         fetchTransactionFee,