fix: select correct wallet

safe-global · Aug 1, 2023 · 54f7ee4 · 54f7ee4
1 parent 0df6caf
commit 54f7ee4
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/src/components/common/ConnectWallet/AccountCenter.tsx b/src/components/common/ConnectWallet/AccountCenter.tsx
@@ -21,7 +21,9 @@ const AccountCenter = ({ wallet }: { wallet: ConnectedWallet }) => {
   const addressBook = useAddressBook()
   const prefix = chainInfo?.shortName
 
-  const handleSwitchWallet = () => {
+  const handleSwitchWallet = async () => {
+    await privy.logout()
+    privy.login()
     handleClose()
   }
 

diff --git a/src/hooks/wallets/useWallet.ts b/src/hooks/wallets/useWallet.ts
@@ -1,14 +1,15 @@
-import { useWallets, type ConnectedWallet, type EIP1193Provider, usePrivy } from '@privy-io/react-auth'
+import { useWallets, usePrivy, type ConnectedWallet, type EIP1193Provider } from '@privy-io/react-auth'
 import { useMemo } from 'react'
 import useAsync, { type AsyncResult } from '../useAsync'
 
 const useWallet = (): AsyncResult<(ConnectedWallet & { provider: EIP1193Provider }) | null> => {
   const { wallets } = useWallets()
   const privy = usePrivy()
 
-  console.log('useWallet', wallets, privy)
-
-  const embeddedWallet = useMemo(() => wallets.find((wallet) => wallet.linked), [wallets])
+  const embeddedWallet = useMemo(
+    () => wallets.find((wallet) => wallet.address === privy.user?.wallet?.address),
+    [wallets, privy.user?.wallet?.address],
+  )
 
   return useAsync(async () => {
     const provider = await embeddedWallet?.getEthereumProvider()
@@ -17,11 +18,8 @@ const useWallet = (): AsyncResult<(ConnectedWallet & { provider: EIP1193Provider
       return null
     }
 
-    const chainId = await provider.request({ method: 'eth_chainId' })
-    console.log('eth_chainId', chainId)
-
     return embeddedWallet
-      ? { ...embeddedWallet, provider, chainId: chainId ?? embeddedWallet.chainId.replace('eip155:', '') }
+      ? { ...embeddedWallet, provider, chainId: embeddedWallet.chainId.replace('eip155:', '') }
       : null
   }, [embeddedWallet])
 }