@dynamic-labs/aptos 4.42.0 → 4.44.0

package/CHANGELOG.md

@@ -1,4 +1,31 @@
 
+## [4.44.0](https://github.com/dynamic-labs/dynamic-auth/compare/v4.43.0...v4.44.0) (2025-11-05)
+
+
+### Features
+
+* add isAptosWallet method ([#9827](https://github.com/dynamic-labs/dynamic-auth/issues/9827)) ([3810b7b](https://github.com/dynamic-labs/dynamic-auth/commit/3810b7b83039a1521cb67ed13dd256eeb336b432))
+* show all Aptos wallets even if not installed ([#9837](https://github.com/dynamic-labs/dynamic-auth/issues/9837)) ([bc32f55](https://github.com/dynamic-labs/dynamic-auth/commit/bc32f55da243574ee1fa1522b65cf5bd1de4958f))
+
+
+### Bug Fixes
+
+* backpack wallet for solana wallet connect ([#9833](https://github.com/dynamic-labs/dynamic-auth/issues/9833)) ([013bbdd](https://github.com/dynamic-labs/dynamic-auth/commit/013bbdd771adae02d03439074dd4c006e2a9515d))
+* sendbalance on aptos ([#9829](https://github.com/dynamic-labs/dynamic-auth/issues/9829)) ([8bd57b9](https://github.com/dynamic-labs/dynamic-auth/commit/8bd57b96a376095f51a469fe894496952cf2bc0f))
+
+## [4.43.0](https://github.com/dynamic-labs/dynamic-auth/compare/v4.42.0...v4.43.0) (2025-11-04)
+
+
+### Features
+
+* add getOnrampQrCode ([#9794](https://github.com/dynamic-labs/dynamic-auth/issues/9794)) ([08a3dc9](https://github.com/dynamic-labs/dynamic-auth/commit/08a3dc944c0391f279f836f15255e6c16da18931))
+
+
+### Bug Fixes
+
+* aptos wallet event listeners ([#9818](https://github.com/dynamic-labs/dynamic-auth/issues/9818)) ([5aa28c1](https://github.com/dynamic-labs/dynamic-auth/commit/5aa28c109909d4a81362f181be7be0df29d6a257))
+* issue with adding totp mfa device after adding passkey ([#9822](https://github.com/dynamic-labs/dynamic-auth/issues/9822)) ([a372ea4](https://github.com/dynamic-labs/dynamic-auth/commit/a372ea4254b771d62044d53f82481b89630e7613))
+
 ## [4.42.0](https://github.com/dynamic-labs/dynamic-auth/compare/v4.41.1...v4.42.0) (2025-11-04)
 
 

package/package.cjs

@@ -3,6 +3,6 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var version = "4.42.0";
+var version = "4.44.0";
 
 exports.version = version;

package/package.js

@@ -1,4 +1,4 @@
 'use client'
-var version = "4.42.0";
+var version = "4.44.0";
 
 export { version };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dynamic-labs/aptos",
-  "version": "4.42.0",
+  "version": "4.44.0",
   "description": "A React SDK for implementing wallet web3 authentication and authorization to your website.",
   "author": "Dynamic Labs, Inc.",
   "license": "MIT",
@@ -20,13 +20,14 @@
   "dependencies": {
     "@aptos-labs/ts-sdk": "5.1.1",
     "@aptos-labs/wallet-standard": "0.5.2",
-    "@dynamic-labs/assert-package-version": "4.42.0",
+    "@dynamic-labs/assert-package-version": "4.44.0",
     "@wallet-standard/core": "1.1.1",
     "@wallet-standard/features": "1.0.3",
-    "@dynamic-labs/logger": "4.42.0",
-    "@dynamic-labs/utils": "4.42.0",
-    "@dynamic-labs/wallet-book": "4.42.0",
-    "@dynamic-labs/wallet-connector-core": "4.42.0"
+    "@dynamic-labs/logger": "4.44.0",
+    "@dynamic-labs/types": "4.44.0",
+    "@dynamic-labs/utils": "4.44.0",
+    "@dynamic-labs/wallet-book": "4.44.0",
+    "@dynamic-labs/wallet-connector-core": "4.44.0"
   },
   "peerDependencies": {}
 }

package/src/connectors/AptosWalletConnector/AptosWalletConnector.cjs

@@ -23,6 +23,7 @@ var AptosWallet = require('../../wallet/AptosWallet.cjs');
  */
 class AptosWalletConnector extends walletConnectorCore.WalletConnectorBase {
     constructor(name, opts) {
+        var _a;
         super({ metadata: opts.metadata, walletBook: opts.walletBook });
         this.name = 'Aptos';
         this.ChainWallet = AptosWallet.AptosWallet;
@@ -33,6 +34,22 @@ class AptosWalletConnector extends walletConnectorCore.WalletConnectorBase {
         this.isConnecting = false;
         this.name = name;
         this.logger = new logger.Logger(this.name);
+        this.aptosNetworks = (_a = opts.aptosNetworks) !== null && _a !== void 0 ? _a : [];
+    }
+    getEnabledNetworks() {
+        return this.aptosNetworks;
+    }
+    getNetwork() {
+        return _tslib.__awaiter(this, void 0, void 0, function* () {
+            const provider = this.getProvider();
+            assertProvider.assertProvider(provider);
+            const network = yield invokeWalletMethod.invokeWalletMethod(provider, 'aptos:network', 'network');
+            if (network === null || network === void 0 ? void 0 : network.chainId) {
+                return network.chainId;
+            }
+            // default to mainnet
+            return 1;
+        });
     }
     /**
      * Connects to the Aptos wallet.
@@ -121,12 +138,9 @@ class AptosWalletConnector extends walletConnectorCore.WalletConnectorBase {
                 return parseTransactionResponse.parseTransactionResponse(response);
             }
             catch (error) {
-                // If signAndSubmit not available, fall back to sign + submit
+                this.logger.error('[signAndSubmitTransaction] Error:', error);
+                throw new utils.DynamicError('Failed to sign and submit transaction');
             }
-            // Fallback: sign then submit separately
-            const signedTx = yield this.signTransaction(transaction);
-            const authenticator = 'args' in signedTx ? signedTx.args : signedTx;
-            return this.submitTransaction(authenticator);
         });
     }
     /**

package/src/connectors/AptosWalletConnector/AptosWalletConnector.d.ts

@@ -1,8 +1,9 @@
 import type { AccountAuthenticator, AnyRawTransaction } from '@aptos-labs/ts-sdk';
-import { Aptos } from '@aptos-labs/ts-sdk';
+import { Aptos, InputGenerateTransactionPayloadData } from '@aptos-labs/ts-sdk';
 import type { AccountInfo, AptosSignMessageInput, AptosSignMessageOutput, NetworkInfo, UserResponse } from '@aptos-labs/wallet-standard';
 import { Logger } from '@dynamic-labs/logger';
 import { type Chain, WalletConnectorBase } from '@dynamic-labs/wallet-connector-core';
+import { GenericNetwork } from '@dynamic-labs/types';
 import type { AptosWalletConnectorProps, IAptosProvider } from '../../types';
 import { AptosWallet } from '../../wallet/AptosWallet';
 /**
@@ -24,12 +25,15 @@ export declare abstract class AptosWalletConnector extends WalletConnectorBase<t
     logger: Logger;
     /** Connection state */
     protected isConnecting: boolean;
+    aptosNetworks: GenericNetwork[];
     constructor(name: string, opts: AptosWalletConnectorProps);
     /**
      * Abstract method to get the wallet provider.
      * Must be implemented by concrete connector classes.
      */
     abstract getProvider(): IAptosProvider | undefined;
+    getEnabledNetworks(): GenericNetwork[];
+    getNetwork(): Promise<number | undefined>;
     /**
      * Connects to the Aptos wallet.
      */
@@ -55,7 +59,7 @@ export declare abstract class AptosWalletConnector extends WalletConnectorBase<t
     /**
      * Signs and submits a transaction.
      */
-    signAndSubmitTransaction(transaction: AnyRawTransaction): Promise<string>;
+    signAndSubmitTransaction(transaction: InputGenerateTransactionPayloadData): Promise<string>;
     /**
      * Submits a signed transaction.
      */

package/src/connectors/AptosWalletConnector/AptosWalletConnector.js

@@ -19,6 +19,7 @@ import { AptosWallet } from '../../wallet/AptosWallet.js';
  */
 class AptosWalletConnector extends WalletConnectorBase {
     constructor(name, opts) {
+        var _a;
         super({ metadata: opts.metadata, walletBook: opts.walletBook });
         this.name = 'Aptos';
         this.ChainWallet = AptosWallet;
@@ -29,6 +30,22 @@ class AptosWalletConnector extends WalletConnectorBase {
         this.isConnecting = false;
         this.name = name;
         this.logger = new Logger(this.name);
+        this.aptosNetworks = (_a = opts.aptosNetworks) !== null && _a !== void 0 ? _a : [];
+    }
+    getEnabledNetworks() {
+        return this.aptosNetworks;
+    }
+    getNetwork() {
+        return __awaiter(this, void 0, void 0, function* () {
+            const provider = this.getProvider();
+            assertProvider(provider);
+            const network = yield invokeWalletMethod(provider, 'aptos:network', 'network');
+            if (network === null || network === void 0 ? void 0 : network.chainId) {
+                return network.chainId;
+            }
+            // default to mainnet
+            return 1;
+        });
     }
     /**
      * Connects to the Aptos wallet.
@@ -117,12 +134,9 @@ class AptosWalletConnector extends WalletConnectorBase {
                 return parseTransactionResponse(response);
             }
             catch (error) {
-                // If signAndSubmit not available, fall back to sign + submit
+                this.logger.error('[signAndSubmitTransaction] Error:', error);
+                throw new DynamicError('Failed to sign and submit transaction');
             }
-            // Fallback: sign then submit separately
-            const signedTx = yield this.signTransaction(transaction);
-            const authenticator = 'args' in signedTx ? signedTx.args : signedTx;
-            return this.submitTransaction(authenticator);
         });
     }
     /**

package/src/index.cjs

@@ -17,6 +17,7 @@ var assertProvider = require('./utils/assertProvider/assertProvider.cjs');
 var getWalletStandardWallets = require('./utils/getWalletStandardWallets/getWalletStandardWallets.cjs');
 var invokeWalletMethod = require('./utils/invokeWalletMethod/invokeWalletMethod.cjs');
 var isWalletWithRequiredFeatureSet = require('./utils/isWalletWithRequiredFeatureSet/isWalletWithRequiredFeatureSet.cjs');
+var isAptosWallet = require('./wallet/isAptosWallet/isAptosWallet.cjs');
 var parseConnectionResult = require('./utils/parseConnectionResult/parseConnectionResult.cjs');
 var parseTransactionResponse = require('./utils/parseTransactionResponse/parseTransactionResponse.cjs');
 
@@ -34,6 +35,7 @@ exports.assertProvider = assertProvider.assertProvider;
 exports.getWalletStandardWallets = getWalletStandardWallets.getWalletStandardWallets;
 exports.invokeWalletMethod = invokeWalletMethod.invokeWalletMethod;
 exports.isWalletWithRequiredFeatureSet = isWalletWithRequiredFeatureSet.isWalletWithRequiredFeatureSet;
+exports.isAptosWallet = isAptosWallet.isAptosWallet;
 exports.parseConnectionResult = parseConnectionResult.parseConnectionResult;
 exports.parseTransactionResponse = parseTransactionResponse.parseTransactionResponse;
 exports.AptosWalletConnectors = AptosWalletConnectors;

package/src/index.d.ts

@@ -5,6 +5,7 @@ export { assertProvider } from './utils/assertProvider';
 export { getWalletStandardWallets } from './utils/getWalletStandardWallets';
 export { invokeWalletMethod } from './utils/invokeWalletMethod';
 export { isWalletWithRequiredFeatureSet } from './utils/isWalletWithRequiredFeatureSet';
+export { isAptosWallet } from './wallet/isAptosWallet/isAptosWallet';
 export { parseConnectionResult, type ParsedAccountInfo, } from './utils/parseConnectionResult';
 export { parseTransactionResponse } from './utils/parseTransactionResponse';
 export declare const AptosWalletConnectors: (props: any) => import("dist/packages/wallet-connector-core/src").WalletConnectorConstructor[];

package/src/index.js

@@ -13,6 +13,7 @@ export { assertProvider } from './utils/assertProvider/assertProvider.js';
 export { getWalletStandardWallets } from './utils/getWalletStandardWallets/getWalletStandardWallets.js';
 export { invokeWalletMethod } from './utils/invokeWalletMethod/invokeWalletMethod.js';
 export { isWalletWithRequiredFeatureSet } from './utils/isWalletWithRequiredFeatureSet/isWalletWithRequiredFeatureSet.js';
+export { isAptosWallet } from './wallet/isAptosWallet/isAptosWallet.js';
 export { parseConnectionResult } from './utils/parseConnectionResult/parseConnectionResult.js';
 export { parseTransactionResponse } from './utils/parseTransactionResponse/parseTransactionResponse.js';
 

package/src/injected/AptosProviderHelper.cjs

@@ -294,37 +294,99 @@ class AptosProviderHelper {
             });
             return;
         }
+        // Clean up any existing listeners first
+        this._teardownEventListeners();
         const onAccountChangeMethod = provider === null || provider === void 0 ? void 0 : provider.onAccountChange;
         const onNetworkChangeMethod = provider === null || provider === void 0 ? void 0 : provider.onNetworkChange;
         if (onAccountChangeMethod) {
-            onAccountChangeMethod((account) => {
+            walletConnectorCore.logger.debug('[AptosProviderHelper] Setting up account change listener', {
+                connector: this.connector.name,
+            });
+            const unsubscribe = onAccountChangeMethod((account) => {
+                var _a;
+                const newAddress = (_a = account === null || account === void 0 ? void 0 : account.address) === null || _a === void 0 ? void 0 : _a.toString();
+                walletConnectorCore.logger.debug('[AptosProviderHelper] Account change event received', {
+                    address: newAddress,
+                    connector: this.connector.name,
+                    hasAccount: Boolean(account),
+                    lastAddress: this.lastAccountAddress,
+                });
+                // Skip if account hasn't actually changed
+                if (account && newAddress === this.lastAccountAddress) {
+                    walletConnectorCore.logger.debug('[AptosProviderHelper] Account address unchanged, skipping', {
+                        address: newAddress,
+                        connector: this.connector.name,
+                    });
+                    return;
+                }
                 if (account) {
+                    this.lastAccountAddress = newAddress;
                     this.handleAccountChange(this.connector, provider, account.address.toString());
                 }
                 else {
+                    this.lastAccountAddress = undefined;
+                    walletConnectorCore.logger.debug('[AptosProviderHelper] Account is null, emitting disconnect', {
+                        connector: this.connector.name,
+                    });
                     this.connector.emit('disconnect');
                 }
             });
+            this.unsubscribeAccountChange =
+                typeof unsubscribe === 'function' ? unsubscribe : undefined;
+            if (!this.unsubscribeAccountChange) {
+                walletConnectorCore.logger.warn('[AptosProviderHelper] onAccountChange did not return unsubscribe function', {
+                    connector: this.connector.name,
+                });
+            }
+        }
+        else {
+            walletConnectorCore.logger.debug('[AptosProviderHelper] onAccountChange method not available', {
+                connector: this.connector.name,
+                hasProvider: Boolean(provider),
+            });
         }
         if (onNetworkChangeMethod) {
-            onNetworkChangeMethod((network) => {
+            walletConnectorCore.logger.debug('[AptosProviderHelper] Setting up network change listener', {
+                connector: this.connector.name,
+            });
+            const unsubscribe = onNetworkChangeMethod((network) => {
+                walletConnectorCore.logger.debug('[AptosProviderHelper] Network change event received', {
+                    chainId: network.chainId,
+                    connector: this.connector.name,
+                });
                 if (network.chainId) {
                     this.connector.emit('chainChange', {
                         chain: network.chainId.toString(),
                     });
                 }
             });
+            this.unsubscribeNetworkChange =
+                typeof unsubscribe === 'function' ? unsubscribe : undefined;
+            if (!this.unsubscribeNetworkChange) {
+                walletConnectorCore.logger.warn('[AptosProviderHelper] onNetworkChange did not return unsubscribe function', {
+                    connector: this.connector.name,
+                });
+            }
+        }
+        else {
+            walletConnectorCore.logger.debug('[AptosProviderHelper] onNetworkChange method not available', {
+                connector: this.connector.name,
+            });
         }
     }
     /**
      * Tears down event listeners.
      */
     _teardownEventListeners() {
-        const provider = this.findProvider();
-        if (!provider)
-            return;
-        // Aptos providers don't have removeAllListeners like Solana
-        // Event listeners are automatically cleaned up when the provider is destroyed
+        // Call unsubscribe functions if they exist
+        if (this.unsubscribeAccountChange) {
+            this.unsubscribeAccountChange();
+            this.unsubscribeAccountChange = undefined;
+        }
+        if (this.unsubscribeNetworkChange) {
+            this.unsubscribeNetworkChange();
+            this.unsubscribeNetworkChange = undefined;
+        }
     }
 }
 

package/src/injected/AptosProviderHelper.d.ts

@@ -13,6 +13,9 @@ import type { InjectedWalletBase } from './InjectedWalletBase';
 export declare class AptosProviderHelper {
     private walletBookWallet;
     private connector;
+    private unsubscribeAccountChange?;
+    private unsubscribeNetworkChange?;
+    private lastAccountAddress?;
     constructor(connector: InjectedWalletBase);
     /**
      * Gets the installed Aptos provider using legacy injection.

package/src/injected/AptosProviderHelper.js

@@ -290,37 +290,99 @@ class AptosProviderHelper {
             });
             return;
         }
+        // Clean up any existing listeners first
+        this._teardownEventListeners();
         const onAccountChangeMethod = provider === null || provider === void 0 ? void 0 : provider.onAccountChange;
         const onNetworkChangeMethod = provider === null || provider === void 0 ? void 0 : provider.onNetworkChange;
         if (onAccountChangeMethod) {
-            onAccountChangeMethod((account) => {
+            logger.debug('[AptosProviderHelper] Setting up account change listener', {
+                connector: this.connector.name,
+            });
+            const unsubscribe = onAccountChangeMethod((account) => {
+                var _a;
+                const newAddress = (_a = account === null || account === void 0 ? void 0 : account.address) === null || _a === void 0 ? void 0 : _a.toString();
+                logger.debug('[AptosProviderHelper] Account change event received', {
+                    address: newAddress,
+                    connector: this.connector.name,
+                    hasAccount: Boolean(account),
+                    lastAddress: this.lastAccountAddress,
+                });
+                // Skip if account hasn't actually changed
+                if (account && newAddress === this.lastAccountAddress) {
+                    logger.debug('[AptosProviderHelper] Account address unchanged, skipping', {
+                        address: newAddress,
+                        connector: this.connector.name,
+                    });
+                    return;
+                }
                 if (account) {
+                    this.lastAccountAddress = newAddress;
                     this.handleAccountChange(this.connector, provider, account.address.toString());
                 }
                 else {
+                    this.lastAccountAddress = undefined;
+                    logger.debug('[AptosProviderHelper] Account is null, emitting disconnect', {
+                        connector: this.connector.name,
+                    });
                     this.connector.emit('disconnect');
                 }
             });
+            this.unsubscribeAccountChange =
+                typeof unsubscribe === 'function' ? unsubscribe : undefined;
+            if (!this.unsubscribeAccountChange) {
+                logger.warn('[AptosProviderHelper] onAccountChange did not return unsubscribe function', {
+                    connector: this.connector.name,
+                });
+            }
+        }
+        else {
+            logger.debug('[AptosProviderHelper] onAccountChange method not available', {
+                connector: this.connector.name,
+                hasProvider: Boolean(provider),
+            });
         }
         if (onNetworkChangeMethod) {
-            onNetworkChangeMethod((network) => {
+            logger.debug('[AptosProviderHelper] Setting up network change listener', {
+                connector: this.connector.name,
+            });
+            const unsubscribe = onNetworkChangeMethod((network) => {
+                logger.debug('[AptosProviderHelper] Network change event received', {
+                    chainId: network.chainId,
+                    connector: this.connector.name,
+                });
                 if (network.chainId) {
                     this.connector.emit('chainChange', {
                         chain: network.chainId.toString(),
                     });
                 }
             });
+            this.unsubscribeNetworkChange =
+                typeof unsubscribe === 'function' ? unsubscribe : undefined;
+            if (!this.unsubscribeNetworkChange) {
+                logger.warn('[AptosProviderHelper] onNetworkChange did not return unsubscribe function', {
+                    connector: this.connector.name,
+                });
+            }
+        }
+        else {
+            logger.debug('[AptosProviderHelper] onNetworkChange method not available', {
+                connector: this.connector.name,
+            });
         }
     }
     /**
      * Tears down event listeners.
      */
     _teardownEventListeners() {
-        const provider = this.findProvider();
-        if (!provider)
-            return;
-        // Aptos providers don't have removeAllListeners like Solana
-        // Event listeners are automatically cleaned up when the provider is destroyed
+        // Call unsubscribe functions if they exist
+        if (this.unsubscribeAccountChange) {
+            this.unsubscribeAccountChange();
+            this.unsubscribeAccountChange = undefined;
+        }
+        if (this.unsubscribeNetworkChange) {
+            this.unsubscribeNetworkChange();
+            this.unsubscribeNetworkChange = undefined;
+        }
     }
 }
 

package/src/injected/InjectedWalletBase.cjs

@@ -60,14 +60,14 @@ class InjectedWalletBase extends AptosWalletConnector.AptosWalletConnector {
     getAddress() {
         return _tslib.__awaiter(this, void 0, void 0, function* () {
             var _a;
-            if (!this.isInstalledOnBrowser()) {
+            const didOpenInAppBrowser = this.openInAppBrowserIfRequired();
+            if (didOpenInAppBrowser) {
                 return;
             }
             // If no address, we need to connect first to trigger the wallet popup
             yield this.connect();
             // Now try to get the address again
-            const address = yield ((_a = this.aptosProviderHelper) === null || _a === void 0 ? void 0 : _a.getAddress());
-            return address;
+            return (_a = this.aptosProviderHelper) === null || _a === void 0 ? void 0 : _a.getAddress();
         });
     }
     signMessage(messageToSign) {

package/src/injected/InjectedWalletBase.js

@@ -56,14 +56,14 @@ class InjectedWalletBase extends AptosWalletConnector {
     getAddress() {
         return __awaiter(this, void 0, void 0, function* () {
             var _a;
-            if (!this.isInstalledOnBrowser()) {
+            const didOpenInAppBrowser = this.openInAppBrowserIfRequired();
+            if (didOpenInAppBrowser) {
                 return;
             }
             // If no address, we need to connect first to trigger the wallet popup
             yield this.connect();
             // Now try to get the address again
-            const address = yield ((_a = this.aptosProviderHelper) === null || _a === void 0 ? void 0 : _a.getAddress());
-            return address;
+            return (_a = this.aptosProviderHelper) === null || _a === void 0 ? void 0 : _a.getAddress();
         });
     }
     signMessage(messageToSign) {

package/src/injected/fetchInjectedWalletConnectors.cjs

@@ -77,24 +77,27 @@ const shouldAddWalletStandardConnector = (wallet, walletBook) => {
  * Fetches all available injected Aptos wallet connectors.
  *
  * This function discovers and creates wallet connector constructors from two sources:
- * 1. Wallet book entries - Traditional wallets defined in the wallet book
- * 2. Wallet-standard wallets - AIP-62 compliant wallets discovered via wallet-standard
+ * 1. Wallet book entries - All Aptos wallets defined in the wallet book (including uninstalled wallet-standard wallets)
+ * 2. Wallet-standard wallets - AIP-62 compliant wallets discovered via wallet-standard (installed wallets only)
+ *
+ * The function creates connectors for:
+ * - Installed wallet-standard wallets (discovered via wallet-standard)
+ * - Uninstalled wallet-standard wallets (from wallet book, will use wallet-standard when installed)
+ * - Traditional wallets without wallet-standard support (from wallet book)
  *
  * The function automatically filters out wallets that:
  * - Have custom connector implementations
- * - Are already handled by wallet-standard connectors
+ * - Are already discovered via wallet-standard (to avoid duplicates)
  * - Don't support the required Aptos feature set
  *
  * @param options - Configuration options
  * @param options.walletBook - The wallet book schema containing wallet metadata
- * @param options.authMode - The authentication mode for filtering wallet features
  * @returns Array of wallet connector constructor classes
  *
  * @example
  * ```typescript
  * const connectors = fetchInjectedWalletConnectors({
  *   walletBook,
- *   authMode: 'connect-and-sign'
  * });
  *
  * // Instantiate connectors
@@ -105,40 +108,15 @@ const shouldAddWalletStandardConnector = (wallet, walletBook) => {
  */
 const fetchInjectedWalletConnectors = ({ walletBook: walletBook$1, }) => {
     var _a;
-    // Get wallet book connectors for traditional Aptos wallets
-    const walletBookConnectors = Object.entries((_a = walletBook$1 === null || walletBook$1 === void 0 ? void 0 : walletBook$1.wallets) !== null && _a !== void 0 ? _a : {})
-        .filter(([key, wallet]) => {
-        var _a, _b, _c;
-        const injectedConfig = (_a = wallet.injectedConfig) === null || _a === void 0 ? void 0 : _a.find((config) => config.chain === 'aptos');
-        const isAptosWallet = Boolean(injectedConfig);
-        // Filter out wallets that require a custom connector or wallets that support wallet-standard,
-        // since they are already handled automatically with the wallet-standard connector
-        const shouldBeFiltered = walletsWithCustomConnectors.includes(key) ||
-            ((_c = (_b = injectedConfig === null || injectedConfig === void 0 ? void 0 : injectedConfig.walletStandard) === null || _b === void 0 ? void 0 : _b.features) === null || _c === void 0 ? void 0 : _c.length);
-        return isAptosWallet && !shouldBeFiltered;
-    })
-        .map(([key, wallet]) => {
-        const { shortName } = wallet;
-        const name = shortName || wallet.name;
-        return class extends InjectedWalletBase.InjectedWalletBase {
-            constructor() {
-                super(...arguments);
-                this.name = name;
-                // This is the key from the wallet book entry so that we don't purely rely on the normalized name
-                this.overrideKey = key;
-            }
-            getProvider() {
-                return this.findProvider();
-            }
-        };
-    });
-    // Get wallet-standard wallets
+    // Get wallet-standard wallets (only installed wallets are discovered)
     const { aptosWallets } = getWalletStandardWallets.getWalletStandardWallets();
+    // Create a map of wallet-standard wallet names for quick lookup
+    const walletStandardWalletNames = new Set(aptosWallets.map((wallet) => wallet.name));
     logger.logVerboseTroubleshootingMessage('[APTOS fetchInjectedWalletConnectors] Found wallet-standard wallets:', aptosWallets.map((w) => ({
         features: Object.keys(w.features),
         name: w.name,
     })));
-    // Create connectors for wallet-standard wallets
+    // Create connectors for installed wallet-standard wallets
     const walletStandardConnectors = aptosWallets
         .filter((wallet) => 
     // Type incompatibility between @wallet-standard versions, casting is safe here
@@ -160,6 +138,46 @@ const fetchInjectedWalletConnectors = ({ walletBook: walletBook$1, }) => {
         // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
         wallet, walletBookMetadata);
     });
+    // Get wallet book connectors for ALL Aptos wallets
+    // This includes:
+    // 1. Traditional wallets (no wallet-standard support)
+    // 2. Wallet-standard wallets that are NOT yet installed (discovered via wallet book)
+    const walletBookConnectors = Object.entries((_a = walletBook$1 === null || walletBook$1 === void 0 ? void 0 : walletBook$1.wallets) !== null && _a !== void 0 ? _a : {})
+        .filter(([key, wallet]) => {
+        var _a, _b;
+        const injectedConfig = (_a = wallet.injectedConfig) === null || _a === void 0 ? void 0 : _a.find((config) => config.chain === 'aptos');
+        const isAptosWallet = Boolean(injectedConfig);
+        // Filter out wallets that require a custom connector
+        const needsCustomConnector = walletsWithCustomConnectors.includes(key);
+        // Filter out wallets that are already discovered via wallet-standard (installed)
+        // We want to show uninstalled wallet-standard wallets from wallet book
+        const walletStandardName = (_b = injectedConfig === null || injectedConfig === void 0 ? void 0 : injectedConfig.walletStandard) === null || _b === void 0 ? void 0 : _b.name;
+        const isAlreadyDiscoveredViaWalletStandard = walletStandardName && walletStandardWalletNames.has(walletStandardName);
+        return (isAptosWallet &&
+            !needsCustomConnector &&
+            !isAlreadyDiscoveredViaWalletStandard);
+    })
+        .map(([key, wallet]) => {
+        const { shortName } = wallet;
+        const name = shortName || wallet.name;
+        // Get wallet metadata from wallet book
+        const walletBookMetadata = walletConnectorCore.getWalletMetadataFromWalletBook({
+            walletBook: walletBook$1,
+            walletBookWallet: wallet,
+            walletKey: key,
+        });
+        return class extends InjectedWalletBase.InjectedWalletBase {
+            constructor(props) {
+                super(name, Object.assign(Object.assign({}, props), { aptosNetworks: props.aptosNetworks, metadata: walletBookMetadata, walletBook: props.walletBook }));
+                this.name = name;
+                // This is the key from the wallet book entry so that we don't purely rely on the normalized name
+                this.overrideKey = key;
+            }
+            getProvider() {
+                return this.findProvider();
+            }
+        };
+    });
     logger.logVerboseTroubleshootingMessage('[APTOS fetchInjectedWalletConnectors] Created wallet-standard connectors:', walletStandardConnectors.map((w) => w.name));
     logger.logVerboseTroubleshootingMessage('[APTOS fetchInjectedWalletConnectors] Created wallet-book connectors:', walletBookConnectors.map((w) => w.name));
     return [

package/src/injected/fetchInjectedWalletConnectors.d.ts

@@ -17,24 +17,27 @@ export declare const injectedWalletOverrides: WalletConnectorConstructor[];
  * Fetches all available injected Aptos wallet connectors.
  *
  * This function discovers and creates wallet connector constructors from two sources:
- * 1. Wallet book entries - Traditional wallets defined in the wallet book
- * 2. Wallet-standard wallets - AIP-62 compliant wallets discovered via wallet-standard
+ * 1. Wallet book entries - All Aptos wallets defined in the wallet book (including uninstalled wallet-standard wallets)
+ * 2. Wallet-standard wallets - AIP-62 compliant wallets discovered via wallet-standard (installed wallets only)
+ *
+ * The function creates connectors for:
+ * - Installed wallet-standard wallets (discovered via wallet-standard)
+ * - Uninstalled wallet-standard wallets (from wallet book, will use wallet-standard when installed)
+ * - Traditional wallets without wallet-standard support (from wallet book)
  *
  * The function automatically filters out wallets that:
  * - Have custom connector implementations
- * - Are already handled by wallet-standard connectors
+ * - Are already discovered via wallet-standard (to avoid duplicates)
  * - Don't support the required Aptos feature set
  *
  * @param options - Configuration options
  * @param options.walletBook - The wallet book schema containing wallet metadata
- * @param options.authMode - The authentication mode for filtering wallet features
  * @returns Array of wallet connector constructor classes
  *
  * @example
  * ```typescript
  * const connectors = fetchInjectedWalletConnectors({
  *   walletBook,
- *   authMode: 'connect-and-sign'
  * });
  *
  * // Instantiate connectors

package/src/injected/fetchInjectedWalletConnectors.js

@@ -73,24 +73,27 @@ const shouldAddWalletStandardConnector = (wallet, walletBook) => {
  * Fetches all available injected Aptos wallet connectors.
  *
  * This function discovers and creates wallet connector constructors from two sources:
- * 1. Wallet book entries - Traditional wallets defined in the wallet book
- * 2. Wallet-standard wallets - AIP-62 compliant wallets discovered via wallet-standard
+ * 1. Wallet book entries - All Aptos wallets defined in the wallet book (including uninstalled wallet-standard wallets)
+ * 2. Wallet-standard wallets - AIP-62 compliant wallets discovered via wallet-standard (installed wallets only)
+ *
+ * The function creates connectors for:
+ * - Installed wallet-standard wallets (discovered via wallet-standard)
+ * - Uninstalled wallet-standard wallets (from wallet book, will use wallet-standard when installed)
+ * - Traditional wallets without wallet-standard support (from wallet book)
  *
  * The function automatically filters out wallets that:
  * - Have custom connector implementations
- * - Are already handled by wallet-standard connectors
+ * - Are already discovered via wallet-standard (to avoid duplicates)
  * - Don't support the required Aptos feature set
  *
  * @param options - Configuration options
  * @param options.walletBook - The wallet book schema containing wallet metadata
- * @param options.authMode - The authentication mode for filtering wallet features
  * @returns Array of wallet connector constructor classes
  *
  * @example
  * ```typescript
  * const connectors = fetchInjectedWalletConnectors({
  *   walletBook,
- *   authMode: 'connect-and-sign'
  * });
  *
  * // Instantiate connectors
@@ -101,40 +104,15 @@ const shouldAddWalletStandardConnector = (wallet, walletBook) => {
  */
 const fetchInjectedWalletConnectors = ({ walletBook, }) => {
     var _a;
-    // Get wallet book connectors for traditional Aptos wallets
-    const walletBookConnectors = Object.entries((_a = walletBook === null || walletBook === void 0 ? void 0 : walletBook.wallets) !== null && _a !== void 0 ? _a : {})
-        .filter(([key, wallet]) => {
-        var _a, _b, _c;
-        const injectedConfig = (_a = wallet.injectedConfig) === null || _a === void 0 ? void 0 : _a.find((config) => config.chain === 'aptos');
-        const isAptosWallet = Boolean(injectedConfig);
-        // Filter out wallets that require a custom connector or wallets that support wallet-standard,
-        // since they are already handled automatically with the wallet-standard connector
-        const shouldBeFiltered = walletsWithCustomConnectors.includes(key) ||
-            ((_c = (_b = injectedConfig === null || injectedConfig === void 0 ? void 0 : injectedConfig.walletStandard) === null || _b === void 0 ? void 0 : _b.features) === null || _c === void 0 ? void 0 : _c.length);
-        return isAptosWallet && !shouldBeFiltered;
-    })
-        .map(([key, wallet]) => {
-        const { shortName } = wallet;
-        const name = shortName || wallet.name;
-        return class extends InjectedWalletBase {
-            constructor() {
-                super(...arguments);
-                this.name = name;
-                // This is the key from the wallet book entry so that we don't purely rely on the normalized name
-                this.overrideKey = key;
-            }
-            getProvider() {
-                return this.findProvider();
-            }
-        };
-    });
-    // Get wallet-standard wallets
+    // Get wallet-standard wallets (only installed wallets are discovered)
     const { aptosWallets } = getWalletStandardWallets();
+    // Create a map of wallet-standard wallet names for quick lookup
+    const walletStandardWalletNames = new Set(aptosWallets.map((wallet) => wallet.name));
     logger.logVerboseTroubleshootingMessage('[APTOS fetchInjectedWalletConnectors] Found wallet-standard wallets:', aptosWallets.map((w) => ({
         features: Object.keys(w.features),
         name: w.name,
     })));
-    // Create connectors for wallet-standard wallets
+    // Create connectors for installed wallet-standard wallets
     const walletStandardConnectors = aptosWallets
         .filter((wallet) => 
     // Type incompatibility between @wallet-standard versions, casting is safe here
@@ -156,6 +134,46 @@ const fetchInjectedWalletConnectors = ({ walletBook, }) => {
         // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
         wallet, walletBookMetadata);
     });
+    // Get wallet book connectors for ALL Aptos wallets
+    // This includes:
+    // 1. Traditional wallets (no wallet-standard support)
+    // 2. Wallet-standard wallets that are NOT yet installed (discovered via wallet book)
+    const walletBookConnectors = Object.entries((_a = walletBook === null || walletBook === void 0 ? void 0 : walletBook.wallets) !== null && _a !== void 0 ? _a : {})
+        .filter(([key, wallet]) => {
+        var _a, _b;
+        const injectedConfig = (_a = wallet.injectedConfig) === null || _a === void 0 ? void 0 : _a.find((config) => config.chain === 'aptos');
+        const isAptosWallet = Boolean(injectedConfig);
+        // Filter out wallets that require a custom connector
+        const needsCustomConnector = walletsWithCustomConnectors.includes(key);
+        // Filter out wallets that are already discovered via wallet-standard (installed)
+        // We want to show uninstalled wallet-standard wallets from wallet book
+        const walletStandardName = (_b = injectedConfig === null || injectedConfig === void 0 ? void 0 : injectedConfig.walletStandard) === null || _b === void 0 ? void 0 : _b.name;
+        const isAlreadyDiscoveredViaWalletStandard = walletStandardName && walletStandardWalletNames.has(walletStandardName);
+        return (isAptosWallet &&
+            !needsCustomConnector &&
+            !isAlreadyDiscoveredViaWalletStandard);
+    })
+        .map(([key, wallet]) => {
+        const { shortName } = wallet;
+        const name = shortName || wallet.name;
+        // Get wallet metadata from wallet book
+        const walletBookMetadata = getWalletMetadataFromWalletBook({
+            walletBook,
+            walletBookWallet: wallet,
+            walletKey: key,
+        });
+        return class extends InjectedWalletBase {
+            constructor(props) {
+                super(name, Object.assign(Object.assign({}, props), { aptosNetworks: props.aptosNetworks, metadata: walletBookMetadata, walletBook: props.walletBook }));
+                this.name = name;
+                // This is the key from the wallet book entry so that we don't purely rely on the normalized name
+                this.overrideKey = key;
+            }
+            getProvider() {
+                return this.findProvider();
+            }
+        };
+    });
     logger.logVerboseTroubleshootingMessage('[APTOS fetchInjectedWalletConnectors] Created wallet-standard connectors:', walletStandardConnectors.map((w) => w.name));
     logger.logVerboseTroubleshootingMessage('[APTOS fetchInjectedWalletConnectors] Created wallet-book connectors:', walletBookConnectors.map((w) => w.name));
     return [

package/src/types.d.ts

@@ -1,5 +1,6 @@
 import type { AccountAuthenticator, AnyRawTransaction } from '@aptos-labs/ts-sdk';
 import type { AccountInfo, AptosSignMessageInput, AptosSignMessageOutput, NetworkInfo, UserResponse } from '@aptos-labs/wallet-standard';
+import { GenericNetwork } from '@dynamic-labs/types';
 import { ProviderCondition } from '@dynamic-labs/wallet-connector-core';
 /**
  * Interface for AIP-62 compliant Aptos wallet providers.
@@ -123,6 +124,8 @@ export interface AptosWalletConnectorProps {
     walletBook: any;
     /** Wallet metadata */
     metadata?: any;
+    /** Aptos networks */
+    aptosNetworks?: GenericNetwork[];
 }
 export type AptosFeatureName = keyof NonNullable<IAptosProvider['features']>;
 export type AptosMethodName = 'connect' | 'disconnect' | 'signTransaction' | 'signMessage' | 'signAndSubmitTransaction' | 'submitTransaction' | 'getNetwork' | 'network' | 'account' | 'onAccountChange' | 'onNetworkChange';

package/src/wallet/AptosWallet.cjs

@@ -57,15 +57,12 @@ class AptosWallet extends walletConnectorCore.Wallet {
                 // Calculate amount with proper decimals (APT has 8 decimals by default)
                 const decimals = (token === null || token === void 0 ? void 0 : token.decimals) || 8;
                 const transferAmount = parseFloat(amount) * Math.pow(10, decimals);
-                // Create the transfer transaction
-                const transaction = yield aptosClient.transferCoinTransaction({
-                    amount: transferAmount,
-                    coinType: token === null || token === void 0 ? void 0 : token.address,
-                    recipient: toAddress,
-                    sender: accountInfo.address, // If undefined, defaults to APT (0x1::aptos_coin::AptosCoin)
-                });
                 // Sign and submit the transaction using the wallet provider
-                const txHash = yield this.signAndSubmitTransaction(transaction);
+                const txHash = yield this.signAndSubmitTransaction({
+                    function: '0x1::coin::transfer',
+                    functionArguments: [toAddress, transferAmount],
+                    typeArguments: ['0x1::aptos_coin::AptosCoin'],
+                });
                 return txHash;
             }
             catch (error) {

package/src/wallet/AptosWallet.d.ts

@@ -1,4 +1,4 @@
-import type { AccountAuthenticator, AnyRawTransaction } from '@aptos-labs/ts-sdk';
+import type { AccountAuthenticator, AnyRawTransaction, InputGenerateTransactionPayloadData } from '@aptos-labs/ts-sdk';
 import { Aptos } from '@aptos-labs/ts-sdk';
 import type { AccountInfo, AptosSignMessageInput, AptosSignMessageOutput, NetworkInfo, UserResponse } from '@aptos-labs/wallet-standard';
 import { Wallet } from '@dynamic-labs/wallet-connector-core';
@@ -70,7 +70,7 @@ export declare class AptosWallet extends Wallet<AptosWalletConnector> {
      * @param transaction - The transaction to sign and submit
      * @returns The transaction hash
      */
-    signAndSubmitTransaction(transaction: AnyRawTransaction): Promise<string>;
+    signAndSubmitTransaction(transaction: InputGenerateTransactionPayloadData): Promise<string>;
     /**
      * Submits a pre-signed transaction to the network.
      *

package/src/wallet/AptosWallet.js

@@ -53,15 +53,12 @@ class AptosWallet extends Wallet {
                 // Calculate amount with proper decimals (APT has 8 decimals by default)
                 const decimals = (token === null || token === void 0 ? void 0 : token.decimals) || 8;
                 const transferAmount = parseFloat(amount) * Math.pow(10, decimals);
-                // Create the transfer transaction
-                const transaction = yield aptosClient.transferCoinTransaction({
-                    amount: transferAmount,
-                    coinType: token === null || token === void 0 ? void 0 : token.address,
-                    recipient: toAddress,
-                    sender: accountInfo.address, // If undefined, defaults to APT (0x1::aptos_coin::AptosCoin)
-                });
                 // Sign and submit the transaction using the wallet provider
-                const txHash = yield this.signAndSubmitTransaction(transaction);
+                const txHash = yield this.signAndSubmitTransaction({
+                    function: '0x1::coin::transfer',
+                    functionArguments: [toAddress, transferAmount],
+                    typeArguments: ['0x1::aptos_coin::AptosCoin'],
+                });
                 return txHash;
             }
             catch (error) {

package/src/wallet/isAptosWallet/index.d.ts

@@ -0,0 +1 @@
+export * from './isAptosWallet';

package/src/wallet/isAptosWallet/isAptosWallet.cjs

@@ -0,0 +1,8 @@
+'use client'
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+const isAptosWallet = (wallet) => wallet.chain === 'APTOS';
+
+exports.isAptosWallet = isAptosWallet;

package/src/wallet/isAptosWallet/isAptosWallet.d.ts

@@ -0,0 +1,3 @@
+import { Wallet } from '@dynamic-labs/wallet-connector-core';
+import { AptosWallet } from '../AptosWallet';
+export declare const isAptosWallet: (wallet: Wallet) => wallet is AptosWallet;

package/src/wallet/isAptosWallet/isAptosWallet.js

@@ -0,0 +1,4 @@
+'use client'
+const isAptosWallet = (wallet) => wallet.chain === 'APTOS';
+
+export { isAptosWallet };

package/src/walletStandard/createAptosSignerFromWalletStandard.cjs

@@ -135,18 +135,27 @@ const createAptosSignerFromWalletStandard = ({ wallet, }) => {
             throw new Error('Sign and submit transaction not implemented by wallet');
         }
         const result = yield signAndSubmitMethod.signAndSubmitTransaction({
-            transaction,
+            payload: transaction,
         });
         return result;
     });
     const onAccountChange = (callback) => {
-        var _a;
-        const onMethod = (_a = features['standard:events']) === null || _a === void 0 ? void 0 : _a.on;
+        var _a, _b;
+        // First, try to use the Aptos-specific onAccountChange feature if available
+        const aptosOnAccountChange = (_a = features['aptos:onAccountChange']) === null || _a === void 0 ? void 0 : _a.onAccountChange;
+        if (aptosOnAccountChange) {
+            logger.debug('[AptosWalletStandardConnector] Using aptos:onAccountChange feature');
+            const unsubscribe = aptosOnAccountChange(callback);
+            // Ensure we return a synchronous unsubscribe function
+            return typeof unsubscribe === 'function' ? unsubscribe : () => { };
+        }
+        // Fall back to standard:events if Aptos-specific feature is not available
+        const onMethod = (_b = features['standard:events']) === null || _b === void 0 ? void 0 : _b.on;
         if (!onMethod) {
             logger.debug('[AptosWalletStandardConnector] Events not implemented by wallet');
             return () => { };
         }
-        logger.debug('[AptosWalletStandardConnector] Setting up account change listener');
+        logger.debug('[AptosWalletStandardConnector] Setting up account change listener via standard:events');
         const wrappedCallback = (prop) => {
             var _a;
             const account = (_a = prop.accounts) === null || _a === void 0 ? void 0 : _a[0];
@@ -164,13 +173,22 @@ const createAptosSignerFromWalletStandard = ({ wallet, }) => {
         return onMethod('change', wrappedCallback);
     };
     const onNetworkChange = (callback) => {
-        var _a;
-        const onMethod = (_a = features['standard:events']) === null || _a === void 0 ? void 0 : _a.on;
+        var _a, _b;
+        // First, try to use the Aptos-specific onNetworkChange feature if available
+        const aptosOnNetworkChange = (_a = features['aptos:onNetworkChange']) === null || _a === void 0 ? void 0 : _a.onNetworkChange;
+        if (aptosOnNetworkChange) {
+            logger.debug('[AptosWalletStandardConnector] Using aptos:onNetworkChange feature');
+            const unsubscribe = aptosOnNetworkChange(callback);
+            // Ensure we return a synchronous unsubscribe function
+            return typeof unsubscribe === 'function' ? unsubscribe : () => { };
+        }
+        // Fall back to standard:events if Aptos-specific feature is not available
+        const onMethod = (_b = features['standard:events']) === null || _b === void 0 ? void 0 : _b.on;
         if (!onMethod) {
             logger.debug('[AptosWalletStandardConnector] Events not implemented by wallet');
             return () => { };
         }
-        logger.debug('[AptosWalletStandardConnector] Setting up network change listener');
+        logger.debug('[AptosWalletStandardConnector] Setting up network change listener via standard:events');
         const wrappedCallback = (prop) => {
             // Network changes might be indicated through feature changes
             // This is wallet-specific and may need adjustment

package/src/walletStandard/createAptosSignerFromWalletStandard.js

@@ -131,18 +131,27 @@ const createAptosSignerFromWalletStandard = ({ wallet, }) => {
             throw new Error('Sign and submit transaction not implemented by wallet');
         }
         const result = yield signAndSubmitMethod.signAndSubmitTransaction({
-            transaction,
+            payload: transaction,
         });
         return result;
     });
     const onAccountChange = (callback) => {
-        var _a;
-        const onMethod = (_a = features['standard:events']) === null || _a === void 0 ? void 0 : _a.on;
+        var _a, _b;
+        // First, try to use the Aptos-specific onAccountChange feature if available
+        const aptosOnAccountChange = (_a = features['aptos:onAccountChange']) === null || _a === void 0 ? void 0 : _a.onAccountChange;
+        if (aptosOnAccountChange) {
+            logger.debug('[AptosWalletStandardConnector] Using aptos:onAccountChange feature');
+            const unsubscribe = aptosOnAccountChange(callback);
+            // Ensure we return a synchronous unsubscribe function
+            return typeof unsubscribe === 'function' ? unsubscribe : () => { };
+        }
+        // Fall back to standard:events if Aptos-specific feature is not available
+        const onMethod = (_b = features['standard:events']) === null || _b === void 0 ? void 0 : _b.on;
         if (!onMethod) {
             logger.debug('[AptosWalletStandardConnector] Events not implemented by wallet');
             return () => { };
         }
-        logger.debug('[AptosWalletStandardConnector] Setting up account change listener');
+        logger.debug('[AptosWalletStandardConnector] Setting up account change listener via standard:events');
         const wrappedCallback = (prop) => {
             var _a;
             const account = (_a = prop.accounts) === null || _a === void 0 ? void 0 : _a[0];
@@ -160,13 +169,22 @@ const createAptosSignerFromWalletStandard = ({ wallet, }) => {
         return onMethod('change', wrappedCallback);
     };
     const onNetworkChange = (callback) => {
-        var _a;
-        const onMethod = (_a = features['standard:events']) === null || _a === void 0 ? void 0 : _a.on;
+        var _a, _b;
+        // First, try to use the Aptos-specific onNetworkChange feature if available
+        const aptosOnNetworkChange = (_a = features['aptos:onNetworkChange']) === null || _a === void 0 ? void 0 : _a.onNetworkChange;
+        if (aptosOnNetworkChange) {
+            logger.debug('[AptosWalletStandardConnector] Using aptos:onNetworkChange feature');
+            const unsubscribe = aptosOnNetworkChange(callback);
+            // Ensure we return a synchronous unsubscribe function
+            return typeof unsubscribe === 'function' ? unsubscribe : () => { };
+        }
+        // Fall back to standard:events if Aptos-specific feature is not available
+        const onMethod = (_b = features['standard:events']) === null || _b === void 0 ? void 0 : _b.on;
         if (!onMethod) {
             logger.debug('[AptosWalletStandardConnector] Events not implemented by wallet');
             return () => { };
         }
-        logger.debug('[AptosWalletStandardConnector] Setting up network change listener');
+        logger.debug('[AptosWalletStandardConnector] Setting up network change listener via standard:events');
         const wrappedCallback = (prop) => {
             // Network changes might be indicated through feature changes
             // This is wallet-specific and may need adjustment