@dynamic-labs/sdk-react-core 4.17.0 → 4.18.1

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

@@ -1,7 +1,7 @@
 'use client'
 import { __awaiter } from '../../../../_virtual/_tslib.js';
 import { jsx, jsxs } from 'react/jsx-runtime';
-import { useState, useMemo, useCallback, useEffect } from 'react';
+import { useState, useMemo, useRef, useCallback, useEffect } from 'react';
 import { useTranslation } from 'react-i18next';
 import bs58 from 'bs58';
 import { isAccountAbstractionConnector } from '@dynamic-labs/wallet-connector-core';
@@ -112,6 +112,7 @@ var SimulationStatus;
 const TransactionConfirmationView = ({ transaction, onError, onSuccess, mutation, onClickBack, walletConnector, onClickClose, title, displayPoweredByDynamicFooter = false, copykey, hideModal, currentToken, isNativeToken, transactionValue, isModal, sendBalanceTransaction, }) => {
     const { primaryWallet, environmentId } = useInternalDynamicContext();
     const [isGasSponsored, setIsGasSponsored] = useState(false);
+    const [isGasSponsoredLoading, setIsGasSponsoredLoading] = useState(false);
     const update = useForceUpdate();
     const { t } = useTranslation();
     const { currency } = useFetchCurrency(walletConnector);
@@ -127,13 +128,20 @@ const TransactionConfirmationView = ({ transaction, onError, onSuccess, mutation
         status: SimulationStatus.LOADING,
     });
     const [recipient, setRecipient] = useState(undefined);
+    const isFetchingSimulationRef = useRef(false);
     const fetchSimulationResult = useCallback(() => __awaiter(void 0, void 0, void 0, function* () {
         var _a, _b, _c, _d, _e, _f, _g;
         if (simulationState.status !== SimulationStatus.LOADING) {
             return;
         }
+        if (isFetchingSimulationRef.current) {
+            // Already fetching, prevent duplicate call
+            return;
+        }
+        isFetchingSimulationRef.current = true;
         if (sendBalanceTransaction || hideModal) {
             setSimulationState({ status: SimulationStatus.SKIPPED });
+            isFetchingSimulationRef.current = false;
             return;
         }
         if (!primaryWallet || (!chainId && (primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.chain) !== 'SOL')) {
@@ -143,13 +151,16 @@ const TransactionConfirmationView = ({ transaction, onError, onSuccess, mutation
                 primaryWallet,
             });
             setSimulationState({ status: SimulationStatus.FAILED });
+            isFetchingSimulationRef.current = false;
             return;
         }
         try {
             let result;
             if (primaryWallet.connector.key === 'zerodev') {
                 const connector = primaryWallet.connector;
-                const { userOperation } = yield connector.getCurrentUserOperation(transaction);
+                const { userOperation, sponsored } = yield connector.getCurrentUserOperation(transaction);
+                setIsGasSponsored(sponsored);
+                setIsGasSponsoredLoading(false);
                 if (userOperation) {
                     const formattedUserOperation = yield connector.formatUserOperation(userOperation);
                     // Set the gas fee on the transaction, only for zero dev
@@ -216,6 +227,9 @@ const TransactionConfirmationView = ({ transaction, onError, onSuccess, mutation
             logger.error('[TransactionConfirmationView] Simulation failed:', error);
             setSimulationState({ status: SimulationStatus.FAILED });
         }
+        finally {
+            isFetchingSimulationRef.current = false;
+        }
     }), [
         sendBalanceTransaction,
         hideModal,
@@ -224,6 +238,8 @@ const TransactionConfirmationView = ({ transaction, onError, onSuccess, mutation
         environmentId,
         transaction,
         walletConnector,
+        simulationState.status,
+        setSimulationState,
     ]);
     useEffect(() => {
         if (simulationState.status === SimulationStatus.SUCCESS ||
@@ -245,21 +261,6 @@ const TransactionConfirmationView = ({ transaction, onError, onSuccess, mutation
         }
         transaction.fetchFee().finally(update);
     }, [primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.chain, transaction, update]);
-    const { isLoading: isGasSponsoredLoading } = usePromise(() => {
-        if (!isAccountAbstractionConnector(walletConnector)) {
-            return false;
-        }
-        return walletConnector.canSponsorTransactionGas(transaction);
-    }, {
-        initialData: false,
-        onReject: logger.error,
-        onResolve: (isGasSponsored) => {
-            setIsGasSponsored(isGasSponsored);
-            if (!isGasSponsored && isAccountAbstractionConnector(walletConnector)) {
-                walletConnector.disableGasSponsorshipOnce();
-            }
-        },
-    });
     useEffect(() => {
         var _a;
         // solana gas sponsorship check

package/src/lib/widgets/DynamicWidget/components/EmailOTPConnectorPendingSignModalContent/EmailOTPConnectorPendingSignModalContent.cjs

@@ -41,13 +41,13 @@ require('../../../../context/VerificationContext/VerificationContext.cjs');
 require('react-dom');
 require('../../../../utils/functions/compareChains/compareChains.cjs');
 require('../../../../views/Passkey/utils/findPrimaryEmbeddedChain/findPrimaryEmbeddedChain.cjs');
+require('../../../../store/state/primaryWalletId/primaryWalletId.cjs');
 require('../../../../context/ThemeContext/ThemeContext.cjs');
 require('../../../../utils/hooks/useUserUpdateRequest/useUpdateUser/userFieldsSchema.cjs');
 var useMutation = require('../../../../utils/hooks/useMutation/useMutation.cjs');
 require('bs58');
 require('@dynamic-labs/types');
 require('../../../../context/SocialRedirectContext/SocialRedirectContext.cjs');
-require('../../../../store/state/primaryWalletId/primaryWalletId.cjs');
 require('../../../../context/LoadingContext/LoadingContext.cjs');
 require('../../../../context/WalletContext/WalletContext.cjs');
 require('../../../../utils/hooks/useEmbeddedWallet/useSecureEnclaveEmbeddedWallet/constants.cjs');

package/src/lib/widgets/DynamicWidget/components/EmailOTPConnectorPendingSignModalContent/EmailOTPConnectorPendingSignModalContent.js

@@ -37,13 +37,13 @@ import '../../../../context/VerificationContext/VerificationContext.js';
 import 'react-dom';
 import '../../../../utils/functions/compareChains/compareChains.js';
 import '../../../../views/Passkey/utils/findPrimaryEmbeddedChain/findPrimaryEmbeddedChain.js';
+import '../../../../store/state/primaryWalletId/primaryWalletId.js';
 import '../../../../context/ThemeContext/ThemeContext.js';
 import '../../../../utils/hooks/useUserUpdateRequest/useUpdateUser/userFieldsSchema.js';
 import { useMutation } from '../../../../utils/hooks/useMutation/useMutation.js';
 import 'bs58';
 import '@dynamic-labs/types';
 import '../../../../context/SocialRedirectContext/SocialRedirectContext.js';
-import '../../../../store/state/primaryWalletId/primaryWalletId.js';
 import '../../../../context/LoadingContext/LoadingContext.js';
 import '../../../../context/WalletContext/WalletContext.js';
 import '../../../../utils/hooks/useEmbeddedWallet/useSecureEnclaveEmbeddedWallet/constants.js';

package/src/lib/widgets/DynamicWidget/views/AccountAndSecuritySettingsView/AccountAndSecuritySettingsView.cjs

@@ -131,7 +131,8 @@ const AccountAndSecuritySettingsView = () => {
     const { initPasskeyRecoveryProcess, shouldInitRecovery } = usePasskeyRecovery.usePasskeyRecovery();
     const [isLoading, setIsLoading] = React.useState(false);
     const { getEOAWallet } = useSmartWallets.useSmartWallets();
-    const turnkeyWalletProperties = (_b = (_a = user === null || user === void 0 ? void 0 : user.verifiedCredentials) === null || _a === void 0 ? void 0 : _a.find(({ walletName }) => walletName === null || walletName === void 0 ? void 0 : walletName.startsWith('turnkey'))) === null || _b === void 0 ? void 0 : _b.walletProperties;
+    const turnkeyWalletProperties = (_b = (_a = user === null || user === void 0 ? void 0 : user.verifiedCredentials) === null || _a === void 0 ? void 0 : _a.find(({ walletName, id }) => (walletName === null || walletName === void 0 ? void 0 : walletName.startsWith('turnkey')) &&
+        ((primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.id) ? id === (primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.id) : true))) === null || _b === void 0 ? void 0 : _b.walletProperties;
     const isTurnkeyHDWallet = turnkeyWalletProperties === null || turnkeyWalletProperties === void 0 ? void 0 : turnkeyWalletProperties.turnkeyHDWalletId;
     const isPasskeyEnabled = Boolean((_f = (_e = (_d = (_c = projectSettings$1 === null || projectSettings$1 === void 0 ? void 0 : projectSettings$1.sdk) === null || _c === void 0 ? void 0 : _c.embeddedWallets) === null || _d === void 0 ? void 0 : _d.supportedSecurityMethods) === null || _e === void 0 ? void 0 : _e.passkey) === null || _f === void 0 ? void 0 : _f.isEnabled);
     const isTurnkeyWalletWithAuthenticator = isTurnkeyWallet && !isTurnkeyWalletWithoutAuthenticator;

package/src/lib/widgets/DynamicWidget/views/AccountAndSecuritySettingsView/AccountAndSecuritySettingsView.js

@@ -127,7 +127,8 @@ const AccountAndSecuritySettingsView = () => {
     const { initPasskeyRecoveryProcess, shouldInitRecovery } = usePasskeyRecovery();
     const [isLoading, setIsLoading] = useState(false);
     const { getEOAWallet } = useSmartWallets();
-    const turnkeyWalletProperties = (_b = (_a = user === null || user === void 0 ? void 0 : user.verifiedCredentials) === null || _a === void 0 ? void 0 : _a.find(({ walletName }) => walletName === null || walletName === void 0 ? void 0 : walletName.startsWith('turnkey'))) === null || _b === void 0 ? void 0 : _b.walletProperties;
+    const turnkeyWalletProperties = (_b = (_a = user === null || user === void 0 ? void 0 : user.verifiedCredentials) === null || _a === void 0 ? void 0 : _a.find(({ walletName, id }) => (walletName === null || walletName === void 0 ? void 0 : walletName.startsWith('turnkey')) &&
+        ((primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.id) ? id === (primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.id) : true))) === null || _b === void 0 ? void 0 : _b.walletProperties;
     const isTurnkeyHDWallet = turnkeyWalletProperties === null || turnkeyWalletProperties === void 0 ? void 0 : turnkeyWalletProperties.turnkeyHDWalletId;
     const isPasskeyEnabled = Boolean((_f = (_e = (_d = (_c = projectSettings === null || projectSettings === void 0 ? void 0 : projectSettings.sdk) === null || _c === void 0 ? void 0 : _c.embeddedWallets) === null || _d === void 0 ? void 0 : _d.supportedSecurityMethods) === null || _e === void 0 ? void 0 : _e.passkey) === null || _f === void 0 ? void 0 : _f.isEnabled);
     const isTurnkeyWalletWithAuthenticator = isTurnkeyWallet && !isTurnkeyWalletWithoutAuthenticator;

package/src/lib/components/AppOriginTile/AppOriginTile.types.d.ts

@@ -1,7 +0,0 @@
-import { FC } from 'react';
-export type AppOriginTileProps = {
-    appLogoUrl?: string;
-    appName?: string;
-    appOrigin?: string;
-};
-export type AppOriginTileComponent = FC<AppOriginTileProps>;