refactor

components/Swap/hooks/useCrossChainFee.ts

@@ -2,17 +2,16 @@ import { useEffect, useState } from "react"
 import { utils } from "ethers"
 
 import { roundNumber } from "@/lib/utils"
-import { useZetaChainClient } from "@/hooks/useZetaChainClient"
 
 import type { CrossChainFee, Token } from "./types"
 
 const useCrossChainFee = (
   sourceTokenSelected: Token | null,
   destinationTokenSelected: Token | null,
   sendType: string | null,
-  fees: any
+  fees: any,
+  client: any
 ) => {
-  const { client } = useZetaChainClient()
   const [crossChainFee, setCrossChainFee] = useState<CrossChainFee | null>(null)
   const [loading, setLoading] = useState<boolean>(false)
 

components/Swap/hooks/useDestinationAmount.ts

@@ -3,7 +3,6 @@ import { utils } from "ethers"
 import debounce from "lodash/debounce"
 
 import { roundNumber } from "@/lib/utils"
-import { useZetaChainClient } from "@/hooks/useZetaChainClient"
 
 import type { Balance, CrossChainFee, Token } from "./types"
 
@@ -13,9 +12,9 @@ const useDestinationAmount = (
   sourceAmount: string,
   crossChainFee: CrossChainFee | null,
   sendType: string | null,
-  balances: any
+  balances: any,
+  client: any
 ) => {
-  const { client } = useZetaChainClient()
   const [destinationAmount, setDestinationAmount] = useState<string>("")
   const [destinationAmountIsLoading, setDestinationAmountIsLoading] =
     useState<boolean>(false)

components/Swap/hooks/useSendTransaction.ts

@@ -8,8 +8,6 @@ import { ethers } from "ethers"
 import { parseEther, parseUnits } from "viem"
 import { useAccount } from "wagmi"
 
-import { useEthersSigner } from "@/hooks/useEthersSigner"
-
 import SwapToAnyToken from "./SwapToAnyToken.json"
 import type { Inbound, Token } from "./types"
 
@@ -24,10 +22,10 @@ const useSendTransaction = (
   inbounds: Inbound[],
   setInbounds: (inbounds: Inbound[]) => void,
   bitcoinAddress: string,
-  client: any
+  client: any,
+  signer: any
 ) => {
   const { address } = useAccount()
-  const signer = useEthersSigner()
   const [isSending, setIsSending] = useState(false)
 
   const handleSend = async () => {

components/Swap/index.tsx

@@ -7,6 +7,7 @@ import { useFeesContext } from "@/context/FeesContext"
 import { useAccount, useNetwork, useSwitchNetwork } from "wagmi"
 
 import { formatAddress } from "@/lib/utils"
+import { useEthersSigner } from "@/hooks/useEthersSigner"
 import { useZetaChainClient } from "@/hooks/useZetaChainClient"
 import useSendType, {
   computeSendType,
@@ -27,6 +28,7 @@ interface SwapProps {
 }
 
 const Swap: React.FC<SwapProps> = ({ contract }) => {
+  const signer = useEthersSigner()
   const { client } = useZetaChainClient()
   const { isLoading, pendingChainId, switchNetwork } = useSwitchNetwork()
   const { setInbounds, inbounds } = useCCTXsContext()
@@ -54,7 +56,8 @@ const Swap: React.FC<SwapProps> = ({ contract }) => {
     sourceTokenSelected,
     destinationTokenSelected,
     sendType,
-    fees
+    fees,
+    client
   )
 
   const { isAmountGTFee, isAmountLTBalance } = useAmountValidation(
@@ -71,7 +74,8 @@ const Swap: React.FC<SwapProps> = ({ contract }) => {
       sourceAmount,
       crossChainFee,
       sendType,
-      balances
+      balances,
+      client
     )
 
   const { priorityErrors } = useSwapErrors(
@@ -105,7 +109,8 @@ const Swap: React.FC<SwapProps> = ({ contract }) => {
     inbounds,
     setInbounds,
     bitcoinAddress,
-    client
+    client,
+    signer
   )
 
   const sendDisabled =