@ant-design/web3-wagmi 2.8.0 → 2.9.0

package/CHANGELOG.md

@@ -1,5 +1,19 @@
 # @ant-design/web3-wagmi
 
+## 2.9.0
+
+### Minor Changes
+
+- c32f8e2: feat: support useWalletConnectOfficialModal for wagmi provider and add customQrCodePanel for wallet
+- 613b265: feat: add addresses when multi address connected in onConnected
+
+### Patch Changes
+
+- Updated dependencies [c32f8e2]
+- Updated dependencies [613b265]
+  - @ant-design/web3-common@1.14.0
+  - @ant-design/web3-assets@1.11.1
+
 ## 2.8.0
 
 ### Minor Changes

package/dist/esm/interface.d.ts

@@ -5,10 +5,13 @@ export interface WalletUseInWagmiAdapter extends Wallet {
     getWagmiConnector?: (options?: ConnectOptions) => Promise<Connector | undefined>;
 }
 export type EthereumWallet = (metadata?: Partial<WalletMetadata>) => WalletFactory;
+export interface CreateWalletOptions {
+    useWalletConnectOfficialModal?: boolean;
+}
 export interface WalletFactory {
     name?: string;
     connectors: Connector['name'][];
-    create: (connector?: readonly Connector[]) => WalletUseInWagmiAdapter;
+    create: (connector?: readonly Connector[], options?: CreateWalletOptions) => WalletUseInWagmiAdapter;
     createWagmiConnector?: () => CreateConnectorFn;
 }
 export type EIP6963Config = boolean | UniversalEIP6963Config;

package/dist/esm/wagmi-provider/config-provider.d.ts

@@ -11,5 +11,6 @@ export interface AntDesignWeb3ConfigProviderProps {
     balance?: boolean;
     eip6963?: EIP6963Config;
     wagimConfig: WagmiConfig;
+    useWalletConnectOfficialModal?: boolean;
 }
 export declare const AntDesignWeb3ConfigProvider: React.FC<AntDesignWeb3ConfigProviderProps>;

package/dist/esm/wagmi-provider/config-provider.js

@@ -15,7 +15,8 @@ export const AntDesignWeb3ConfigProvider = props => {
     balance,
     locale,
     eip6963,
-    wagimConfig
+    wagimConfig,
+    useWalletConnectOfficialModal
   } = props;
   const {
     address,
@@ -68,7 +69,9 @@ export const AntDesignWeb3ConfigProvider = props => {
         // check is need auto add eip6963 wallet
         if (typeof eip6963 === 'object' && eip6963?.autoAddInjectedWallets && !walletFactories.find(item => item.connectors.some(aName => isConnectorNameMatch(aName, connector.name)))) {
           // not config wallet and find the wallet in connectors, auto add it
-          autoAddEIP6963Wallets.push(EIP6963Wallet().create([connector]));
+          autoAddEIP6963Wallets.push(EIP6963Wallet().create([connector], {
+            useWalletConnectOfficialModal
+          }));
         }
         // Do not need check eip6963 wallet
         return;
@@ -88,7 +91,9 @@ export const AntDesignWeb3ConfigProvider = props => {
         console.error(`Can not find connector for ${factory.connectors.join(',')}, ignore the wallet. Please config connectors or add eip6963 config in WagmiWeb3ConfigProvider.`);
         return null;
       }
-      return factory.create(connectors);
+      return factory.create(connectors, {
+        useWalletConnectOfficialModal
+      });
     }).filter(item => item !== null);
     return [...supportWallets, ...autoAddEIP6963Wallets];
   }, [wagimConfig.connectors, walletFactories, eip6963]);
@@ -157,7 +162,8 @@ export const AntDesignWeb3ConfigProvider = props => {
         chainId: currentChain?.id
       });
       return {
-        address: accounts?.[0]
+        address: accounts?.[0],
+        addresses: accounts
       };
     },
     disconnect: async () => {

package/dist/esm/wagmi-provider/index.js

@@ -89,6 +89,7 @@ export function WagmiWeb3ConfigProvider({
         balance: balance,
         eip6963: eip6963,
         wagimConfig: wagmiConfig,
+        useWalletConnectOfficialModal: typeof walletConnect === 'object' && walletConnect?.useWalletConnectOfficialModal,
         children: children
       })
     })

package/dist/esm/wallets/universal-wallet.d.ts

@@ -1,11 +1,11 @@
 import type { WalletMetadata } from '@ant-design/web3-common';
 import type { Connector, CreateConnectorFn } from 'wagmi';
