@dynamic-labs/wagmi-connector 3.0.0-alpha.3 → 3.0.0-alpha.31

package/src/lib/Connector.js

@@ -3,18 +3,18 @@ import { __awaiter } from '../../_virtual/_tslib.js';
 import { createConnector } from '@wagmi/core';
 import { getAddress, createWalletClient, custom } from 'viem';
 
-const getCreateConnectorFn = (parameters) => createConnector((config) => ({
+const getCreateConnectorFn = ({ connectorId, wallet, preventWagmiSyncFromCallingLogout, handleLogOut, }) => createConnector((config) => ({
     connect() {
         return __awaiter(this, void 0, void 0, function* () {
-            if (!parameters.walletConnector) {
+            if (!wallet.connector) {
                 throw new Error('WalletConnector is not defined');
             }
-            parameters.walletConnector.on('accountChange', ({ accounts }) => {
+            wallet.connector.on('accountChange', ({ accounts }) => {
                 const handler = this.onAccountsChanged.bind(this);
                 handler(accounts);
             });
-            parameters.walletConnector.on('chainChange', ({ chain }) => this.onChainChanged(chain));
-            parameters.walletConnector.on('disconnect', this.onDisconnect.bind(this));
+            wallet.connector.on('chainChange', ({ chain }) => this.onChainChanged(chain));
+            wallet.connector.on('disconnect', this.onDisconnect.bind(this));
             const accounts = yield this.getAccounts();
             return {
                 accounts,
@@ -24,38 +24,30 @@ const getCreateConnectorFn = (parameters) => createConnector((config) => ({
     },
     disconnect() {
         return __awaiter(this, void 0, void 0, function* () {
-            if (!parameters.preventWagmiSyncFromCallingLogout.current) {
-                yield parameters.walletConnector.endSession();
-                yield parameters.handleLogOut();
+            if (!preventWagmiSyncFromCallingLogout.current) {
+                yield wallet.connector.endSession();
+                yield handleLogOut();
             }
-            parameters.walletConnector.off('accountChange');
-            parameters.walletConnector.off('chainChange');
-            parameters.walletConnector.off('disconnect');
+            wallet.connector.off('accountChange');
+            wallet.connector.off('chainChange');
+            wallet.connector.off('disconnect');
             /**
              * In our own Dynamic Wagmi sync component, we will flip the flag to true before calling disconnect,
              * and here it automatically flips back to false afterwards. This will prevent the Connector from
              * calling handleLogOut when we are the ones calling disconnect, but will preserve the existing behavior
              * for customers who use useDisconnect directly.
              */
-            parameters.preventWagmiSyncFromCallingLogout.current = false;
+            preventWagmiSyncFromCallingLogout.current = false;
         });
     },
     getAccounts() {
         return __awaiter(this, void 0, void 0, function* () {
-            var _a;
-            const address = yield ((_a = parameters.walletConnector) === null || _a === void 0 ? void 0 : _a.getAddress());
-            if (!address) {
-                throw new Error('Not connected');
-            }
-            return [getAddress(address)];
+            return [getAddress(wallet.address)];
         });
     },
     getChainId() {
         return __awaiter(this, void 0, void 0, function* () {
-            if (!parameters.walletConnector) {
-                throw new Error('WalletConnector is not defined');
-            }
-            const network = yield parameters.walletConnector.getNetwork();
+            const network = yield wallet.getNetwork();
             if (!network) {
                 throw new Error('Network is not defined');
             }
@@ -65,7 +57,7 @@ const getCreateConnectorFn = (parameters) => createConnector((config) => ({
     getClient(args) {
         return __awaiter(this, void 0, void 0, function* () {
             var _a, _b;
-            const signer = yield parameters.walletConnector.getSigner();
+            const signer = yield wallet.getSigner();
             if (signer.account && signer.chain) {
                 return signer;
             }
@@ -79,15 +71,14 @@ const getCreateConnectorFn = (parameters) => createConnector((config) => ({
     },
     getProvider() {
         return __awaiter(this, void 0, void 0, function* () {
-            var _a;
-            return (_a = parameters.walletConnector) === null || _a === void 0 ? void 0 : _a.getWalletClient();
+            return wallet.getWalletClient();
         });
     },
-    id: parameters.connectorId,
+    id: connectorId,
     isAuthorized() {
         return __awaiter(this, void 0, void 0, function* () {
             var _a, _b;
-            const accounts = (_b = (yield ((_a = parameters.walletConnector) === null || _a === void 0 ? void 0 : _a.getConnectedAccounts()))) !== null && _b !== void 0 ? _b : [];
+            const accounts = (_b = (yield ((_a = wallet.connector) === null || _a === void 0 ? void 0 : _a.getConnectedAccounts()))) !== null && _b !== void 0 ? _b : [];
             return accounts.length > 0;
         });
     },
@@ -105,14 +96,11 @@ const getCreateConnectorFn = (parameters) => createConnector((config) => ({
     onDisconnect() { },
     switchChain(_a) {
         return __awaiter(this, arguments, void 0, function* ({ chainId }) {
-            var _b;
             const chain = config.chains.find((x) => x.id === chainId);
             if (!chain) {
                 throw new Error(`Chain ${chainId} is not supported`);
             }
-            yield ((_b = parameters.walletConnector) === null || _b === void 0 ? void 0 : _b.switchNetwork({
-                networkChainId: chainId,
-            }));
+            yield wallet.switchNetwork(chainId);
             return chain;
         });
     },

package/src/lib/DynamicWagmiConnector.js

@@ -15,7 +15,7 @@ const DynamicWagmiConnectorInner = ({ suppressChainMismatchError = false, childr
     const { handleLogOut, primaryWallet } = useDynamicContext();
     const wallets = useUserWallets();
     useChainMismatchLogger({ throwOnMismatch: !suppressChainMismatchError });
-    const evmWallet = useFindEvmWallet(primaryWallet, wallets);
+    const evmWallet = useFindEvmWallet(primaryWallet);
     const getConnectorId = useConnectorId();
     /**
      * This will prevent the wagmi Connector from calling handleLogOut when we are the ones calling disconnect
@@ -31,7 +31,7 @@ const DynamicWagmiConnectorInner = ({ suppressChainMismatchError = false, childr
             connectorId,
             handleLogOut,
             preventWagmiSyncFromCallingLogout,
-            walletConnector: evmWallet.connector,
+            wallet: evmWallet,
         }));
     }, [config._internal.connectors, getConnectorId, handleLogOut, evmWallet]);
     /**

package/src/lib/hooks/useFindEvmWallet/useFindEvmWallet.d.ts

@@ -1,2 +1,2 @@
 import { Wallet } from '@dynamic-labs/sdk-react-core';
-export declare const useFindEvmWallet: (primaryWallet: Wallet | null, wallets: Wallet[]) => Wallet | undefined;
+export declare const useFindEvmWallet: (primaryWallet: Wallet | null) => Wallet | undefined;

package/src/lib/hooks/useFindEvmWallet/useFindEvmWallet.js

@@ -1,22 +1,26 @@
 'use client'
+import { __awaiter } from '../../../../_virtual/_tslib.js';
+import { useState, useEffect } from 'react';
+
 const isEvmWallet = (wallet) => wallet.connector.connectedChain === 'EVM';
-const isWalletConnected = (wallet) => wallet.connected;
-const useFindEvmWallet = (primaryWallet, wallets) => {
-    /**
-     * If the primary wallet is an EVM wallet and is connected, return it.
-     */
-    if (primaryWallet &&
-        isEvmWallet(primaryWallet) &&
-        isWalletConnected(primaryWallet)) {
-        return primaryWallet;
-    }
-    /**
-     * If the primary wallet is not connected, find the first connected EVM wallet.
-     */
-    const connectedEvmWallets = wallets
-        .filter(isEvmWallet)
-        .filter(isWalletConnected);
-    return connectedEvmWallets[0];
+const useFindEvmWallet = (primaryWallet) => {
+    const [wallet, setWallet] = useState(undefined);
+    const checkForConnectedEvmWallet = (wallet) => __awaiter(void 0, void 0, void 0, function* () {
+        if (!isEvmWallet(wallet)) {
+            return;
+        }
+        const isConnected = yield wallet.isConnected();
+        if (isConnected) {
+            setWallet(wallet);
+        }
+    });
+    useEffect(() => {
+        if (!primaryWallet) {
+            return;
+        }
+        checkForConnectedEvmWallet(primaryWallet);
+    }, [primaryWallet]);
+    return wallet;
 };
 
 export { useFindEvmWallet };