From dd76ddc797d55773ab7647983133ab6a8e8a4192 Mon Sep 17 00:00:00 2001 From: xiaodino Date: Wed, 25 Oct 2023 19:14:51 -0700 Subject: [PATCH] feat(bridge-ui-v2): upgrade walletconnect from v2 to v3 (#14999) --- .../bridge-ui-v2/__mocks__/@wagmi/core.ts | 2 +- packages/bridge-ui-v2/package.json | 10 +- .../ConnectButton/ConnectButton.svelte | 10 +- .../components/ThemeButton/ThemeButton.svelte | 2 + .../src/libs/connect/web3modal.ts | 90 +- .../libs/relayer/RelayerAPIService.test.ts | 1 + .../src/libs/util/mergeTransactions.test.ts | 1 + .../bridge-ui-v2/src/libs/wagmi/client.ts | 13 +- pnpm-lock.yaml | 7189 ++++++++--------- 9 files changed, 3508 insertions(+), 3810 deletions(-) diff --git a/packages/bridge-ui-v2/__mocks__/@wagmi/core.ts b/packages/bridge-ui-v2/__mocks__/@wagmi/core.ts index 0700d6c0cd..1f4d277346 100644 --- a/packages/bridge-ui-v2/__mocks__/@wagmi/core.ts +++ b/packages/bridge-ui-v2/__mocks__/@wagmi/core.ts @@ -18,6 +18,6 @@ export const configureChains = vi.fn(() => { return { publicClient: 'mockPublicClient' }; }); -export const createConfig = vi.fn(() => { +export const defaultWagmiConfig = vi.fn(() => { return 'mockWagmiConfig'; }); diff --git a/packages/bridge-ui-v2/package.json b/packages/bridge-ui-v2/package.json index dfbf451cc2..6d1ae6dd54 100644 --- a/packages/bridge-ui-v2/package.json +++ b/packages/bridge-ui-v2/package.json @@ -31,6 +31,7 @@ "@vitest/coverage-v8": "^0.33.0", "@wagmi/cli": "^1.0.1", "abitype": "^0.8.7", + "ajv": "^8.6.4", "autoprefixer": "^10.4.14", "daisyui": "3.1.7", "dotenv": "^16.3.1", @@ -40,7 +41,6 @@ "eslint-plugin-svelte": "^2.26.0", "ethereum-address": "^0.0.4", "jsdom": "^22.1.0", - "ajv": "^8.6.4", "lokijs": "^1.5.12", "postcss": "^8.4.24", "prettier": "^3.0.0", @@ -58,15 +58,15 @@ }, "type": "module", "dependencies": { - "@wagmi/core": "^1.3.6", - "@web3modal/ethereum": "^2.6.2", - "@web3modal/html": "^2.6.2", + "@wagmi/core": "^1.4.4", + "@web3modal/wagmi": "^3.1.0", "@zerodevx/svelte-toast": "^0.9.5", "axios": "^1.4.0", "buffer": "^6.0.3", "debug": "^4.3.4", "events": "^3.3.0", "svelte-i18n": "^3.6.0", - "viem": "^1.4.1" + "viem": "^1.16.6", + "wagmi": "^1.4.4" } } diff --git a/packages/bridge-ui-v2/src/components/ConnectButton/ConnectButton.svelte b/packages/bridge-ui-v2/src/components/ConnectButton/ConnectButton.svelte index 9e57524465..9b3da0477a 100644 --- a/packages/bridge-ui-v2/src/components/ConnectButton/ConnectButton.svelte +++ b/packages/bridge-ui-v2/src/components/ConnectButton/ConnectButton.svelte @@ -16,7 +16,7 @@ function connectWallet() { if (web3modalOpen) return; - web3modal.openModal(); + web3modal.open(); } function onWeb3Modal(state: { open: boolean }) { @@ -24,16 +24,16 @@ } onMount(() => { - unsubscribeWeb3Modal = web3modal.subscribeModal(onWeb3Modal); + unsubscribeWeb3Modal = web3modal.subscribeState(onWeb3Modal); }); onDestroy(unsubscribeWeb3Modal); {#if connected} - - + {:else}