From b5e0ab005b3f801ae4696d923d08dca5a2733702 Mon Sep 17 00:00:00 2001
From: Memo Khoury <majd.khoury93@gmail.com>
Date: Mon, 25 Nov 2024 17:34:04 +0000
Subject: [PATCH 1/2] getInfo() for both withdraw and deposit

---
 .../src/hooks/useBridgeTransfer.ts                        | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/webapps/world-builder-dashboard/src/hooks/useBridgeTransfer.ts b/webapps/world-builder-dashboard/src/hooks/useBridgeTransfer.ts
index ed4b5e82..a7d16305 100644
--- a/webapps/world-builder-dashboard/src/hooks/useBridgeTransfer.ts
+++ b/webapps/world-builder-dashboard/src/hooks/useBridgeTransfer.ts
@@ -252,12 +252,11 @@ export const useBridgeTransfer = () => {
       ['transactionInputs', txHash],
       async () => {
         const cachedTransactionInputs = getCachedTransactionInputs()
-        // If found in cache, return the cached data
+
         if (cachedTransactionInputs) {
           return cachedTransactionInputs
         }
   
-        // Otherwise, fetch transaction inputs from the bridge transfer instance
         const _bridgeTransfer = new BridgeTransfer({
           txHash: txHash ?? '',
           destinationNetworkChainId: destinationChainId ?? 0,
@@ -267,9 +266,8 @@ export const useBridgeTransfer = () => {
         })
 
         
-        const transactionInputs = isDeposit ? await _bridgeTransfer.getInfo() : await _bridgeTransfer.getTransactionInputs()
-  
-        // Save the fetched transaction inputs to cache
+        const transactionInputs = await _bridgeTransfer.getInfo()
+
         saveTransactionInputsToCache({ txHash, ...transactionInputs })
   
         return transactionInputs

From dd9f3e9492b9b690d3df7d19598f43dace6cee95 Mon Sep 17 00:00:00 2001
From: Memo Khoury <majd.khoury93@gmail.com>
Date: Mon, 25 Nov 2024 17:37:01 +0000
Subject: [PATCH 2/2] clear build error

---
 .../src/hooks/useBridgeTransfer.ts            | 37 ++++++++++---------
 1 file changed, 19 insertions(+), 18 deletions(-)

diff --git a/webapps/world-builder-dashboard/src/hooks/useBridgeTransfer.ts b/webapps/world-builder-dashboard/src/hooks/useBridgeTransfer.ts
index a7d16305..fdf90be7 100644
--- a/webapps/world-builder-dashboard/src/hooks/useBridgeTransfer.ts
+++ b/webapps/world-builder-dashboard/src/hooks/useBridgeTransfer.ts
@@ -127,7 +127,7 @@ export const useBridgeTransfer = () => {
           ? 1 * 60 * 1000
           : false,
         refetchOnWindowFocus: false,
-        enabled: !!txRecord,
+        enabled: !!txRecord
         // retryDelay: (attempt) => Math.min(1000 * 2 ** attempt, 2000)
       }
     )
@@ -221,55 +221,56 @@ export const useBridgeTransfer = () => {
     const destinationRpc = getNetworks(selectedNetworkType)?.find((n) => n.chainId === destinationChainId)?.rpcs[0]
     const originRpc = getNetworks(selectedNetworkType)?.find((n) => n.chainId === originChainId)?.rpcs[0]
     const storageKey = `transaction-inputs-${connectedAccount}`
-  
+
     // Retrieve cached transaction inputs from localStorage
     const getCachedTransactionInputs = () => {
       const cachedData = localStorage.getItem(storageKey)
       if (!cachedData) return null
-  
+
       const cachedTransactions = JSON.parse(cachedData)
-  
+
       // Return the specific transaction input based on txHash
       return cachedTransactions.find((input: any) => input.txHash === txHash) || null
     }
-  
+
     // Save transaction inputs to localStorage as an array
     const saveTransactionInputsToCache = (newInput: any) => {
       const cachedData = localStorage.getItem(storageKey)
       const cachedTransactions = cachedData ? JSON.parse(cachedData) : []
-  
+
       const updatedTransactions = cachedTransactions.some((input: any) => input.txHash === newInput.txHash)
-        ? cachedTransactions.map((input: any) =>
-            input.txHash === newInput.txHash ? { ...input, ...newInput } : input
-          )
+        ? cachedTransactions.map((input: any) => (input.txHash === newInput.txHash ? { ...input, ...newInput } : input))
         : [...cachedTransactions, newInput]
-  
+
       localStorage.setItem(storageKey, JSON.stringify(updatedTransactions))
     }
-  
+
     // Use React Query to fetch or cache transaction inputs
     return useQuery(
       ['transactionInputs', txHash],
       async () => {
         const cachedTransactionInputs = getCachedTransactionInputs()
-
+        // If found in cache, return the cached data
         if (cachedTransactionInputs) {
           return cachedTransactionInputs
         }
-  
+
+        // Otherwise, fetch transaction inputs from the bridge transfer instance
         const _bridgeTransfer = new BridgeTransfer({
           txHash: txHash ?? '',
           destinationNetworkChainId: destinationChainId ?? 0,
           originNetworkChainId: originChainId ?? 0,
           destinationSignerOrProviderOrRpc: destinationRpc,
-          originSignerOrProviderOrRpc: originRpc,
+          originSignerOrProviderOrRpc: originRpc
         })
 
-        
         const transactionInputs = await _bridgeTransfer.getInfo()
 
-        saveTransactionInputsToCache({ txHash, ...transactionInputs })
-  
+        saveTransactionInputsToCache({
+          ...transactionInputs,
+          txHash
+        })
+
         return transactionInputs
       },
       {
@@ -278,7 +279,7 @@ export const useBridgeTransfer = () => {
         },
         staleTime: 2 * 60 * 1000, // Data is considered fresh for 2 minutes
         refetchOnWindowFocus: false, // Disable refetching on window focus
-        enabled: !!txRecord, // Ensure the query only runs when txRecord exists
+        enabled: !!txRecord // Ensure the query only runs when txRecord exists
       }
     )
   }