diff --git a/packages/checkout/widgets-lib/src/components/ConnectLoader/ConnectLoader.tsx b/packages/checkout/widgets-lib/src/components/ConnectLoader/ConnectLoader.tsx index ed63e46e43..015c5014e8 100644 --- a/packages/checkout/widgets-lib/src/components/ConnectLoader/ConnectLoader.tsx +++ b/packages/checkout/widgets-lib/src/components/ConnectLoader/ConnectLoader.tsx @@ -144,7 +144,7 @@ export function ConnectLoader({ const isWalletConnected = async (localProvider: WrappedBrowserProvider): Promise => { const { isConnected } = await checkout.checkIsWalletConnected({ - provider: localProvider!, + provider: localProvider, }); if (!isConnected) { connectLoaderDispatch({ @@ -207,6 +207,8 @@ export function ConnectLoader({ return; } } catch (err) { + // eslint-disable-next-line no-console + console.error(err); return; } @@ -217,6 +219,8 @@ export function ConnectLoader({ const anonymousId = userData?.anonymousId(); await identifyUser(identify, browserProvider!, { anonymousId }); } catch (err) { + // eslint-disable-next-line no-console + console.error(err); return; } diff --git a/packages/checkout/widgets-lib/src/lib/analytics/identifyUser.ts b/packages/checkout/widgets-lib/src/lib/analytics/identifyUser.ts index 9696507ce4..6a57cd002f 100644 --- a/packages/checkout/widgets-lib/src/lib/analytics/identifyUser.ts +++ b/packages/checkout/widgets-lib/src/lib/analytics/identifyUser.ts @@ -12,8 +12,9 @@ export async function identifyUser( provider: WrappedBrowserProvider, options?: Record, ) { - // WT-1698 Analytics - Identify user here then progress to widget - const walletAddress = (await (await provider.getSigner()).getAddress()).toLowerCase(); + const signer = await provider.getSigner(); + const address = await signer.getAddress(); + const walletAddress = address.toLowerCase(); const isMetaMask = isMetaMaskProvider(provider); const isPassport = isPassportProvider(provider); try { diff --git a/packages/checkout/widgets-lib/src/widgets/connect/components/WalletList.tsx b/packages/checkout/widgets-lib/src/widgets/connect/components/WalletList.tsx index 8e5c15df58..5048b0415d 100644 --- a/packages/checkout/widgets-lib/src/widgets/connect/components/WalletList.tsx +++ b/packages/checkout/widgets-lib/src/widgets/connect/components/WalletList.tsx @@ -215,25 +215,17 @@ export function WalletList(props: WalletListProps) { const connectCallback = async (ethereumProvider: EthereumProvider) => { if (ethereumProvider.connected && ethereumProvider.session) { - const browserProvider = new WrappedBrowserProvider(ethereumProvider); - selectBrowserProvider(browserProvider, 'walletconnect'); - - const { chainId } = await ((await browserProvider.getSigner()).provider.getNetwork()); - if (ethereumProvider.chainId !== targetChainId) { - // @ts-ignore allow protected method `switchEthereumChain` to be called - await ethereumProvider.switchEthereumChain(targetChainId); - } - - if (chainId as unknown as ChainId !== targetChainId) { - viewDispatch({ - payload: { - type: ViewActions.UPDATE_VIEW, - view: { type: ConnectWidgetViews.SWITCH_NETWORK }, - }, + await ethereumProvider.request({ + method: 'wallet_switchEthereumChain', + params: [{ chainId: `0x${targetChainId.toString(16)}` }], }); } + const browserProvider = new WrappedBrowserProvider(ethereumProvider, 'any'); + + selectBrowserProvider(browserProvider, 'walletconnect'); + viewDispatch({ payload: { type: ViewActions.UPDATE_VIEW, diff --git a/packages/checkout/widgets-lib/src/widgets/connect/views/SwitchNetworkZkEVM.tsx b/packages/checkout/widgets-lib/src/widgets/connect/views/SwitchNetworkZkEVM.tsx index a37c2c59cd..3a89531824 100644 --- a/packages/checkout/widgets-lib/src/widgets/connect/views/SwitchNetworkZkEVM.tsx +++ b/packages/checkout/widgets-lib/src/widgets/connect/views/SwitchNetworkZkEVM.tsx @@ -33,8 +33,7 @@ export function SwitchNetworkZkEVM() { if (!provider || !checkout) return; const checkCorrectNetwork = async () => { - const currentChainId = await provider.send('eth_chainId', []); - // eslint-disable-next-line radix + const currentChainId = await provider.getNetwork().then((n) => n.chainId); const parsedChainId = Number(currentChainId.toString()); if (parsedChainId === checkout.config.l2ChainId) { connectDispatch({ @@ -151,6 +150,8 @@ export function SwitchNetworkZkEVM() { }, }); } catch (err: any) { + // eslint-disable-next-line no-console + console.error(err); setButtonTextKey(t('views.SWITCH_NETWORK.zkEVM.button.retryText')); } }, [provider, checkout]);