@dynamic-labs/sdk-react-core 4.4.1 → 4.4.2-preview.0

package/CHANGELOG.md

@@ -1,4 +1,14 @@
 
+### [4.4.2-preview.0](https://github.com/dynamic-labs/dynamic-auth/compare/v4.4.1...v4.4.2-preview.0) (2025-01-28)
+
+
+### Features
+
+* add support for 7702 on ZeroDevConnector ([a8c850a](https://github.com/dynamic-labs/dynamic-auth/commit/a8c850ab192d6113ad55a01a594d5d90ab0fbfa6))
+* implement experimental_signAuthorization method in TurnkeyEVMWalletConnector ([#7866](https://github.com/dynamic-labs/dynamic-auth/issues/7866)) ([96853fa](https://github.com/dynamic-labs/dynamic-auth/commit/96853fae170ca2f81cc01ccd6d9886446876412b))
+* implement experimental_signAuthorization method in TurnkeyEVMWalletConnector ([#7866](https://github.com/dynamic-labs/dynamic-auth/issues/7866)) ([d988e88](https://github.com/dynamic-labs/dynamic-auth/commit/d988e88eccd0b04ba5710c8aa437f5dfffeb1d74))
+* implement experimental_signAuthorization method in TurnkeyEVMWalletConnector ([#7866](https://github.com/dynamic-labs/dynamic-auth/issues/7866)) ([597f837](https://github.com/dynamic-labs/dynamic-auth/commit/597f8375bacef1e6a9a064604074c6920955a3e2))
+
 ### [4.4.1](https://github.com/dynamic-labs/dynamic-auth/compare/v4.4.0...v4.4.1) (2025-01-27)
 
 

package/package.cjs

@@ -3,7 +3,7 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var version = "4.4.1";
+var version = "4.4.2-preview.0";
 var dependencies = {
 	"@dynamic-labs/sdk-api-core": "0.0.599",
 	"@hcaptcha/react-hcaptcha": "1.4.4",

package/package.js

@@ -1,5 +1,5 @@
 'use client'
-var version = "4.4.1";
+var version = "4.4.2-preview.0";
 var dependencies = {
 	"@dynamic-labs/sdk-api-core": "0.0.599",
 	"@hcaptcha/react-hcaptcha": "1.4.4",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dynamic-labs/sdk-react-core",
-  "version": "4.4.1",
+  "version": "4.4.2-preview.0",
   "dependencies": {
     "@dynamic-labs/sdk-api-core": "0.0.599",
     "@hcaptcha/react-hcaptcha": "1.4.4",
@@ -13,16 +13,16 @@
     "react-i18next": "13.5.0",
     "yup": "0.32.11",
     "react-international-phone": "4.2.5",
-    "@dynamic-labs/assert-package-version": "4.4.1",
-    "@dynamic-labs/iconic": "4.4.1",
-    "@dynamic-labs/logger": "4.4.1",
-    "@dynamic-labs/multi-wallet": "4.4.1",
-    "@dynamic-labs/rpc-providers": "4.4.1",
-    "@dynamic-labs/store": "4.4.1",
-    "@dynamic-labs/types": "4.4.1",
-    "@dynamic-labs/utils": "4.4.1",
-    "@dynamic-labs/wallet-book": "4.4.1",
-    "@dynamic-labs/wallet-connector-core": "4.4.1",
+    "@dynamic-labs/assert-package-version": "4.4.2-preview.0",
+    "@dynamic-labs/iconic": "4.4.2-preview.0",
+    "@dynamic-labs/logger": "4.4.2-preview.0",
+    "@dynamic-labs/multi-wallet": "4.4.2-preview.0",
+    "@dynamic-labs/rpc-providers": "4.4.2-preview.0",
+    "@dynamic-labs/store": "4.4.2-preview.0",
+    "@dynamic-labs/types": "4.4.2-preview.0",
+    "@dynamic-labs/utils": "4.4.2-preview.0",
+    "@dynamic-labs/wallet-book": "4.4.2-preview.0",
+    "@dynamic-labs/wallet-connector-core": "4.4.2-preview.0",
     "bs58": "5.0.0",
     "eventemitter3": "5.0.1"
   },

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

@@ -152,6 +152,7 @@ const useCreateDynamicEmbeddedWalletMutation = () => {
                 updatePrimaryWalletId.updatePrimaryWalletId(embeddedWalletVerifiedCredential.id);
             }
             else {
+                console.log('useCreateDynamicEmbeddedWalletMutation');
                 yield smartWallet.initializeSmartWallet({
                     account: smartWallet$1,
                     primaryWalletId: smartWallet$1.id,

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

@@ -148,6 +148,7 @@ const useCreateDynamicEmbeddedWalletMutation = () => {
                 updatePrimaryWalletId(embeddedWalletVerifiedCredential.id);
             }
             else {
+                console.log('useCreateDynamicEmbeddedWalletMutation');
                 yield initializeSmartWallet({
                     account: smartWallet,
                     primaryWalletId: smartWallet.id,

package/src/lib/utils/hooks/useEmbeddedWallet/useSecureEnclaveEmbeddedWallet/useTurnkey/useTurnkey.cjs

@@ -167,6 +167,7 @@ const useTurnkey = () => {
             (_a = turnkeyWallet === null || turnkeyWallet === void 0 ? void 0 : turnkeyWallet.walletConnector) === null || _a === void 0 ? void 0 : _a.setVerifiedCredentials(user.verifiedCredentials);
             const smartWallet$1 = smartWallet.findSmartWallet(embeddedWalletVerifiedCredential, user.verifiedCredentials);
             if (smartWallet$1) {
+                console.log('useTurnKey');
                 yield smartWallet.initializeSmartWallet({
                     account: smartWallet$1,
                     primaryWalletId: smartWallet$1.id,

package/src/lib/utils/hooks/useEmbeddedWallet/useSecureEnclaveEmbeddedWallet/useTurnkey/useTurnkey.js

@@ -163,6 +163,7 @@ const useTurnkey = () => {
             (_a = turnkeyWallet === null || turnkeyWallet === void 0 ? void 0 : turnkeyWallet.walletConnector) === null || _a === void 0 ? void 0 : _a.setVerifiedCredentials(user.verifiedCredentials);
             const smartWallet = findSmartWallet(embeddedWalletVerifiedCredential, user.verifiedCredentials);
             if (smartWallet) {
+                console.log('useTurnKey');
                 yield initializeSmartWallet({
                     account: smartWallet,
                     primaryWalletId: smartWallet.id,

package/src/lib/utils/hooks/useWalletConnectors/utils/createLinkedWalletsFromWalletOptions/createLinkedWalletsFromWalletOptions.cjs

@@ -10,6 +10,7 @@ var shouldManuallyReconnectOnRefresh = require('../../../../functions/shouldManu
 var convertLegacyPhantomLedgerConnector = require('../convertLegacyPhantomLedgerConnector/convertLegacyPhantomLedgerConnector.cjs');
 var smartWallet = require('../smartWallet/smartWallet.cjs');
 
+let count = 0;
 const createLinkedWalletsFromWalletOptions = ({ user, walletConnectorOptions, primaryWalletId, separateSmartWalletAndSigner, }) => {
     // wallet state should be null while loading all the wallets or when there is no user
     if (!walletConnectorOptions || !user) {
@@ -43,12 +44,17 @@ const createLinkedWalletsFromWalletOptions = ({ user, walletConnectorOptions, pr
         }
         if (account.address && account.chain) {
             if (account.walletProvider === sdkApiCore.WalletProviderEnum.SmartContractWallet) {
-                smartWallet.initializeSmartWallet({
-                    account,
-                    primaryWalletId,
-                    verifiedCredentials: user.verifiedCredentials,
-                    walletConnectorOptions,
-                });
+                // super hacky way to initialize the smart wallet only once, happening a lot of rerenders
+                if (count === 0) {
+                    count++;
+                    smartWallet.initializeSmartWallet({
+                        account,
+                        isEip7702: true,
+                        primaryWalletId,
+                        verifiedCredentials: user.verifiedCredentials,
+                        walletConnectorOptions,
+                    });
+                }
             }
             return wallet.walletConnector.createWallet({
                 additionalAddresses: account.walletAdditionalAddresses,

package/src/lib/utils/hooks/useWalletConnectors/utils/createLinkedWalletsFromWalletOptions/createLinkedWalletsFromWalletOptions.js

@@ -6,6 +6,7 @@ import { shouldManuallyReconnectOnRefresh } from '../../../../functions/shouldMa
 import { convertLegacyPhantomLedgerConnector } from '../convertLegacyPhantomLedgerConnector/convertLegacyPhantomLedgerConnector.js';
 import { isOwnerOfASmartWallet, initializeSmartWallet } from '../smartWallet/smartWallet.js';
 
+let count = 0;
 const createLinkedWalletsFromWalletOptions = ({ user, walletConnectorOptions, primaryWalletId, separateSmartWalletAndSigner, }) => {
     // wallet state should be null while loading all the wallets or when there is no user
     if (!walletConnectorOptions || !user) {
@@ -39,12 +40,17 @@ const createLinkedWalletsFromWalletOptions = ({ user, walletConnectorOptions, pr
         }
         if (account.address && account.chain) {
             if (account.walletProvider === WalletProviderEnum.SmartContractWallet) {
-                initializeSmartWallet({
-                    account,
-                    primaryWalletId,
-                    verifiedCredentials: user.verifiedCredentials,
-                    walletConnectorOptions,
-                });
+                // super hacky way to initialize the smart wallet only once, happening a lot of rerenders
+                if (count === 0) {
+                    count++;
+                    initializeSmartWallet({
+                        account,
+                        isEip7702: true,
+                        primaryWalletId,
+                        verifiedCredentials: user.verifiedCredentials,
+                        walletConnectorOptions,
+                    });
+                }
             }
             return wallet.walletConnector.createWallet({
                 additionalAddresses: account.walletAdditionalAddresses,

package/src/lib/utils/hooks/useWalletConnectors/utils/smartWallet/smartWallet.cjs

@@ -13,8 +13,17 @@ var findWalletOptionFor = require('../../../../functions/findWalletOptionFor/fin
 const findOwner = (account, verifiedCredentials) => verifiedCredentials.find((credential) => credential.id === account.signerRefId);
 const findSmartWallet = (account, verifiedCredentials) => verifiedCredentials.find((credential) => credential.signerRefId === account.id);
 const isOwnerOfASmartWallet = (account, verifiedCredentials) => Boolean(findSmartWallet(account, verifiedCredentials));
-const initializeSmartWallet = (_a) => _tslib.__awaiter(void 0, [_a], void 0, function* ({ account, verifiedCredentials, walletConnectorOptions, primaryWalletId, }) {
-    var _b, _c, _d, _e, _f;
+const initializeSmartWallet = (_a) => _tslib.__awaiter(void 0, [_a], void 0, function* ({ account, verifiedCredentials, walletConnectorOptions, primaryWalletId, isEip7702 = false, }) {
+    var _b, _c, _d, _e, _f, _g;
+    const smartWallet = findWalletOptionFor.findWalletOptionFor(account, walletConnectorOptions);
+    if (!smartWallet) {
+        throw new Error('could not find smart wallet from wallet options');
+    }
+    const connector = smartWallet.walletConnector;
+    if (!walletConnectorCore.isAccountAbstractionConnector(connector)) {
+        throw new Error('could not initialize smart wallet');
+    }
+    // Existing implementation for regular ZeroDev
     const owner = findOwner(account, verifiedCredentials);
     if (!owner) {
         throw new Error('could not find associated eoa account for smart wallet');
@@ -23,6 +32,9 @@ const initializeSmartWallet = (_a) => _tslib.__awaiter(void 0, [_a], void 0, fun
     if (!ownerWallet) {
         throw new Error('could not find owner wallet from wallet options');
     }
+    if ((!isEip7702 && !owner.address) || !account.address) {
+        throw new Error('could not find owner or smart wallet address');
+    }
     if (ownerWallet && walletConnectorCore.isTurnkeyWalletConnector(ownerWallet.walletConnector)) {
         const sortedVcs = (_c = (_b = ownerWallet.walletConnector) === null || _b === void 0 ? void 0 : _b.verifiedCredentials) === null || _c === void 0 ? void 0 : _c.reduce((acc, vc) => {
             if (vc.smartWalletRefAddress &&
@@ -37,26 +49,34 @@ const initializeSmartWallet = (_a) => _tslib.__awaiter(void 0, [_a], void 0, fun
             ownerWallet.walletConnector.setVerifiedCredentials(sortedVcs);
         }
     }
-    const smartWallet = findWalletOptionFor.findWalletOptionFor(account, walletConnectorOptions);
-    if (!smartWallet) {
-        throw new Error('could not find smart wallet from wallet options');
-    }
-    const connector = smartWallet.walletConnector;
-    if (!walletConnectorCore.isAccountAbstractionConnector(connector)) {
-        throw new Error('could not initialize smart wallet');
+    let eoaAddress, eoaConnector, shouldSetEoaConnector;
+    if (isEip7702) {
+        eoaAddress = (_d = verifiedCredentials.find((vc) => vc.walletName === 'turnkeyhd')) === null || _d === void 0 ? void 0 : _d.address;
+        if (!eoaAddress) {
+            throw new Error('could not find eoa address');
+        }
+        eoaConnector = walletConnectorCore.isTurnkeyWalletConnector(connector)
+            ? connector
+            : ownerWallet.walletConnector;
+        shouldSetEoaConnector = true;
     }
-    if (!owner.address || !account.address) {
-        throw new Error('could not find owner or smart wallet address');
+    else {
+        if (!owner.address) {
+            throw new Error('could not find owner address');
+        }
+        eoaAddress = owner.address;
+        eoaConnector = ownerWallet.walletConnector;
+        shouldSetEoaConnector =
+            primaryWalletId === owner.id || primaryWalletId === account.id;
     }
-    const shouldSetEoaConnector = primaryWalletId === owner.id || primaryWalletId === account.id;
     yield connector.registerEoa({
-        ecdsaProviderType: (_d = account.walletProperties) === null || _d === void 0 ? void 0 : _d.ecdsaProviderType,
-        entryPointVersion: (_e = account.walletProperties) === null || _e === void 0 ? void 0 : _e.entryPointVersion,
-        eoaAddress: owner.address,
-        eoaConnector: ownerWallet.walletConnector,
-        kernelVersion: (_f = account.walletProperties) === null || _f === void 0 ? void 0 : _f.kernelVersion,
+        ecdsaProviderType: (_e = account.walletProperties) === null || _e === void 0 ? void 0 : _e.ecdsaProviderType,
+        entryPointVersion: (_f = account.walletProperties) === null || _f === void 0 ? void 0 : _f.entryPointVersion,
+        eoaAddress,
+        eoaConnector,
+        kernelVersion: (_g = account.walletProperties) === null || _g === void 0 ? void 0 : _g.kernelVersion,
         shouldSetEoaConnector,
-        smartWalletAddress: account.address,
+        smartWalletAddress: eoaAddress,
     });
 });
 

package/src/lib/utils/hooks/useWalletConnectors/utils/smartWallet/smartWallet.d.ts

@@ -3,9 +3,10 @@ import { WalletOption } from '../../../../../shared';
 export declare const findOwner: (account: JwtVerifiedCredential, verifiedCredentials: JwtVerifiedCredential[]) => JwtVerifiedCredential | undefined;
 export declare const findSmartWallet: (account: JwtVerifiedCredential, verifiedCredentials: JwtVerifiedCredential[]) => JwtVerifiedCredential | undefined;
 export declare const isOwnerOfASmartWallet: (account: JwtVerifiedCredential, verifiedCredentials: JwtVerifiedCredential[]) => boolean;
-export declare const initializeSmartWallet: ({ account, verifiedCredentials, walletConnectorOptions, primaryWalletId, }: {
+export declare const initializeSmartWallet: ({ account, verifiedCredentials, walletConnectorOptions, primaryWalletId, isEip7702, }: {
     account: JwtVerifiedCredential;
     verifiedCredentials: JwtVerifiedCredential[];
     walletConnectorOptions: WalletOption[];
     primaryWalletId?: string;
+    isEip7702?: boolean;
 }) => Promise<void>;

package/src/lib/utils/hooks/useWalletConnectors/utils/smartWallet/smartWallet.js

@@ -1,6 +1,6 @@
 'use client'
 import { __awaiter } from '../../../../../../../_virtual/_tslib.js';
-import { isTurnkeyWalletConnector, isSameAddress, isAccountAbstractionConnector } from '@dynamic-labs/wallet-connector-core';
+import { isAccountAbstractionConnector, isTurnkeyWalletConnector, isSameAddress } from '@dynamic-labs/wallet-connector-core';
 import { VerifiedCredentialNameToChainEnum } from '../../../../constants/values.js';
 import { findWalletOptionFor } from '../../../../functions/findWalletOptionFor/findWalletOptionFor.js';
 
@@ -9,8 +9,17 @@ import { findWalletOptionFor } from '../../../../functions/findWalletOptionFor/f
 const findOwner = (account, verifiedCredentials) => verifiedCredentials.find((credential) => credential.id === account.signerRefId);
 const findSmartWallet = (account, verifiedCredentials) => verifiedCredentials.find((credential) => credential.signerRefId === account.id);
 const isOwnerOfASmartWallet = (account, verifiedCredentials) => Boolean(findSmartWallet(account, verifiedCredentials));
-const initializeSmartWallet = (_a) => __awaiter(void 0, [_a], void 0, function* ({ account, verifiedCredentials, walletConnectorOptions, primaryWalletId, }) {
-    var _b, _c, _d, _e, _f;
+const initializeSmartWallet = (_a) => __awaiter(void 0, [_a], void 0, function* ({ account, verifiedCredentials, walletConnectorOptions, primaryWalletId, isEip7702 = false, }) {
+    var _b, _c, _d, _e, _f, _g;
+    const smartWallet = findWalletOptionFor(account, walletConnectorOptions);
+    if (!smartWallet) {
+        throw new Error('could not find smart wallet from wallet options');
+    }
+    const connector = smartWallet.walletConnector;
+    if (!isAccountAbstractionConnector(connector)) {
+        throw new Error('could not initialize smart wallet');
+    }
+    // Existing implementation for regular ZeroDev
     const owner = findOwner(account, verifiedCredentials);
     if (!owner) {
         throw new Error('could not find associated eoa account for smart wallet');
@@ -19,6 +28,9 @@ const initializeSmartWallet = (_a) => __awaiter(void 0, [_a], void 0, function*
     if (!ownerWallet) {
         throw new Error('could not find owner wallet from wallet options');
     }
+    if ((!isEip7702 && !owner.address) || !account.address) {
+        throw new Error('could not find owner or smart wallet address');
+    }
     if (ownerWallet && isTurnkeyWalletConnector(ownerWallet.walletConnector)) {
         const sortedVcs = (_c = (_b = ownerWallet.walletConnector) === null || _b === void 0 ? void 0 : _b.verifiedCredentials) === null || _c === void 0 ? void 0 : _c.reduce((acc, vc) => {
             if (vc.smartWalletRefAddress &&
@@ -33,26 +45,34 @@ const initializeSmartWallet = (_a) => __awaiter(void 0, [_a], void 0, function*
             ownerWallet.walletConnector.setVerifiedCredentials(sortedVcs);
         }
     }
-    const smartWallet = findWalletOptionFor(account, walletConnectorOptions);
-    if (!smartWallet) {
-        throw new Error('could not find smart wallet from wallet options');
-    }
-    const connector = smartWallet.walletConnector;
-    if (!isAccountAbstractionConnector(connector)) {
-        throw new Error('could not initialize smart wallet');
+    let eoaAddress, eoaConnector, shouldSetEoaConnector;
+    if (isEip7702) {
+        eoaAddress = (_d = verifiedCredentials.find((vc) => vc.walletName === 'turnkeyhd')) === null || _d === void 0 ? void 0 : _d.address;
+        if (!eoaAddress) {
+            throw new Error('could not find eoa address');
+        }
+        eoaConnector = isTurnkeyWalletConnector(connector)
+            ? connector
+            : ownerWallet.walletConnector;
+        shouldSetEoaConnector = true;
     }
-    if (!owner.address || !account.address) {
-        throw new Error('could not find owner or smart wallet address');
+    else {
+        if (!owner.address) {
+            throw new Error('could not find owner address');
+        }
+        eoaAddress = owner.address;
+        eoaConnector = ownerWallet.walletConnector;
+        shouldSetEoaConnector =
+            primaryWalletId === owner.id || primaryWalletId === account.id;
     }
-    const shouldSetEoaConnector = primaryWalletId === owner.id || primaryWalletId === account.id;
     yield connector.registerEoa({
-        ecdsaProviderType: (_d = account.walletProperties) === null || _d === void 0 ? void 0 : _d.ecdsaProviderType,
-        entryPointVersion: (_e = account.walletProperties) === null || _e === void 0 ? void 0 : _e.entryPointVersion,
-        eoaAddress: owner.address,
-        eoaConnector: ownerWallet.walletConnector,
-        kernelVersion: (_f = account.walletProperties) === null || _f === void 0 ? void 0 : _f.kernelVersion,
+        ecdsaProviderType: (_e = account.walletProperties) === null || _e === void 0 ? void 0 : _e.ecdsaProviderType,
+        entryPointVersion: (_f = account.walletProperties) === null || _f === void 0 ? void 0 : _f.entryPointVersion,
+        eoaAddress,
+        eoaConnector,
+        kernelVersion: (_g = account.walletProperties) === null || _g === void 0 ? void 0 : _g.kernelVersion,
         shouldSetEoaConnector,
-        smartWalletAddress: account.address,
+        smartWalletAddress: eoaAddress,
     });
 });
 

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

@@ -101,9 +101,16 @@ require('../../../../components/Popper/Popper/Popper.cjs');
 require('../../../../components/Popper/PopperContext/PopperContext.cjs');
 
 const AccountControl = ({ className }) => {
+    var _a;
     const { primaryWallet, user } = useInternalDynamicContext.useInternalDynamicContext();
     const { isOpen, setIsOpen } = DynamicWidgetContext.useWidgetContext();
-    const address = primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.address;
+    let address = primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.address;
+    if (primaryWallet && ((_a = primaryWallet.connector) === null || _a === void 0 ? void 0 : _a.key) === 'zerodev') {
+        const zerodevWallet = primaryWallet.connector;
+        if (zerodevWallet.isEip7702Mode) {
+            address = zerodevWallet.eoaAddress;
+        }
+    }
     const nameService = useFetchNameService.useFetchNameService(address);
     const renderUserIdentifier = () => {
         if (nameService === null || nameService === void 0 ? void 0 : nameService.name) {

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

@@ -97,9 +97,16 @@ import '../../../../components/Popper/Popper/Popper.js';
 import '../../../../components/Popper/PopperContext/PopperContext.js';
 
 const AccountControl = ({ className }) => {
+    var _a;
     const { primaryWallet, user } = useInternalDynamicContext();
     const { isOpen, setIsOpen } = useWidgetContext();
-    const address = primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.address;
+    let address = primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.address;
+    if (primaryWallet && ((_a = primaryWallet.connector) === null || _a === void 0 ? void 0 : _a.key) === 'zerodev') {
+        const zerodevWallet = primaryWallet.connector;
+        if (zerodevWallet.isEip7702Mode) {
+            address = zerodevWallet.eoaAddress;
+        }
+    }
     const nameService = useFetchNameService(address);
     const renderUserIdentifier = () => {
         if (nameService === null || nameService === void 0 ? void 0 : nameService.name) {

package/src/lib/widgets/DynamicWidget/components/ActiveWalletInformation/ActiveWalletAddress/ActiveWalletAddress.cjs

@@ -111,11 +111,19 @@ const getNameIfNoIcon = (wallet) => {
         : undefined;
 };
 const ActiveWalletAddress = ({ wallet, nameServiceName, menuOption, fullWidth = false, isLoading = false, }) => {
+    var _a;
     const { showAlert } = PasskeyContext.usePasskeyContext();
     const header = nameServiceName || getNameIfNoIcon(wallet);
+    let address = wallet === null || wallet === void 0 ? void 0 : wallet.address;
+    if (wallet && ((_a = wallet.connector) === null || _a === void 0 ? void 0 : _a.key) === 'zerodev') {
+        const zerodevWallet = wallet.connector;
+        if (zerodevWallet.isEip7702Mode) {
+            address = zerodevWallet.eoaAddress;
+        }
+    }
     return (jsxRuntime.jsxs("div", { className: 'active-wallet-information__address-container', children: [jsxRuntime.jsxs("div", { children: [jsxRuntime.jsx(Typography.Typography, { className: fullWidth
                             ? 'active-wallet-information__handle--full-width'
-                            : 'active-wallet-information__handle', color: 'primary', variant: 'body_normal', children: header }), jsxRuntime.jsx(Typography.Typography, { className: 'active-wallet-information__address', weight: header ? 'regular' : 'medium', variant: header ? 'body_small' : 'body_normal', color: header ? 'secondary' : 'primary', children: isLoading ? (jsxRuntime.jsx(Skeleton.Skeleton, { className: 'active-wallet-information__address-skeleton' })) : (shortenWalletAddress.shortenWalletAddress(wallet === null || wallet === void 0 ? void 0 : wallet.address, 4, 4)) })] }), jsxRuntime.jsx(DotsMenu.DotsMenu, { "data-testid": 'dots-menu', options: menuOption, buttonClassName: 'active-wallet-information__dots-menu', buttonClassNameWithOpenMenu: 'active-wallet-information__dots-menu', iconOverride: showAlert() ? (jsxRuntime.jsx(IconWithStatus.IconWithStatus, { Icon: () => jsxRuntime.jsx(gear.ReactComponent, { width: 16, height: 16 }), variant: 'yellow' })) : (jsxRuntime.jsx(gear.ReactComponent, { width: 16, height: 16 })) })] }));
+                            : 'active-wallet-information__handle', color: 'primary', variant: 'body_normal', children: header }), jsxRuntime.jsx(Typography.Typography, { className: 'active-wallet-information__address', weight: header ? 'regular' : 'medium', variant: header ? 'body_small' : 'body_normal', color: header ? 'secondary' : 'primary', children: isLoading ? (jsxRuntime.jsx(Skeleton.Skeleton, { className: 'active-wallet-information__address-skeleton' })) : (shortenWalletAddress.shortenWalletAddress(address, 4, 4)) })] }), jsxRuntime.jsx(DotsMenu.DotsMenu, { "data-testid": 'dots-menu', options: menuOption, buttonClassName: 'active-wallet-information__dots-menu', buttonClassNameWithOpenMenu: 'active-wallet-information__dots-menu', iconOverride: showAlert() ? (jsxRuntime.jsx(IconWithStatus.IconWithStatus, { Icon: () => jsxRuntime.jsx(gear.ReactComponent, { width: 16, height: 16 }), variant: 'yellow' })) : (jsxRuntime.jsx(gear.ReactComponent, { width: 16, height: 16 })) })] }));
 };
 
 exports.ActiveWalletAddress = ActiveWalletAddress;

package/src/lib/widgets/DynamicWidget/components/ActiveWalletInformation/ActiveWalletAddress/ActiveWalletAddress.js

@@ -107,11 +107,19 @@ const getNameIfNoIcon = (wallet) => {
         : undefined;
 };
 const ActiveWalletAddress = ({ wallet, nameServiceName, menuOption, fullWidth = false, isLoading = false, }) => {
+    var _a;
     const { showAlert } = usePasskeyContext();
     const header = nameServiceName || getNameIfNoIcon(wallet);
+    let address = wallet === null || wallet === void 0 ? void 0 : wallet.address;
+    if (wallet && ((_a = wallet.connector) === null || _a === void 0 ? void 0 : _a.key) === 'zerodev') {
+        const zerodevWallet = wallet.connector;
+        if (zerodevWallet.isEip7702Mode) {
+            address = zerodevWallet.eoaAddress;
+        }
+    }
     return (jsxs("div", { className: 'active-wallet-information__address-container', children: [jsxs("div", { children: [jsx(Typography, { className: fullWidth
                             ? 'active-wallet-information__handle--full-width'
-                            : 'active-wallet-information__handle', color: 'primary', variant: 'body_normal', children: header }), jsx(Typography, { className: 'active-wallet-information__address', weight: header ? 'regular' : 'medium', variant: header ? 'body_small' : 'body_normal', color: header ? 'secondary' : 'primary', children: isLoading ? (jsx(Skeleton, { className: 'active-wallet-information__address-skeleton' })) : (shortenWalletAddress(wallet === null || wallet === void 0 ? void 0 : wallet.address, 4, 4)) })] }), jsx(DotsMenu, { "data-testid": 'dots-menu', options: menuOption, buttonClassName: 'active-wallet-information__dots-menu', buttonClassNameWithOpenMenu: 'active-wallet-information__dots-menu', iconOverride: showAlert() ? (jsx(IconWithStatus, { Icon: () => jsx(SvgGear, { width: 16, height: 16 }), variant: 'yellow' })) : (jsx(SvgGear, { width: 16, height: 16 })) })] }));
+                            : 'active-wallet-information__handle', color: 'primary', variant: 'body_normal', children: header }), jsx(Typography, { className: 'active-wallet-information__address', weight: header ? 'regular' : 'medium', variant: header ? 'body_small' : 'body_normal', color: header ? 'secondary' : 'primary', children: isLoading ? (jsx(Skeleton, { className: 'active-wallet-information__address-skeleton' })) : (shortenWalletAddress(address, 4, 4)) })] }), jsx(DotsMenu, { "data-testid": 'dots-menu', options: menuOption, buttonClassName: 'active-wallet-information__dots-menu', buttonClassNameWithOpenMenu: 'active-wallet-information__dots-menu', iconOverride: showAlert() ? (jsx(IconWithStatus, { Icon: () => jsx(SvgGear, { width: 16, height: 16 }), variant: 'yellow' })) : (jsx(SvgGear, { width: 16, height: 16 })) })] }));
 };
 
 export { ActiveWalletAddress, getNameIfNoIcon };