-import type { WalletFactory, WalletUseInWagmiAdapter } from '../interface';
+import type { CreateWalletOptions, WalletFactory, WalletUseInWagmiAdapter } from '../interface';
 export declare class UniversalWallet implements WalletFactory {
     private wallet;
     name?: string;
     createWagmiConnector?: () => CreateConnectorFn;
     connectors: string[];
     constructor(wallet: WalletMetadata, createWagmiConnector?: () => CreateConnectorFn);
-    create: (connectors?: readonly Connector[]) => WalletUseInWagmiAdapter;
+    create: (connectors?: readonly Connector[], options?: CreateWalletOptions) => WalletUseInWagmiAdapter;
 }

package/dist/esm/wallets/universal-wallet.js

@@ -16,7 +16,7 @@ export class UniversalWallet {
       this.connectors.push('WalletConnect');
     }
   }
-  create = connectors => {
+  create = (connectors, options) => {
     const walletConnector = connectors?.find(item => item.name === 'WalletConnect');
     const injectedConnector = connectors?.find(item => item.name === this.wallet.name);
     let qrCodeUri = undefined;
@@ -43,8 +43,8 @@ export class UniversalWallet {
     };
     return {
       ...this.wallet,
-      getWagmiConnector: async options => {
-        if (options?.connectType === 'qrCode') {
+      getWagmiConnector: async connectOptions => {
+        if (connectOptions?.connectType === 'qrCode') {
           return walletConnector;
         }
         if (await hasExtensionInstalled()) {
@@ -59,6 +59,7 @@ export class UniversalWallet {
         const installed = await hasExtensionInstalled();
         return !!(installed || walletConnector);
       },
+      customQrCodePanel: options?.useWalletConnectOfficialModal,
       getQrCode: walletConnector ? getQrCode : undefined
     };
   };

package/dist/esm/wallets/wallet-connect.js

@@ -6,7 +6,7 @@ export const WalletConnect = metadata => {
   } = metadata || {};
   return {
     connectors: ['WalletConnect'],
-    create: connectors => {
+    create: (connectors, options = {}) => {
       let qrCodeUri = undefined;
       const getQrCode = async () => {
         const provider = await connectors?.[0]?.getProvider();
@@ -33,7 +33,8 @@ export const WalletConnect = metadata => {
         hasWalletReady: async () => {
           return true;
         },
-        getQrCode: useWalletConnectOfficialModal ? undefined : getQrCode,
+        getQrCode: getQrCode,
+        customQrCodePanel: useWalletConnectOfficialModal || options.useWalletConnectOfficialModal,
         ...rest
       };
     }

package/dist/lib/interface.d.ts

@@ -5,10 +5,13 @@ export interface WalletUseInWagmiAdapter extends Wallet {
     getWagmiConnector?: (options?: ConnectOptions) => Promise<Connector | undefined>;
 }
 export type EthereumWallet = (metadata?: Partial<WalletMetadata>) => WalletFactory;
+export interface CreateWalletOptions {
+    useWalletConnectOfficialModal?: boolean;
+}
 export interface WalletFactory {
     name?: string;
     connectors: Connector['name'][];
-    create: (connector?: readonly Connector[]) => WalletUseInWagmiAdapter;
+    create: (connector?: readonly Connector[], options?: CreateWalletOptions) => WalletUseInWagmiAdapter;
     createWagmiConnector?: () => CreateConnectorFn;
 }
 export type EIP6963Config = boolean | UniversalEIP6963Config;

package/dist/lib/wagmi-provider/config-provider.d.ts

@@ -11,5 +11,6 @@ export interface AntDesignWeb3ConfigProviderProps {
     balance?: boolean;
     eip6963?: EIP6963Config;
     wagimConfig: WagmiConfig;
+    useWalletConnectOfficialModal?: boolean;
 }
 export declare const AntDesignWeb3ConfigProvider: React.FC<AntDesignWeb3ConfigProviderProps>;

package/dist/lib/wagmi-provider/config-provider.js

@@ -22,7 +22,8 @@ const AntDesignWeb3ConfigProvider = props => {
     balance,
     locale,
     eip6963,
-    wagimConfig
+    wagimConfig,
+    useWalletConnectOfficialModal
   } = props;
   const {
     address,
@@ -75,7 +76,9 @@ const AntDesignWeb3ConfigProvider = props => {
         // check is need auto add eip6963 wallet
         if (typeof eip6963 === 'object' && eip6963?.autoAddInjectedWallets && !walletFactories.find(item => item.connectors.some(aName => isConnectorNameMatch(aName, connector.name)))) {
           // not config wallet and find the wallet in connectors, auto add it
-          autoAddEIP6963Wallets.push((0, _eip.EIP6963Wallet)().create([connector]));
+          autoAddEIP6963Wallets.push((0, _eip.EIP6963Wallet)().create([connector], {
+            useWalletConnectOfficialModal
+          }));
         }
         // Do not need check eip6963 wallet
         return;
@@ -95,7 +98,9 @@ const AntDesignWeb3ConfigProvider = props => {
         console.error(`Can not find connector for ${factory.connectors.join(',')}, ignore the wallet. Please config connectors or add eip6963 config in WagmiWeb3ConfigProvider.`);
         return null;
       }
-      return factory.create(connectors);
+      return factory.create(connectors, {
+        useWalletConnectOfficialModal
+      });
     }).filter(item => item !== null);
     return [...supportWallets, ...autoAddEIP6963Wallets];
   }, [wagimConfig.connectors, walletFactories, eip6963]);
@@ -164,7 +169,8 @@ const AntDesignWeb3ConfigProvider = props => {
         chainId: currentChain?.id
       });
       return {
-        address: accounts?.[0]
+        address: accounts?.[0],
+        addresses: accounts
       };
     },
     disconnect: async () => {

package/dist/lib/wagmi-provider/index.js

@@ -97,6 +97,7 @@ function WagmiWeb3ConfigProvider({
         balance: balance,
         eip6963: eip6963,
         wagimConfig: wagmiConfig,
+        useWalletConnectOfficialModal: typeof walletConnect === 'object' && walletConnect?.useWalletConnectOfficialModal,
         children: children
       })
     })

package/dist/lib/wallets/universal-wallet.d.ts

@@ -1,11 +1,11 @@
 import type { WalletMetadata } from '@ant-design/web3-common';
 import type { Connector, CreateConnectorFn } from 'wagmi';
-import type { WalletFactory, WalletUseInWagmiAdapter } from '../interface';
+import type { CreateWalletOptions, WalletFactory, WalletUseInWagmiAdapter } from '../interface';
 export declare class UniversalWallet implements WalletFactory {
     private wallet;
     name?: string;
     createWagmiConnector?: () => CreateConnectorFn;
     connectors: string[];
     constructor(wallet: WalletMetadata, createWagmiConnector?: () => CreateConnectorFn);
-    create: (connectors?: readonly Connector[]) => WalletUseInWagmiAdapter;
+    create: (connectors?: readonly Connector[], options?: CreateWalletOptions) => WalletUseInWagmiAdapter;
 }

package/dist/lib/wallets/universal-wallet.js

@@ -22,7 +22,7 @@ class UniversalWallet {
       this.connectors.push('WalletConnect');
     }
   }
-  create = connectors => {
+  create = (connectors, options) => {
     const walletConnector = connectors?.find(item => item.name === 'WalletConnect');
     const injectedConnector = connectors?.find(item => item.name === this.wallet.name);
     let qrCodeUri = undefined;
@@ -49,8 +49,8 @@ class UniversalWallet {
     };
     return {
       ...this.wallet,
-      getWagmiConnector: async options => {
-        if (options?.connectType === 'qrCode') {
+      getWagmiConnector: async connectOptions => {
+        if (connectOptions?.connectType === 'qrCode') {
           return walletConnector;
         }
         if (await hasExtensionInstalled()) {
@@ -65,6 +65,7 @@ class UniversalWallet {
         const installed = await hasExtensionInstalled();
         return !!(installed || walletConnector);
       },
+      customQrCodePanel: options?.useWalletConnectOfficialModal,
       getQrCode: walletConnector ? getQrCode : undefined
     };
   };

package/dist/lib/wallets/wallet-connect.js

@@ -12,7 +12,7 @@ const WalletConnect = metadata => {
   } = metadata || {};
   return {
     connectors: ['WalletConnect'],
-    create: connectors => {
+    create: (connectors, options = {}) => {
       let qrCodeUri = undefined;
       const getQrCode = async () => {
         const provider = await connectors?.[0]?.getProvider();
@@ -39,7 +39,8 @@ const WalletConnect = metadata => {
         hasWalletReady: async () => {
           return true;
         },
-        getQrCode: useWalletConnectOfficialModal ? undefined : getQrCode,
+        getQrCode: getQrCode,
+        customQrCodePanel: useWalletConnectOfficialModal || options.useWalletConnectOfficialModal,
         ...rest
       };
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ant-design/web3-wagmi",
-  "version": "2.8.0",
+  "version": "2.9.0",
   "type": "module",
   "main": "dist/esm/index.js",
   "module": "dist/esm/index.js",
@@ -38,8 +38,8 @@
   },
   "dependencies": {
     "debug": "^4.3.5",
-    "@ant-design/web3-assets": "1.11.0",
-    "@ant-design/web3-common": "1.13.0"
+    "@ant-design/web3-common": "1.14.0",
+    "@ant-design/web3-assets": "1.11.1"
   },
   "devDependencies": {
     "@types/debug": "^4.1.12",
@@ -47,7 +47,7 @@
     "typescript": "^5.5.4",
     "wagmi": "^2.10.9",
     "@tanstack/react-query": "^5.51.11",
-    "viem": "^2.16.5"
+    "viem": "^2.21.3"
   },
   "peerDependencies": {
     "wagmi": "^2.10.9",