@dynamic-labs/wagmi-connector 1.0.0 → 1.0.2

package/CHANGELOG.md

@@ -1,4 +1,21 @@
 
+### [1.0.2](https://github.com/dynamic-labs/DynamicAuth/compare/v1.0.1...v1.0.2) (2023-12-18)
+
+
+### Bug Fixes
+
+* prevent duplicated brave wallet connector ([#4209](https://github.com/dynamic-labs/DynamicAuth/issues/4209)) ([31589b9](https://github.com/dynamic-labs/DynamicAuth/commit/31589b92ea067a5e7ca5a5bd9adb881d086d7868))
+* ensure wagmi connects to primary wallet ([#4206](https://github.com/dynamic-labs/DynamicAuth/issues/4206)) ([#4210](https://github.com/dynamic-labs/DynamicAuth/issues/4210)) ([072bb05](https://github.com/dynamic-labs/DynamicAuth/commit/072bb05a5a9fd5b82f5498c20ff74ca966f3ea9f))
+* ensure wallets group view shows multiple options ([#4184](https://github.com/dynamic-labs/DynamicAuth/issues/4184)) ([#4187](https://github.com/dynamic-labs/DynamicAuth/issues/4187)) ([b751f49](https://github.com/dynamic-labs/DynamicAuth/commit/b751f4952ea5a46b536edc999f37ea134348f8ef)), closes [#4186](https://github.com/dynamic-labs/DynamicAuth/issues/4186)
+* enable brave to read the connected network ([#4198](https://github.com/dynamic-labs/DynamicAuth/issues/4198)) ([979e866](https://github.com/dynamic-labs/DynamicAuth/commit/979e86660f13982992cd43b1d9a8218150437e8b))
+
+### [1.0.1](https://github.com/dynamic-labs/DynamicAuth/compare/v1.0.0...v1.0.1) (2023-12-14)
+
+
+### Bug Fixes
+
+* update wagmi to v1.4.12 ([#4171](https://github.com/dynamic-labs/DynamicAuth/issues/4171)) ([a741989](https://github.com/dynamic-labs/DynamicAuth/commit/a74198978f4708e96b12743b2f1f372b23940020))
+
 ## [1.0.0](https://github.com/dynamic-labs/DynamicAuth/compare/v1.0.0-alpha.14...v1.0.0) (2023-12-12)
 
 Changelog: https://docs.dynamic.xyz/changelog/v1

package/package.json

@@ -1,20 +1,19 @@
 {
   "name": "@dynamic-labs/wagmi-connector",
-  "version": "1.0.0",
+  "version": "1.0.2",
   "repository": {
     "type": "git",
     "url": "https://github.com/dynamic-labs/DynamicAuth.git",
     "directory": "packages/wagmi-connector"
   },
   "peerDependencies": {
-    "@wagmi/core": "^1.3.0",
     "react": "^17.0.2 || ^18.0.0",
     "viem": "^1.1.0",
-    "wagmi": "^1.2.0",
-    "@dynamic-labs/rpc-providers": "1.0.0",
-    "@dynamic-labs/sdk-react-core": "1.0.0",
-    "@dynamic-labs/types": "1.0.0",
-    "@dynamic-labs/wallet-connector-core": "1.0.0",
+    "wagmi": "^1.4.12",
+    "@dynamic-labs/rpc-providers": "1.0.2",
+    "@dynamic-labs/sdk-react-core": "1.0.2",
+    "@dynamic-labs/types": "1.0.2",
+    "@dynamic-labs/wallet-connector-core": "1.0.2",
     "eventemitter3": "5.0.1"
   },
   "license": "MIT",

package/src/lib/DynamicWagmiConnector.js

@@ -1,4 +1,4 @@
-import React, { useRef, useEffect, useMemo } from 'react';
+import React, { useRef, useMemo, useEffect } from 'react';
 import { configureChains, mainnet, createConfig, WagmiConfig } from 'wagmi';
 import { publicProvider } from 'wagmi/providers/public';
 import { useDynamicContext, useUserWallets } from '@dynamic-labs/sdk-react-core';
@@ -7,6 +7,7 @@ import { getConnector } from './getConnector.js';
 import { getWagmiChainsFromDynamicChains } from './getWagmiChainsFromDynamicChains.js';
 import { getWagmiProvidersFromDynamicChains } from './getWagmiProvidersFromDynamicChains.js';
 import { SyncDynamicWagmi } from './SyncDynamicWagmi.js';
+import { findAndOrderEvmWallets } from './utils/findAndOrderEvmWallets/findAndOrderEvmWallets.js';
 
 const { publicClient } = configureChains([mainnet], [publicProvider()]);
 const config = createConfig({
@@ -14,13 +15,15 @@ const config = createConfig({
     publicClient,
 });
 const DynamicWagmiConnector = ({ evmNetworks: customerSuppliedEvmNetworks, children, }) => {
-    const { networkConfigurations, handleLogOut, sendWagmiSettings } = useDynamicContext();
+    const { networkConfigurations, handleLogOut, sendWagmiSettings, primaryWallet, } = useDynamicContext();
     /**
      * This will prevent the wagmi Connector from calling handleLogOut when we are the ones calling disconnect
      * as a result of a handleLogOut call (see SyncDynamicWagmi), but will preserve the existing behavior for customers.
      */
     const preventWagmiSyncFromCallingLogout = useRef(false);
-    const wallets = useUserWallets();
+    // Sort places the primary wallet as the first wallet to attempt to connect with
+    const wallets = useUserWallets().sort((wallet) => wallet.address === (primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.address) ? -1 : 1);
+    const evmWallets = useMemo(() => findAndOrderEvmWallets(primaryWallet, wallets), [primaryWallet, wallets]);
     useEffect(() => {
         // only send wagmi settings once, when the first time DynamicWagmiConnector renders
         sendWagmiSettings({
@@ -38,12 +41,12 @@ const DynamicWagmiConnector = ({ evmNetworks: customerSuppliedEvmNetworks, child
         const mappedProviders = getWagmiProvidersFromDynamicChains(evmNetworks);
         return configureChains(mappedChains, mappedProviders);
     }, [customerSuppliedEvmNetworks, networkConfigurations === null || networkConfigurations === void 0 ? void 0 : networkConfigurations.evm]);
-    const connector = useMemo(() => getConnector(wallets, (wallet) => new Connector({
+    const connector = useMemo(() => getConnector(evmWallets, (wallet) => new Connector({
         chains,
         handleLogOut,
         preventWagmiSyncFromCallingLogout,
         walletConnector: wallet.connector,
-    })), [wallets, chains, handleLogOut, preventWagmiSyncFromCallingLogout]);
+    })), [evmWallets, chains, handleLogOut, preventWagmiSyncFromCallingLogout]);
     /**
      * Updating the wagmi config must be done in a useEffect because
      * when setting the public client and connectors, wagmi will fire

package/src/lib/utils/findAndOrderEvmWallets/findAndOrderEvmWallets.d.ts

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

package/src/lib/utils/findAndOrderEvmWallets/findAndOrderEvmWallets.js

@@ -0,0 +1,13 @@
+const evmWalletsFilter = (wallet) => wallet.connector.connectedChain === 'EVM';
+const findAndOrderEvmWallets = (primaryWallet, wallets) => {
+    const isPrimaryWalletEvm = (primaryWallet === null || primaryWallet === void 0 ? void 0 : primaryWallet.connector.connectedChain) === 'EVM';
+    if (isPrimaryWalletEvm) {
+        const secondaryEvmWallets = wallets
+            .filter(evmWalletsFilter)
+            .filter((wallet) => wallet.address !== primaryWallet.address);
+        return [primaryWallet, ...secondaryEvmWallets];
+    }
+    return wallets.filter(evmWalletsFilter);
+};
+
+export { findAndOrderEvmWallets };

package/src/lib/utils/findAndOrderEvmWallets/index.d.ts

@@ -0,0 +1 @@
+export { findAndOrderEvmWallets } from './findAndOrderEvmWallets';

package/src/lib/utils/index.d.ts

@@ -1 +1,2 @@
 export * from './resolveRpcUrlFromEvmNetworks';
+export * from './findAndOrderEvmWallets';