From fbd78b5ca38a975630d5954a5b72a192ab05ca48 Mon Sep 17 00:00:00 2001 From: Todd Kao Date: Tue, 25 Feb 2025 14:09:15 -0500 Subject: [PATCH 1/4] test --- .../widget/src/hooks/useCreateEvmWallets.tsx | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/packages/widget/src/hooks/useCreateEvmWallets.tsx b/packages/widget/src/hooks/useCreateEvmWallets.tsx index 599084824..6ef18ab4f 100644 --- a/packages/widget/src/hooks/useCreateEvmWallets.tsx +++ b/packages/widget/src/hooks/useCreateEvmWallets.tsx @@ -48,22 +48,19 @@ export const useCreateEvmWallets = () => { const isWalletConnect = connector.id === "walletConnect"; const connectWallet = async ({ chainIdToConnect = "1" }: { chainIdToConnect?: string }) => { - const walletConnectedButNeedToSwitchChain = - isEvmConnected && - chainId !== Number(chainIdToConnect) && - connector.id === currentEvmConnector?.id; + // const needToSwitchChain = + // isEvmConnected && + // chainId !== Number(chainIdToConnect) && + // connector.id === currentEvmConnector?.id; try { if (isEvmConnected && connector.id !== currentEvmConnector?.id) { await currentConnector?.disconnect(); } - if (walletConnectedButNeedToSwitchChain) { - await connector?.switchChain?.({ - chainId: Number(chainIdToConnect), - }); - } else { - await connectAsync({ connector, chainId: Number(chainIdToConnect) }); - } + await connectAsync({ connector, chainId: Number(chainIdToConnect) }); + await connector?.switchChain?.({ + chainId: Number(chainIdToConnect), + }); if (sourceAsset === undefined) { const chain = chains?.find((x) => x.chainID === "1"); From 18984b52f49c71e42061668882cf029ab7168de7 Mon Sep 17 00:00:00 2001 From: Todd Kao Date: Tue, 25 Feb 2025 14:21:51 -0500 Subject: [PATCH 2/4] test --- packages/widget/src/hooks/useCreateEvmWallets.tsx | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/packages/widget/src/hooks/useCreateEvmWallets.tsx b/packages/widget/src/hooks/useCreateEvmWallets.tsx index 6ef18ab4f..da12cbe0f 100644 --- a/packages/widget/src/hooks/useCreateEvmWallets.tsx +++ b/packages/widget/src/hooks/useCreateEvmWallets.tsx @@ -11,7 +11,7 @@ import { useAtom, useAtomValue, useSetAtom } from "jotai"; import { useCallback } from "react"; import { createPublicClient, http } from "viem"; import { sei } from "viem/chains"; -import { useAccount, useConnect, useConnectors } from "wagmi"; +import { useAccount, useConnect, useConnectors, useSwitchChain } from "wagmi"; import { ChainType } from "@skip-go/client"; import { walletConnectLogo } from "@/constants/wagmi"; import { callbacksAtom } from "@/state/callbacks"; @@ -26,6 +26,7 @@ export const useCreateEvmWallets = () => { const { connector: currentEvmConnector, isConnected: isEvmConnected, chainId } = useAccount(); const { connectAsync } = useConnect(); + const { switchChain } = useSwitchChain(); const connectors = useConnectors(); const currentConnector = connectors.find((connector) => connector.id === currentEvmConnector?.id); @@ -58,7 +59,7 @@ export const useCreateEvmWallets = () => { await currentConnector?.disconnect(); } await connectAsync({ connector, chainId: Number(chainIdToConnect) }); - await connector?.switchChain?.({ + switchChain?.({ chainId: Number(chainIdToConnect), }); From 7fae175153a792ff48c9785eac0327a36d9a4cd1 Mon Sep 17 00:00:00 2001 From: Todd Kao Date: Tue, 25 Feb 2025 14:30:50 -0500 Subject: [PATCH 3/4] test --- packages/widget/src/hooks/useCreateEvmWallets.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/widget/src/hooks/useCreateEvmWallets.tsx b/packages/widget/src/hooks/useCreateEvmWallets.tsx index da12cbe0f..91c4ef7b8 100644 --- a/packages/widget/src/hooks/useCreateEvmWallets.tsx +++ b/packages/widget/src/hooks/useCreateEvmWallets.tsx @@ -58,10 +58,10 @@ export const useCreateEvmWallets = () => { if (isEvmConnected && connector.id !== currentEvmConnector?.id) { await currentConnector?.disconnect(); } - await connectAsync({ connector, chainId: Number(chainIdToConnect) }); switchChain?.({ chainId: Number(chainIdToConnect), }); + await connectAsync({ connector, chainId: Number(chainIdToConnect) }); if (sourceAsset === undefined) { const chain = chains?.find((x) => x.chainID === "1"); From e022fe92cdbec5fb3ff3621cc4c7a584471633cd Mon Sep 17 00:00:00 2001 From: Todd Kao Date: Tue, 25 Feb 2025 15:56:59 -0500 Subject: [PATCH 4/4] test --- packages/widget/src/hooks/useCreateEvmWallets.tsx | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/packages/widget/src/hooks/useCreateEvmWallets.tsx b/packages/widget/src/hooks/useCreateEvmWallets.tsx index 91c4ef7b8..26046ad95 100644 --- a/packages/widget/src/hooks/useCreateEvmWallets.tsx +++ b/packages/widget/src/hooks/useCreateEvmWallets.tsx @@ -58,10 +58,12 @@ export const useCreateEvmWallets = () => { if (isEvmConnected && connector.id !== currentEvmConnector?.id) { await currentConnector?.disconnect(); } - switchChain?.({ - chainId: Number(chainIdToConnect), - }); - await connectAsync({ connector, chainId: Number(chainIdToConnect) }); + console.log(connector, chainIdToConnect); + await connector.connect({ chainId: Number(chainIdToConnect) }); + + // switchChain?.({ + // chainId: Number(chainIdToConnect), + // }); if (sourceAsset === undefined) { const chain = chains?.find((x) => x.chainID === "1");