@dynamic-labs/wagmi-connector 1.1.0-alpha.2 → 1.1.0-alpha.3

package/CHANGELOG.md

@@ -1,4 +1,19 @@
 
+## [1.1.0-alpha.3](https://github.com/dynamic-labs/DynamicAuth/compare/v1.1.0-alpha.2...v1.1.0-alpha.3) (2023-12-19)
+
+
+### Features
+
+* add Flow support in magic wallet connector  ([#4158](https://github.com/dynamic-labs/DynamicAuth/issues/4158)) ([fbbaea7](https://github.com/dynamic-labs/DynamicAuth/commit/fbbaea76b36ceb693f6bd4f2404dfa1204e61492))
+* add showDynamicUserProfile to DynamicContext ([#4214](https://github.com/dynamic-labs/DynamicAuth/issues/4214)) ([2aeb8e3](https://github.com/dynamic-labs/DynamicAuth/commit/2aeb8e3c45a3d9f87bd9196ea9b46927e02eb633))
+
+
+### Bug Fixes
+
+* add shortname to braveevm to allow for lookups by name as well as key ([#4213](https://github.com/dynamic-labs/DynamicAuth/issues/4213)) ([969b089](https://github.com/dynamic-labs/DynamicAuth/commit/969b089be516fb57fcdc941f908c078998eb4ec0))
+* solflare connect ([#4215](https://github.com/dynamic-labs/DynamicAuth/issues/4215)) ([9a4164e](https://github.com/dynamic-labs/DynamicAuth/commit/9a4164e53198f33ef7201cd4e1eff745a09e9701))
+* wagmi attempt to connect to primary wallet first ([#4206](https://github.com/dynamic-labs/DynamicAuth/issues/4206)) ([9e5fc8e](https://github.com/dynamic-labs/DynamicAuth/commit/9e5fc8ef026628935ac32d3bb0c22bda35057e5d))
+
 ## [1.1.0-alpha.2](https://github.com/dynamic-labs/DynamicAuth/compare/v1.1.0-alpha.1...v1.1.0-alpha.2) (2023-12-18)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dynamic-labs/wagmi-connector",
-  "version": "1.1.0-alpha.2",
+  "version": "1.1.0-alpha.3",
   "repository": {
     "type": "git",
     "url": "https://github.com/dynamic-labs/DynamicAuth.git",
@@ -10,10 +10,10 @@
     "react": "^17.0.2 || ^18.0.0",
     "viem": "^1.19.13",
     "wagmi": "^1.4.12",
-    "@dynamic-labs/rpc-providers": "1.1.0-alpha.2",
-    "@dynamic-labs/sdk-react-core": "1.1.0-alpha.2",
-    "@dynamic-labs/types": "1.1.0-alpha.2",
-    "@dynamic-labs/wallet-connector-core": "1.1.0-alpha.2",
+    "@dynamic-labs/rpc-providers": "1.1.0-alpha.3",
+    "@dynamic-labs/sdk-react-core": "1.1.0-alpha.3",
+    "@dynamic-labs/types": "1.1.0-alpha.3",
+    "@dynamic-labs/wallet-connector-core": "1.1.0-alpha.3",
     "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';