From db4a91bb04810bc5bfa9e5c302d459112c7a73a3 Mon Sep 17 00:00:00 2001 From: Wecle <837968732@qq.com> Date: Fri, 6 Dec 2024 17:24:38 +0800 Subject: [PATCH 1/5] fix: incorrect chains error log --- packages/wagmi/src/wagmi-provider/config-provider.tsx | 2 ++ packages/wagmi/src/wagmi-provider/index.tsx | 6 +----- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/packages/wagmi/src/wagmi-provider/config-provider.tsx b/packages/wagmi/src/wagmi-provider/config-provider.tsx index a6f4ba532..235e23368 100644 --- a/packages/wagmi/src/wagmi-provider/config-provider.tsx +++ b/packages/wagmi/src/wagmi-provider/config-provider.tsx @@ -145,6 +145,8 @@ export const AntDesignWeb3ConfigProvider: React.FC { return wagimConfig.chains .map((item) => { + if (!chainAssets.length) return null; + const c = chainAssets?.find((asset) => { return asset.id === item.id; }); diff --git a/packages/wagmi/src/wagmi-provider/index.tsx b/packages/wagmi/src/wagmi-provider/index.tsx index 155acd676..ecb4783f9 100644 --- a/packages/wagmi/src/wagmi-provider/index.tsx +++ b/packages/wagmi/src/wagmi-provider/index.tsx @@ -58,11 +58,7 @@ export function WagmiWeb3ConfigProvider({ }: React.PropsWithChildren): React.ReactElement { // When user custom config, add Mainnet by default // When user not provide config, auto generate config, chains use user provided chains - const chainAssets: ChainAssetWithWagmiChain[] = config - ? [Mainnet, ...chains] - : chains?.length - ? chains - : [Mainnet]; + const chainAssets: ChainAssetWithWagmiChain[] = config || chains?.length ? chains : [Mainnet]; const generateConfigFlag = () => { return `${JSON.stringify(walletConnect)}-${chains.map((item) => item.id).join(',')}-${wallets.map((item) => item.name).join(',')}`; From 37333e7ad02c3a2af48b842b7a1fb9f17d3fba37 Mon Sep 17 00:00:00 2001 From: Wecle <837968732@qq.com> Date: Fri, 6 Dec 2024 17:50:40 +0800 Subject: [PATCH 2/5] docs: incorrect chains error log --- .changeset/ninety-lizards-agree.md | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 .changeset/ninety-lizards-agree.md diff --git a/.changeset/ninety-lizards-agree.md b/.changeset/ninety-lizards-agree.md new file mode 100644 index 000000000..a03e5d126 --- /dev/null +++ b/.changeset/ninety-lizards-agree.md @@ -0,0 +1,5 @@ +--- +'@ant-design/web3-wagmi': patch +--- + +fix: incorrect chains error log From caaa93de51da89fb2e02b1e60bfbcfed796c5ef2 Mon Sep 17 00:00:00 2001 From: Wecle <837968732@qq.com> Date: Mon, 9 Dec 2024 14:33:31 +0800 Subject: [PATCH 3/5] fix: add custom configured chains in chainAssets --- .changeset/poor-beans-dream.md | 5 +++++ .../wagmi/src/wagmi-provider/config-provider.tsx | 2 -- packages/wagmi/src/wagmi-provider/index.tsx | 14 +++++++++++++- 3 files changed, 18 insertions(+), 3 deletions(-) create mode 100644 .changeset/poor-beans-dream.md diff --git a/.changeset/poor-beans-dream.md b/.changeset/poor-beans-dream.md new file mode 100644 index 000000000..b78be7966 --- /dev/null +++ b/.changeset/poor-beans-dream.md @@ -0,0 +1,5 @@ +--- +'@ant-design/web3-wagmi': patch +--- + +fix: add custom configured chains in chainAssets diff --git a/packages/wagmi/src/wagmi-provider/config-provider.tsx b/packages/wagmi/src/wagmi-provider/config-provider.tsx index 235e23368..a6f4ba532 100644 --- a/packages/wagmi/src/wagmi-provider/config-provider.tsx +++ b/packages/wagmi/src/wagmi-provider/config-provider.tsx @@ -145,8 +145,6 @@ export const AntDesignWeb3ConfigProvider: React.FC { return wagimConfig.chains .map((item) => { - if (!chainAssets.length) return null; - const c = chainAssets?.find((asset) => { return asset.id === item.id; }); diff --git a/packages/wagmi/src/wagmi-provider/index.tsx b/packages/wagmi/src/wagmi-provider/index.tsx index ecb4783f9..d04cd0383 100644 --- a/packages/wagmi/src/wagmi-provider/index.tsx +++ b/packages/wagmi/src/wagmi-provider/index.tsx @@ -58,7 +58,19 @@ export function WagmiWeb3ConfigProvider({ }: React.PropsWithChildren): React.ReactElement { // When user custom config, add Mainnet by default // When user not provide config, auto generate config, chains use user provided chains - const chainAssets: ChainAssetWithWagmiChain[] = config || chains?.length ? chains : [Mainnet]; + const chainAssets: ChainAssetWithWagmiChain[] = config + ? [ + Mainnet, + ...chains, + ...config.chains.map((chain) => ({ + id: chain.id, + name: chain.name, + wagmiChain: chain, + })), + ] + : chains?.length + ? chains + : [Mainnet]; const generateConfigFlag = () => { return `${JSON.stringify(walletConnect)}-${chains.map((item) => item.id).join(',')}-${wallets.map((item) => item.name).join(',')}`; From 3a46c263345e45bc06b411879b14f7b2947ed279 Mon Sep 17 00:00:00 2001 From: Wecle <837968732@qq.com> Date: Tue, 10 Dec 2024 21:40:00 +0800 Subject: [PATCH 4/5] fix: delete redundant changelog --- .changeset/ninety-lizards-agree.md | 5 ----- 1 file changed, 5 deletions(-) delete mode 100644 .changeset/ninety-lizards-agree.md diff --git a/.changeset/ninety-lizards-agree.md b/.changeset/ninety-lizards-agree.md deleted file mode 100644 index a03e5d126..000000000 --- a/.changeset/ninety-lizards-agree.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -'@ant-design/web3-wagmi': patch ---- - -fix: incorrect chains error log From 904c2698f404fe38fcb3a299a704d2fc8edc42c8 Mon Sep 17 00:00:00 2001 From: Wecle <837968732@qq.com> Date: Wed, 11 Dec 2024 12:33:16 +0800 Subject: [PATCH 5/5] test(wagmi-provider): update chain names in test assertions --- .../src/wagmi-provider/__tests__/custom-config.test.tsx | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/packages/wagmi/src/wagmi-provider/__tests__/custom-config.test.tsx b/packages/wagmi/src/wagmi-provider/__tests__/custom-config.test.tsx index 774d033e7..61fd266cb 100644 --- a/packages/wagmi/src/wagmi-provider/__tests__/custom-config.test.tsx +++ b/packages/wagmi/src/wagmi-provider/__tests__/custom-config.test.tsx @@ -145,7 +145,7 @@ describe('WagmiWeb3ConfigProvider config', () => { ); const { baseElement } = render(); - expect(baseElement.querySelector('.chains-name')?.textContent).toBe('Ethereum'); + expect(baseElement.querySelector('.chains-name')?.textContent).toBe('Polygon,Goerli,Ethereum'); }); it('avaliable chains with assets', () => { @@ -186,7 +186,9 @@ describe('WagmiWeb3ConfigProvider config', () => { ); const { baseElement } = render(); - expect(baseElement.querySelector('.chains-name')?.textContent).toBe('Polygon,Ethereum,Base'); + expect(baseElement.querySelector('.chains-name')?.textContent).toBe( + 'Polygon,Ethereum,Base,Goerli', + ); }); it('empty connectors', () => {