@dynamic-labs/sdk-react-core 4.50.4 → 4.51.0

package/src/lib/utils/hooks/authenticationHooks/useConnectAndSign/useConnectAndSign.cjs

@@ -115,7 +115,7 @@ const useConnectAndSign = ({ shouldUpdateWallets = true, shouldCallCallback = tr
     const { pushView, clearStackAndPushInitialView, replaceView } = ViewContext.useViewContext();
     const { engageCaptcha, getCaptchaToken } = CaptchaContext.useCaptchaContext();
     const { setErrorMessage, setError, setDefaultError } = ErrorContext.useErrorContext();
-    const { connectWallet, displaySiweStatement, environmentId, projectSettings, networkValidationMode, setIsSingleWalletAccount, walletUiUtils, } = useInternalDynamicContext.useInternalDynamicContext();
+    const { connectWallet, displaySiweStatement, environmentId, projectSettings, networkValidationMode, setIsSingleWalletAccount, setShowAuthFlow, walletUiUtils, } = useInternalDynamicContext.useInternalDynamicContext();
     const { handleWalletsToConnect } = useHandleWalletsToConnect.useHandleWalletsToConnect();
     const verifyWallet = useVerifyWallet.useVerifyWallet({
         displaySiweStatement,
@@ -127,6 +127,7 @@ const useConnectAndSign = ({ shouldUpdateWallets = true, shouldCallCallback = tr
         if (!walletConnectorCore.isEmailWalletConnector(walletConnector) ||
             walletConnectorCore.isBloctoConnector(walletConnector)) {
             replaceView('pending-signature');
+            setShowAuthFlow(true);
         }
         else {
             walletUiUtils.disabledConfirmationOnce();

package/src/lib/utils/hooks/authenticationHooks/useConnectAndSign/useConnectAndSign.js

@@ -111,7 +111,7 @@ const useConnectAndSign = ({ shouldUpdateWallets = true, shouldCallCallback = tr
     const { pushView, clearStackAndPushInitialView, replaceView } = useViewContext();
     const { engageCaptcha, getCaptchaToken } = useCaptchaContext();
     const { setErrorMessage, setError, setDefaultError } = useErrorContext();
-    const { connectWallet, displaySiweStatement, environmentId, projectSettings, networkValidationMode, setIsSingleWalletAccount, walletUiUtils, } = useInternalDynamicContext();
+    const { connectWallet, displaySiweStatement, environmentId, projectSettings, networkValidationMode, setIsSingleWalletAccount, setShowAuthFlow, walletUiUtils, } = useInternalDynamicContext();
     const { handleWalletsToConnect } = useHandleWalletsToConnect();
     const verifyWallet = useVerifyWallet({
         displaySiweStatement,
@@ -123,6 +123,7 @@ const useConnectAndSign = ({ shouldUpdateWallets = true, shouldCallCallback = tr
         if (!isEmailWalletConnector(walletConnector) ||
             isBloctoConnector(walletConnector)) {
             replaceView('pending-signature');
+            setShowAuthFlow(true);
         }
         else {
             walletUiUtils.disabledConfirmationOnce();

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

@@ -11,13 +11,13 @@ require('@dynamic-labs/sdk-api-core');
 require('../../constants/values.cjs');
 require('@dynamic-labs/utils');
 require('@dynamic-labs/multi-wallet');
+require('../../../shared/logger.cjs');
 require('react-international-phone');
 require('../../constants/colors.cjs');
 require('@dynamic-labs/iconic');
 require('@dynamic-labs/wallet-connector-core');
 require('react/jsx-runtime');
 require('../../../context/ViewContext/ViewContext.cjs');
-require('../../../shared/logger.cjs');
 require('../../../shared/consts/index.cjs');
 require('../../../store/state/nonce/nonce.cjs');
 var serializeWalletConnectors = require('../../functions/serializeWalletConnectors/serializeWalletConnectors.cjs');

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

@@ -7,13 +7,13 @@ import '@dynamic-labs/sdk-api-core';
 import '../../constants/values.js';
 import '@dynamic-labs/utils';
 import '@dynamic-labs/multi-wallet';
+import '../../../shared/logger.js';
 import 'react-international-phone';
 import '../../constants/colors.js';
 import '@dynamic-labs/iconic';
 import '@dynamic-labs/wallet-connector-core';
 import 'react/jsx-runtime';
 import '../../../context/ViewContext/ViewContext.js';
-import '../../../shared/logger.js';
 import '../../../shared/consts/index.js';
 import '../../../store/state/nonce/nonce.js';
 import { serializeWalletConnectors } from '../../functions/serializeWalletConnectors/serializeWalletConnectors.js';

package/src/lib/utils/hooks/useCreateWalletConnectorOptions/utils/verifyMagicIsSetup/verifyMagicIsSetup.cjs

@@ -8,6 +8,7 @@ require('../../../../constants/values.cjs');
 require('@dynamic-labs/utils');
 require('../../../../../../../_virtual/_tslib.cjs');
 require('@dynamic-labs/multi-wallet');
+require('../../../../../shared/logger.cjs');
 require('react-international-phone');
 require('../../../../constants/colors.cjs');
 require('@dynamic-labs/iconic');
@@ -15,7 +16,6 @@ require('@dynamic-labs/wallet-connector-core');
 require('react');
 require('react/jsx-runtime');
 require('../../../../../context/ViewContext/ViewContext.cjs');
-require('../../../../../shared/logger.cjs');
 require('@dynamic-labs/wallet-book');
 require('../../../../../shared/consts/index.cjs');
 require('../../../../../store/state/nonce/nonce.cjs');

package/src/lib/utils/hooks/useCreateWalletConnectorOptions/utils/verifyMagicIsSetup/verifyMagicIsSetup.js

@@ -4,6 +4,7 @@ import '../../../../constants/values.js';
 import '@dynamic-labs/utils';
 import '../../../../../../../_virtual/_tslib.js';
 import '@dynamic-labs/multi-wallet';
+import '../../../../../shared/logger.js';
 import 'react-international-phone';
 import '../../../../constants/colors.js';
 import '@dynamic-labs/iconic';
@@ -11,7 +12,6 @@ import '@dynamic-labs/wallet-connector-core';
 import 'react';
 import 'react/jsx-runtime';
 import '../../../../../context/ViewContext/ViewContext.js';
-import '../../../../../shared/logger.js';
 import '@dynamic-labs/wallet-book';
 import '../../../../../shared/consts/index.js';
 import '../../../../../store/state/nonce/nonce.js';

package/src/lib/utils/hooks/useCreateWalletConnectorOptions/utils/verifyZeroDevIsSetup/verifyZeroDevIsSetup.cjs

@@ -8,6 +8,7 @@ require('../../../../constants/values.cjs');
 require('@dynamic-labs/utils');
 require('../../../../../../../_virtual/_tslib.cjs');
 require('@dynamic-labs/multi-wallet');
+require('../../../../../shared/logger.cjs');
 require('react-international-phone');
 require('../../../../constants/colors.cjs');
 require('@dynamic-labs/iconic');
@@ -15,7 +16,6 @@ require('@dynamic-labs/wallet-connector-core');
 require('react');
 require('react/jsx-runtime');
 require('../../../../../context/ViewContext/ViewContext.cjs');
-require('../../../../../shared/logger.cjs');
 require('@dynamic-labs/wallet-book');
 require('../../../../../shared/consts/index.cjs');
 require('../../../../../store/state/nonce/nonce.cjs');

package/src/lib/utils/hooks/useCreateWalletConnectorOptions/utils/verifyZeroDevIsSetup/verifyZeroDevIsSetup.js

@@ -4,6 +4,7 @@ import '../../../../constants/values.js';
 import '@dynamic-labs/utils';
 import '../../../../../../../_virtual/_tslib.js';
 import '@dynamic-labs/multi-wallet';
+import '../../../../../shared/logger.js';
 import 'react-international-phone';
 import '../../../../constants/colors.js';
 import '@dynamic-labs/iconic';
@@ -11,7 +12,6 @@ import '@dynamic-labs/wallet-connector-core';
 import 'react';
 import 'react/jsx-runtime';
 import '../../../../../context/ViewContext/ViewContext.js';
-import '../../../../../shared/logger.js';
 import '@dynamic-labs/wallet-book';
 import '../../../../../shared/consts/index.js';
 import '../../../../../store/state/nonce/nonce.js';

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

@@ -10,13 +10,13 @@ require('@dynamic-labs/sdk-api-core');
 require('../../constants/values.cjs');
 require('@dynamic-labs/utils');
 require('@dynamic-labs/multi-wallet');
+require('../../../shared/logger.cjs');
 require('react-international-phone');
 require('../../constants/colors.cjs');
 require('@dynamic-labs/iconic');
 require('@dynamic-labs/wallet-connector-core');
 require('react/jsx-runtime');
 require('../../../context/ViewContext/ViewContext.cjs');
-require('../../../shared/logger.cjs');
 require('@dynamic-labs/wallet-book');
 require('../../../shared/consts/index.cjs');
 require('../../../store/state/nonce/nonce.cjs');

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

@@ -6,13 +6,13 @@ import '@dynamic-labs/sdk-api-core';
 import '../../constants/values.js';
 import '@dynamic-labs/utils';
 import '@dynamic-labs/multi-wallet';
+import '../../../shared/logger.js';
 import 'react-international-phone';
 import '../../constants/colors.js';
 import '@dynamic-labs/iconic';
 import '@dynamic-labs/wallet-connector-core';
 import 'react/jsx-runtime';
 import '../../../context/ViewContext/ViewContext.js';
-import '../../../shared/logger.js';
 import '@dynamic-labs/wallet-book';
 import '../../../shared/consts/index.js';
 import '../../../store/state/nonce/nonce.js';

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

@@ -278,6 +278,7 @@ const useSocialAuth = ({ onSettled, onError, onFarcasterUrl, }) => {
         catch (error) {
             logger.logger.error('Social connection failed with unexpected error:', error);
             onFailed(provider, { error }, { raiseAuthFailure: authMode === 'signin' });
+            throw error;
         }
     }), [
         environmentId,
@@ -473,7 +474,7 @@ const useSocialAuth = ({ onSettled, onError, onFarcasterUrl, }) => {
                 handleError(provider, error.code, error.message, {
                     raiseAuthFailure: authMode === 'signin',
                 });
-                return;
+                throw error;
             }
             // Log message individually so the Expo console can display it (it fails to display objects)
             logger.logger.error('Social connection failed with unexpected error:', error.message, error);

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

@@ -274,6 +274,7 @@ const useSocialAuth = ({ onSettled, onError, onFarcasterUrl, }) => {
         catch (error) {
             logger.error('Social connection failed with unexpected error:', error);
             onFailed(provider, { error }, { raiseAuthFailure: authMode === 'signin' });
+            throw error;
         }
     }), [
         environmentId,
@@ -469,7 +470,7 @@ const useSocialAuth = ({ onSettled, onError, onFarcasterUrl, }) => {
                 handleError(provider, error.code, error.message, {
                     raiseAuthFailure: authMode === 'signin',
                 });
-                return;
+                throw error;
             }
             // Log message individually so the Expo console can display it (it fails to display objects)
             logger.error('Social connection failed with unexpected error:', error.message, error);

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

@@ -8,6 +8,7 @@ var sdkApiCore = require('@dynamic-labs/sdk-api-core');
 require('../../constants/values.cjs');
 require('@dynamic-labs/utils');
 require('@dynamic-labs/multi-wallet');
+var logger = require('../../../shared/logger.cjs');
 require('react-international-phone');
 require('../../constants/colors.cjs');
 require('@dynamic-labs/iconic');
@@ -15,7 +16,6 @@ require('@dynamic-labs/wallet-connector-core');
 require('react');
 require('react/jsx-runtime');
 require('../../../context/ViewContext/ViewContext.cjs');
-var logger = require('../../../shared/logger.cjs');
 require('@dynamic-labs/wallet-book');
 require('../../../shared/consts/index.cjs');
 require('../../../store/state/nonce/nonce.cjs');

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

@@ -4,6 +4,7 @@ import { ProviderEnum } from '@dynamic-labs/sdk-api-core';
 import '../../constants/values.js';
 import '@dynamic-labs/utils';
 import '@dynamic-labs/multi-wallet';
+import { logger } from '../../../shared/logger.js';
 import 'react-international-phone';
 import '../../constants/colors.js';
 import '@dynamic-labs/iconic';
@@ -11,7 +12,6 @@ import '@dynamic-labs/wallet-connector-core';
 import 'react';
 import 'react/jsx-runtime';
 import '../../../context/ViewContext/ViewContext.js';
-import { logger } from '../../../shared/logger.js';
 import '@dynamic-labs/wallet-book';
 import '../../../shared/consts/index.js';
 import '../../../store/state/nonce/nonce.js';

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

@@ -115,11 +115,12 @@ var useInternalDynamicContext = require('../../../context/DynamicContext/useDyna
  * Otherwise, returns all pending wallets from getWalletsDelegatedStatus.
  */
 const getWalletsToDelegate = (wallets, getWalletsDelegatedStatus) => {
+    const walletsWithDelegationStatus = getWalletsDelegatedStatus().filter((wallet) => wallet.status === 'pending');
     if (wallets && wallets.length > 0) {
-        // Convert Wallet[] to WalletWithStatus[] with pending status
-        return wallets.map((wallet) => (Object.assign(Object.assign({}, wallet), { status: 'pending' })));
+        return walletsWithDelegationStatus.filter((wallet) => wallets.some((w) => w.accountAddress === wallet.address &&
+            w.chainName === wallet.chain));
     }
-    return getWalletsDelegatedStatus().filter((wallet) => wallet.status === 'pending');
+    return walletsWithDelegationStatus;
 };
 // Hook to trigger wallet delegation modal
 const useWalletDelegation = () => {
@@ -222,23 +223,45 @@ const useWalletDelegation = () => {
             .filter((wallet) => wallet !== null);
     }, [user === null || user === void 0 ? void 0 : user.verifiedCredentials, userWallets]);
     const delegateKeyShares = React.useCallback((wallets) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
-        // If wallets provided, use them directly; otherwise get pending wallets
-        const walletsToDelegate = wallets && wallets.length > 0
-            ? wallets
-            : getWalletsToDelegate(undefined, getWalletsDelegatedStatus).map((wallet) => ({
-                accountAddress: wallet.address,
-                chainName: wallet.chain,
-            }));
+        if (!delegatedAccessEnabled) {
+            throw new Error('Wallet delegation is not enabled for this project environment. Please check the project settings.');
+        }
+        // If wallets provided, only eligible wallets are returned; otherwise get pending wallets
+        const walletsToDelegate = getWalletsToDelegate(wallets, getWalletsDelegatedStatus).map((wallet) => ({
+            accountAddress: wallet.address,
+            chainName: wallet.chain,
+        }));
+        if (walletsToDelegate.length === 0) {
+            throw new Error('No eligible wallets to delegate, only Dynamic WaaS wallets are eligible for delegation');
+        }
         for (const wallet of walletsToDelegate) {
             const walletConnector = getWaasWalletConnector(wallet.chainName);
-            if (!walletConnector)
+            if (!walletConnector) {
+                logger.logger.warn('Wallet connector not found, skipping delegate', {
+                    accountAddress: wallet.accountAddress,
+                    chainName: wallet.chainName,
+                });
                 continue;
-            yield walletConnector.delegateKeyShares({
-                accountAddress: wallet.accountAddress,
-            });
+            }
+            try {
+                yield walletConnector.delegateKeyShares({
+                    accountAddress: wallet.accountAddress,
+                });
+            }
+            catch (error) {
+                logger.logger.error('Failed to delegate key shares:', {
+                    error,
+                    wallet,
+                });
+            }
         }
         yield refresh();
-    }), [getWaasWalletConnector, refresh, getWalletsDelegatedStatus]);
+    }), [
+        getWaasWalletConnector,
+        refresh,
+        getWalletsDelegatedStatus,
+        delegatedAccessEnabled,
+    ]);
     const revokeDelegation = React.useCallback((wallets) => _tslib.__awaiter(void 0, void 0, void 0, function* () {
         // Get current wallet statuses to check which ones are actually delegated
         const walletsWithStatus = getWalletsDelegatedStatus();

package/src/lib/utils/hooks/useWalletDelegation/useWalletDelegation.d.ts

@@ -10,7 +10,10 @@ export type WalletWithStatus = Wallet & {
  * If wallets are provided and not empty, converts them to WalletWithStatus[] with pending status.
  * Otherwise, returns all pending wallets from getWalletsDelegatedStatus.
  */
-export declare const getWalletsToDelegate: (wallets: Wallet[] | undefined, getWalletsDelegatedStatus: () => WalletWithStatus[]) => WalletWithStatus[];
+export declare const getWalletsToDelegate: (wallets: {
+    chainName: ChainEnum;
+    accountAddress: string;
+}[] | undefined, getWalletsDelegatedStatus: () => WalletWithStatus[]) => WalletWithStatus[];
 export declare const useWalletDelegation: () => {
     readonly clearDelegationSessionState: () => void;
     readonly delegateKeyShares: (wallets?: {
@@ -21,7 +24,10 @@ export declare const useWalletDelegation: () => {
     readonly denyWalletDelegation: (walletId: string) => Promise<void>;
     readonly dismissDelegationPrompt: (walletId?: string) => void;
     readonly getWalletsDelegatedStatus: () => WalletWithStatus[];
-    readonly getWalletsToDelegate: (wallets: Wallet[] | undefined, getWalletsDelegatedStatus: () => WalletWithStatus[]) => WalletWithStatus[];
+    readonly getWalletsToDelegate: (wallets: {
+        chainName: ChainEnum;
+        accountAddress: string;
+    }[] | undefined, getWalletsDelegatedStatus: () => WalletWithStatus[]) => WalletWithStatus[];
     readonly initDelegationProcess: (options?: {
         wallets?: Wallet[];
     }) => Promise<void>;

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

@@ -111,11 +111,12 @@ import { useInternalDynamicContext } from '../../../context/DynamicContext/useDy
  * Otherwise, returns all pending wallets from getWalletsDelegatedStatus.
  */
 const getWalletsToDelegate = (wallets, getWalletsDelegatedStatus) => {
+    const walletsWithDelegationStatus = getWalletsDelegatedStatus().filter((wallet) => wallet.status === 'pending');
     if (wallets && wallets.length > 0) {
-        // Convert Wallet[] to WalletWithStatus[] with pending status
-        return wallets.map((wallet) => (Object.assign(Object.assign({}, wallet), { status: 'pending' })));
+        return walletsWithDelegationStatus.filter((wallet) => wallets.some((w) => w.accountAddress === wallet.address &&
+            w.chainName === wallet.chain));
     }
-    return getWalletsDelegatedStatus().filter((wallet) => wallet.status === 'pending');
+    return walletsWithDelegationStatus;
 };
 // Hook to trigger wallet delegation modal
 const useWalletDelegation = () => {
@@ -218,23 +219,45 @@ const useWalletDelegation = () => {
             .filter((wallet) => wallet !== null);
     }, [user === null || user === void 0 ? void 0 : user.verifiedCredentials, userWallets]);
     const delegateKeyShares = useCallback((wallets) => __awaiter(void 0, void 0, void 0, function* () {
-        // If wallets provided, use them directly; otherwise get pending wallets
-        const walletsToDelegate = wallets && wallets.length > 0
-            ? wallets
-            : getWalletsToDelegate(undefined, getWalletsDelegatedStatus).map((wallet) => ({
-                accountAddress: wallet.address,
-                chainName: wallet.chain,
-            }));
+        if (!delegatedAccessEnabled) {
+            throw new Error('Wallet delegation is not enabled for this project environment. Please check the project settings.');
+        }
+        // If wallets provided, only eligible wallets are returned; otherwise get pending wallets
+        const walletsToDelegate = getWalletsToDelegate(wallets, getWalletsDelegatedStatus).map((wallet) => ({
+            accountAddress: wallet.address,
+            chainName: wallet.chain,
+        }));
+        if (walletsToDelegate.length === 0) {
+            throw new Error('No eligible wallets to delegate, only Dynamic WaaS wallets are eligible for delegation');
+        }
         for (const wallet of walletsToDelegate) {
             const walletConnector = getWaasWalletConnector(wallet.chainName);
-            if (!walletConnector)
+            if (!walletConnector) {
+                logger.warn('Wallet connector not found, skipping delegate', {
+                    accountAddress: wallet.accountAddress,
+                    chainName: wallet.chainName,
+                });
                 continue;
-            yield walletConnector.delegateKeyShares({
-                accountAddress: wallet.accountAddress,
-            });
+            }
+            try {
+                yield walletConnector.delegateKeyShares({
+                    accountAddress: wallet.accountAddress,
+                });
+            }
+            catch (error) {
+                logger.error('Failed to delegate key shares:', {
+                    error,
+                    wallet,
+                });
+            }
         }
         yield refresh();
-    }), [getWaasWalletConnector, refresh, getWalletsDelegatedStatus]);
+    }), [
+        getWaasWalletConnector,
+        refresh,
+        getWalletsDelegatedStatus,
+        delegatedAccessEnabled,
+    ]);
     const revokeDelegation = useCallback((wallets) => __awaiter(void 0, void 0, void 0, function* () {
         // Get current wallet statuses to check which ones are actually delegated
         const walletsWithStatus = getWalletsDelegatedStatus();

package/src/lib/views/LoginView/sections/SocialSignInSection/SocialSignInSection.cjs

@@ -9,13 +9,13 @@ require('../../../../utils/constants/values.cjs');
 require('@dynamic-labs/utils');
 require('../../../../../../_virtual/_tslib.cjs');
 require('@dynamic-labs/multi-wallet');
+var logger = require('../../../../shared/logger.cjs');
 require('react-international-phone');
 require('../../../../utils/constants/colors.cjs');
 require('@dynamic-labs/iconic');
 require('@dynamic-labs/wallet-connector-core');
 require('react');
 require('../../../../context/ViewContext/ViewContext.cjs');
-var logger = require('../../../../shared/logger.cjs');
 require('@dynamic-labs/wallet-book');
 require('../../../../shared/consts/index.cjs');
 var getSocialSignInProviderFromString = require('../../../../utils/functions/getSocialSignInProviderFromString/getSocialSignInProviderFromString.cjs');

package/src/lib/views/LoginView/sections/SocialSignInSection/SocialSignInSection.js

@@ -5,13 +5,13 @@ import '../../../../utils/constants/values.js';
 import '@dynamic-labs/utils';
 import '../../../../../../_virtual/_tslib.js';
 import '@dynamic-labs/multi-wallet';
+import { logger } from '../../../../shared/logger.js';
 import 'react-international-phone';
 import '../../../../utils/constants/colors.js';
 import '@dynamic-labs/iconic';
 import '@dynamic-labs/wallet-connector-core';
 import 'react';
 import '../../../../context/ViewContext/ViewContext.js';
-import { logger } from '../../../../shared/logger.js';
 import '@dynamic-labs/wallet-book';
 import '../../../../shared/consts/index.js';
 import { getSocialSignInProviderFromString } from '../../../../utils/functions/getSocialSignInProviderFromString/getSocialSignInProviderFromString.js';

package/src/lib/views/WalletDelegation/WalletDelegationView/WalletDelegationView.cjs

@@ -48,7 +48,15 @@ const WalletDelegationView = ({ wallets, }) => {
     const [agreementChecked, setAgreementChecked] = React.useState(false);
     const [selectionInitialized, setSelectionInitialized] = React.useState(false);
     // Get waas wallets that are not yet delegated or use provided wallets override
-    const waasWallets = React.useMemo(() => getWalletsToDelegate(wallets, getWalletsDelegatedStatus), [wallets, getWalletsDelegatedStatus]);
+    const waasWallets = React.useMemo(() => {
+        const walletsToDelegate = wallets
+            ? wallets.map((wallet) => ({
+                accountAddress: wallet.address,
+                chainName: wallet.chain,
+            }))
+            : undefined;
+        return getWalletsToDelegate(walletsToDelegate, getWalletsDelegatedStatus);
+    }, [wallets, getWalletsDelegatedStatus, getWalletsToDelegate]);
     // Auto-select wallets only on initial load
     React.useEffect(() => {
         if (selectionInitialized)
@@ -175,7 +183,7 @@ const WalletDelegationView = ({ wallets, }) => {
     // Single wallet view
     const displaySingleWallet = () => {
         const [wallet] = waasWallets;
-        if (!wallet)
+        if (!wallet || !wallet.address)
             return null;
         return (jsxRuntime.jsxs("div", { className: 'embedded-delegated-view__wallet-card-container', children: [jsxRuntime.jsxs("div", { className: 'embedded-delegated-view__wallet-card', children: [jsxRuntime.jsx(Typography.Typography, { variant: 'body_normal', weight: 'medium', color: 'primary', children: t('dyn_wallet_delegation.my_wallet') }), jsxRuntime.jsxs("div", { className: 'embedded-delegated-view__wallet-address', children: [jsxRuntime.jsx("div", { className: 'embedded-delegated-view__wallet-address-dot' }), jsxRuntime.jsxs(Typography.Typography, { variant: 'body_small', color: 'secondary', children: [wallet.address.slice(0, 6), "...", wallet.address.slice(-4)] })] })] }), jsxRuntime.jsx(AgreementSection.AgreementSection, { checked: agreementChecked, onToggle: () => setAgreementChecked(!agreementChecked), text: t('dyn_wallet_delegation.agreement_text') })] }));
     };

package/src/lib/views/WalletDelegation/WalletDelegationView/WalletDelegationView.js

@@ -44,7 +44,15 @@ const WalletDelegationView = ({ wallets, }) => {
     const [agreementChecked, setAgreementChecked] = useState(false);
     const [selectionInitialized, setSelectionInitialized] = useState(false);
     // Get waas wallets that are not yet delegated or use provided wallets override
-    const waasWallets = useMemo(() => getWalletsToDelegate(wallets, getWalletsDelegatedStatus), [wallets, getWalletsDelegatedStatus]);
+    const waasWallets = useMemo(() => {
+        const walletsToDelegate = wallets
+            ? wallets.map((wallet) => ({
+                accountAddress: wallet.address,
+                chainName: wallet.chain,
+            }))
+            : undefined;
+        return getWalletsToDelegate(walletsToDelegate, getWalletsDelegatedStatus);
+    }, [wallets, getWalletsDelegatedStatus, getWalletsToDelegate]);
     // Auto-select wallets only on initial load
     useEffect(() => {
         if (selectionInitialized)
@@ -171,7 +179,7 @@ const WalletDelegationView = ({ wallets, }) => {
     // Single wallet view
     const displaySingleWallet = () => {
         const [wallet] = waasWallets;
-        if (!wallet)
+        if (!wallet || !wallet.address)
             return null;
         return (jsxs("div", { className: 'embedded-delegated-view__wallet-card-container', children: [jsxs("div", { className: 'embedded-delegated-view__wallet-card', children: [jsx(Typography, { variant: 'body_normal', weight: 'medium', color: 'primary', children: t('dyn_wallet_delegation.my_wallet') }), jsxs("div", { className: 'embedded-delegated-view__wallet-address', children: [jsx("div", { className: 'embedded-delegated-view__wallet-address-dot' }), jsxs(Typography, { variant: 'body_small', color: 'secondary', children: [wallet.address.slice(0, 6), "...", wallet.address.slice(-4)] })] })] }), jsx(AgreementSection, { checked: agreementChecked, onToggle: () => setAgreementChecked(!agreementChecked), text: t('dyn_wallet_delegation.agreement_text') })] }));
     };

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

@@ -10,11 +10,11 @@ require('../../../../utils/constants/values.cjs');
 require('@dynamic-labs/utils');
 require('../../../../../../_virtual/_tslib.cjs');
 require('@dynamic-labs/multi-wallet');
+require('../../../../shared/logger.cjs');
 require('react-international-phone');
 require('../../../../utils/constants/colors.cjs');
 var getChainIcon = require('../../../../shared/utils/functions/chain/getChainIcon.cjs');
 require('@dynamic-labs/wallet-connector-core');
-require('../../../../shared/logger.cjs');
 require('react');
 require('@dynamic-labs/iconic');
 require('../../../../context/ViewContext/ViewContext.cjs');

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

@@ -6,11 +6,11 @@ import '../../../../utils/constants/values.js';
 import '@dynamic-labs/utils';
 import '../../../../../../_virtual/_tslib.js';
 import '@dynamic-labs/multi-wallet';
+import '../../../../shared/logger.js';
 import 'react-international-phone';
 import '../../../../utils/constants/colors.js';
 import { getChainIcon } from '../../../../shared/utils/functions/chain/getChainIcon.js';
 import '@dynamic-labs/wallet-connector-core';
-import '../../../../shared/logger.js';
 import 'react';
 import '@dynamic-labs/iconic';
 import '../../../../context/ViewContext/ViewContext.js';

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

@@ -173,27 +173,27 @@ const WalletsDelegatedSettingsView = ({ name }) => {
     const handleDelegate = createHandleDelegate(delegateKeyShares);
     const handleWalletStatusChange = createHandleWalletStatusChange(handleRevoke, handleDelegate);
     const handleRevokeAll = createHandleRevokeAll(handleRevoke, walletsWithStatus);
-    return (jsxRuntime.jsxs("div", { className: 'wallets-delegated-settings-view', children: [jsxRuntime.jsxs("div", { className: 'header', children: [jsxRuntime.jsx(IconButton.IconButton, { onClick: () => setDynamicWidgetView('settings'), "data-testid": 'back-button', className: 'back-button', type: 'button', children: jsxRuntime.jsx(arrowLeft.ReactComponent, {}) }), jsxRuntime.jsx(Typography.Typography, { variant: 'title', color: 'primary', className: 'title', copykey: 'wallets_delegated.title', children: t('wallets_delegated.title') })] }), walletsWithStatus.length > 0 && (jsxRuntime.jsx("ul", { className: 'delegated-wallets-list', children: walletsWithStatus.map((wallet) => {
-                    var _a, _b;
-                    return (jsxRuntime.jsxs("li", { className: 'delegated-wallets-item', children: [jsxRuntime.jsx("div", { className: 'wallet-icon', children: jsxRuntime.jsx(WalletIconWithNetwork.WalletIconWithNetwork, { walletKey: wallet.key, Icon: null, iconUrl: (_b = (_a = wallet.connector) === null || _a === void 0 ? void 0 : _a.metadata) === null || _b === void 0 ? void 0 : _b.icon, chainName: wallet.chain, iconSize: 24, showNetwork: true }) }), jsxRuntime.jsxs("div", { className: 'wallet-info', children: [jsxRuntime.jsx(Typography.Typography, { variant: 'body_normal', color: 'primary', weight: 'medium', children: shortenWalletAddress.shortenWalletAddress(wallet.address) }), jsxRuntime.jsx("div", { className: wallet.status === 'delegated'
-                                            ? 'status-badge'
-                                            : 'status-badge status-badge--disconnected', children: jsxRuntime.jsx(Typography.Typography, { variant: 'body_small', color: wallet.status === 'delegated' ? 'primary' : 'secondary', children: wallet.status === 'delegated'
-                                                ? t('connected', 'Connected')
-                                                : t('disconnected', 'Disconnected') }) })] }), jsxRuntime.jsx(TypographyButton.TypographyButton, { onClick: () => _tslib.__awaiter(void 0, void 0, void 0, function* () {
-                                    yield handleWalletStatusChange(wallet);
-                                }), buttonPadding: 'small', className: 'revoke-button', typographyProps: {
-                                    color: 'primary',
-                                    variant: 'body_small',
-                                    weight: 'medium',
-                                }, children: wallet.status === 'delegated'
-                                    ? t('revoke', 'Revoke')
-                                    : t('delegate', 'Delegate') })] }, wallet.id));
-                }) })), walletsWithStatus.filter((w) => w.status === 'delegated').length > 0 && (jsxRuntime.jsx("div", { className: 'revoke-all-section', children: jsxRuntime.jsx(TypographyButton.TypographyButton, { onClick: () => _tslib.__awaiter(void 0, void 0, void 0, function* () {
+    return (jsxRuntime.jsxs("div", { className: 'wallets-delegated-settings-view', "data-testid": 'wallets-delegated-settings-view', children: [' ', jsxRuntime.jsxs("div", { className: 'header', "data-testid": 'delegated-header', children: [jsxRuntime.jsx(IconButton.IconButton, { onClick: () => setDynamicWidgetView('settings'), "data-testid": 'back-button', className: 'back-button', type: 'button', children: jsxRuntime.jsx(arrowLeft.ReactComponent, {}) }), jsxRuntime.jsx(Typography.Typography, { variant: 'title', color: 'primary', className: 'title', copykey: 'wallets_delegated.title', "data-testid": 'delegated-title', children: t('wallets_delegated.title') })] }), walletsWithStatus.length > 0 && (jsxRuntime.jsxs("ul", { className: 'delegated-wallets-list', "data-testid": 'delegated-wallets-list', children: [' ', walletsWithStatus.map((wallet, index) => {
+                        var _a, _b;
+                        return (jsxRuntime.jsxs("li", { className: 'delegated-wallets-item', "data-testid": `delegated-wallet-item-${index}`, children: [' ', jsxRuntime.jsx("div", { className: 'wallet-icon', children: jsxRuntime.jsx(WalletIconWithNetwork.WalletIconWithNetwork, { walletKey: wallet.key, Icon: null, iconUrl: (_b = (_a = wallet.connector) === null || _a === void 0 ? void 0 : _a.metadata) === null || _b === void 0 ? void 0 : _b.icon, chainName: wallet.chain, iconSize: 24, showNetwork: true }) }), jsxRuntime.jsxs("div", { className: 'wallet-info', "data-testid": `wallet-info-${index}`, children: [jsxRuntime.jsx(Typography.Typography, { variant: 'body_normal', color: 'primary', weight: 'medium', children: shortenWalletAddress.shortenWalletAddress(wallet.address) }), jsxRuntime.jsx("div", { className: wallet.status === 'delegated'
+                                                ? 'status-badge'
+                                                : 'status-badge status-badge--disconnected', children: jsxRuntime.jsx(Typography.Typography, { variant: 'body_small', color: wallet.status === 'delegated' ? 'primary' : 'secondary', children: wallet.status === 'delegated'
+                                                    ? t('connected', 'Connected')
+                                                    : t('disconnected', 'Disconnected') }) })] }), jsxRuntime.jsx(TypographyButton.TypographyButton, { onClick: () => _tslib.__awaiter(void 0, void 0, void 0, function* () {
+                                        yield handleWalletStatusChange(wallet);
+                                    }), buttonPadding: 'small', className: 'revoke-button', typographyProps: {
+                                        color: 'primary',
+                                        variant: 'body_small',
+                                        weight: 'medium',
+                                    }, children: wallet.status === 'delegated'
+                                        ? t('revoke', 'Revoke')
+                                        : t('delegate', 'Delegate') })] }, wallet.id));
+                    })] })), walletsWithStatus.filter((w) => w.status === 'delegated').length > 0 && (jsxRuntime.jsx("div", { className: 'revoke-all-section', "data-testid": 'revoke-all-section', children: jsxRuntime.jsx(TypographyButton.TypographyButton, { onClick: () => _tslib.__awaiter(void 0, void 0, void 0, function* () {
                         yield handleRevokeAll();
-                    }), buttonVariant: 'tertiary', buttonPadding: 'none', className: 'revoke-all-button', typographyProps: {
+                    }), buttonVariant: 'tertiary', buttonPadding: 'none', className: 'revoke-all-button', "data-testid": 'revoke-all-button', typographyProps: {
                         variant: 'body_normal',
                         weight: 'medium',
-                    }, children: t('revoke_all_wallet_access', 'Revoke all wallet access') }) })), showSuccessMessage && (jsxRuntime.jsxs("div", { className: 'success-message', children: [jsxRuntime.jsx(check.ReactComponent, {}), jsxRuntime.jsx(Typography.Typography, { variant: 'body_small', color: 'primary', copykey: 'global_wallet.wallets_delegated.success', children: t('global_wallet.wallets_delegated.success', { name }) })] }))] }));
+                    }, children: t('revoke_all_wallet_access', 'Revoke all wallet access') }) })), showSuccessMessage && (jsxRuntime.jsxs("div", { className: 'success-message', "data-testid": 'success-message', children: [jsxRuntime.jsx(check.ReactComponent, { "data-testid": 'success-icon' }), jsxRuntime.jsx(Typography.Typography, { variant: 'body_small', color: 'primary', copykey: 'global_wallet.wallets_delegated.success', "data-testid": 'success-text', children: t('global_wallet.wallets_delegated.success', { name }) })] }))] }));
 };
 
 exports.WalletsDelegatedSettingsView = WalletsDelegatedSettingsView;