Merge pull request #594 from liteflow-labs/dev

Release v3.4.6

components/Cart/Step/Transaction.tsx

@@ -122,7 +122,7 @@ const CartStepTransaction: FC<Props> = ({
       try {
         setApprovalLoading((x) => ({ ...x, [currencyId]: true }))
         const transaction = await sendTransaction(signer, tx)
-        await transaction.wait()
+        await signer.waitForTransactionReceipt({ hash: transaction.hash })
         await fetchApproval({
           variables: { accountAddress: address, items: approvalItems },
         })

components/CartContext.tsx

@@ -1,5 +1,5 @@
+import { BigNumber } from '@ethersproject/bignumber'
 import { useBatchPurchase } from '@liteflow/react'
-import { BigNumber } from 'ethers'
 import { FC, PropsWithChildren, useCallback, useEffect, useState } from 'react'
 import useAccount from '../hooks/useAccount'
 import { CartItem, CartContext as Context } from '../hooks/useCart'

hooks/useAccount.ts

@@ -61,8 +61,7 @@ export default function useAccount(): AccountDetail {
   const login = useCallback(
     async (connector: Connector) => {
       const wallet = await connector.getWalletClient()
-      const signer = walletClientToSigner(wallet)
-      const currentAddress = (await signer.getAddress()).toLowerCase()
+      const currentAddress = wallet.account.address.toLowerCase()
       if (jwt && currentAddress === jwt.address) {
         setAuthenticationToken(jwt.token)
         // fully login, nothing to do

hooks/useFees.ts

@@ -1,4 +1,4 @@
-import { BigNumber } from 'ethers'
+import { BigNumber } from '@ethersproject/bignumber'
 import { useEffect, useMemo, useState } from 'react'
 import { useFeesLazyQuery } from '../graphql'
 

hooks/useSigner.ts

@@ -1,27 +1,19 @@
-import { Signer, TypedDataSigner } from '@ethersproject/abstract-signer'
-import { ExternalProvider } from '@ethersproject/providers'
-import { providers } from 'ethers'
+import { Signer } from '@liteflow/core'
 import { useMemo } from 'react'
-import type { WalletClient } from 'wagmi'
-import { useWalletClient } from 'wagmi'
+import { publicActions } from 'viem'
+import { WalletClient, useWalletClient } from 'wagmi'
 import useAccount from './useAccount'
 
 /**
  * Hook returning the current signer logged in to the website. This signer can and should
  * be used to sign messages or transactions
- * @returns (Signer & TypedDataSigner) | undefined
  */
 
-export function walletClientToSigner(
-  walletClient: WalletClient,
-): providers.JsonRpcSigner {
-  const { account, transport } = walletClient
-  const provider = new providers.Web3Provider(transport as ExternalProvider)
-  const signer = provider.getSigner(account.address)
-  return signer
+export function walletClientToSigner(walletClient: WalletClient): Signer {
+  return walletClient?.extend(publicActions)
 }
 
-export default function useSigner(): (Signer & TypedDataSigner) | undefined {
+export default function useSigner(): Signer | undefined {
   const { data: walletClient } = useWalletClient()
   const { isLoggedIn } = useAccount()