refactor: remove useless proxyConnectorName (#921)

* refactor: remove useless proxyConnectorName * chore: add changelog --------- Co-authored-by: tingzhao.ytz <tingzhao.ytz@antgroup.com>
ant-design · May 31, 2024 · 6511134 · 6511134
1 parent d3034bd
commit 6511134
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 13 deletions.
diff --git a/.changeset/silly-schools-return.md b/.changeset/silly-schools-return.md
@@ -0,0 +1,8 @@
+---
+'@ant-design/web3-assets': patch
+'@ant-design/web3-common': patch
+'@ant-design/web3-wagmi': patch
+'@ant-design/web3': patch
+---
+
+refactor: remove useless proxyConnectorName
diff --git a/packages/assets/src/wallets/mobile-wallet.tsx b/packages/assets/src/wallets/mobile-wallet.tsx
@@ -8,5 +8,4 @@ export const metadata_MobileConnect: WalletMetadata = {
   universalProtocol: {
     link: 'https://walletconnect.com/',
   },
-  proxyConnectorName: 'WalletConnect',
 };
diff --git a/packages/common/src/types.ts b/packages/common/src/types.ts
@@ -195,12 +195,6 @@ export type WalletMetadata = {
   universalProtocol?: {
     link: string;
   };
-
-  /**
-   * @desc 代理连接使用的名称
-   * @descEn The name used for proxy connection
-   */
-  proxyConnectorName?: string;
 };
 
 export type Balance = BalanceMetadata & {

diff --git a/packages/wagmi/src/wagmi-provider/config-provider.tsx b/packages/wagmi/src/wagmi-provider/config-provider.tsx
@@ -204,7 +204,7 @@ export const AntDesignWeb3ConfigProvider: React.FC<AntDesignWeb3ConfigProviderPr
       connect={async (wallet, options) => {
         let connector = await (wallet as WalletUseInWagmiAdapter)?.getWagmiConnector?.(options);
         if (!connector && wallet) {
-          connector = findConnectorByName(wallet?.proxyConnectorName ?? wallet.name);
+          connector = findConnectorByName(wallet.name);
         }
         if (!connector) {
           throw new Error(`Can not find connector for ${wallet?.name}`);

diff --git a/packages/wagmi/src/wallets/wallet-connect.ts b/packages/wagmi/src/wallets/wallet-connect.ts
@@ -1,8 +1,8 @@
 import { metadata_WalletConnect } from '@ant-design/web3-assets';
-import type { Wallet, WalletMetadata } from '@ant-design/web3-common';
+import type { WalletMetadata } from '@ant-design/web3-common';
 import type { Connector } from 'wagmi';
 
-import type { WalletFactory } from '../interface';
+import type { WalletFactory, WalletUseInWagmiAdapter } from '../interface';
 
 export type EthereumWalletConnect = (
   metadata?: Partial<WalletMetadata> & {
@@ -14,7 +14,7 @@ export const WalletConnect: EthereumWalletConnect = (metadata) => {
   const { useWalletConnectOfficialModal = false, ...rest } = metadata || {};
   return {
     connectors: ['WalletConnect'],
-    create: (connectors?: readonly Connector[]): Wallet => {
+    create: (connectors?: readonly Connector[]): WalletUseInWagmiAdapter => {
       let qrCodeUri: string | undefined = undefined;
       const getQrCode = async () => {
         const provider = await connectors?.[0]?.getProvider();
@@ -35,6 +35,9 @@ export const WalletConnect: EthereumWalletConnect = (metadata) => {
       };
       return {
         ...metadata_WalletConnect,
+        getWagmiConnector: async () => {
+          return connectors?.[0];
+        },
         hasWalletReady: async () => {
           return true;
         },

diff --git a/packages/web3/src/ethereum/demos/more-wallets.tsx b/packages/web3/src/ethereum/demos/more-wallets.tsx
@@ -40,15 +40,17 @@ const App: React.FC = () => {
       }}
       wallets={[
         MetaMask(),
-        WalletConnect(),
         TokenPocket({
           group: 'Popular',
         }),
+        MobileWallet({
+          group: 'Popular',
+        }),
+        WalletConnect(),
         CoinbaseWallet(),
         SafeheronWallet(),
         OkxWallet(),
         ImToken(),
-        MobileWallet(),
       ]}
       config={config}
     >