From bb5879c14daa4f63f04e2fbb0d414e3fc03a506c Mon Sep 17 00:00:00 2001
From: Bartek <bartlomiejkramek@outlook.com>
Date: Tue, 17 Dec 2024 16:03:43 +0100
Subject: [PATCH] fix

---
 .../arb-token-bridge-ui/src/hooks/useTransactionHistory.ts    | 4 ++--
 .../tests/e2e/specs/withdrawNativeToken.cy.ts                 | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/arb-token-bridge-ui/src/hooks/useTransactionHistory.ts b/packages/arb-token-bridge-ui/src/hooks/useTransactionHistory.ts
index 86dcd59b67..0dd9af9640 100644
--- a/packages/arb-token-bridge-ui/src/hooks/useTransactionHistory.ts
+++ b/packages/arb-token-bridge-ui/src/hooks/useTransactionHistory.ts
@@ -1036,7 +1036,7 @@ const useMappedReceiverTransactionHistory = ({
     transactions: receiverTransactions || [],
     error: receiverTransactionsError,
     completed: !isLoadingReceiverTransactions,
-    loading: isLoadingReceiverTransactions,
+    loading: isLoadingReceiverTransactions || rawDataLoading,
     rawDataErroredChains,
     updatePendingTransaction
   }
@@ -1072,7 +1072,7 @@ export const useTransactionHistory = (
     updatePendingTransaction: updatePendingReceiverTransaction
   } = useMappedReceiverTransactionHistory({
     address,
-    shouldStartToFetch: senderTransactions.length > 0 && !loadingForSender
+    shouldStartToFetch: firstPageLoadedForSender
   })
 
   const { cctpTransactions, cctpLoading } = useCctpTransactions({ address })
diff --git a/packages/arb-token-bridge-ui/tests/e2e/specs/withdrawNativeToken.cy.ts b/packages/arb-token-bridge-ui/tests/e2e/specs/withdrawNativeToken.cy.ts
index 5de34a32de..a1b2a890cd 100644
--- a/packages/arb-token-bridge-ui/tests/e2e/specs/withdrawNativeToken.cy.ts
+++ b/packages/arb-token-bridge-ui/tests/e2e/specs/withdrawNativeToken.cy.ts
@@ -102,7 +102,7 @@ describe('Withdraw native token', () => {
           })
         })
 
-        it('should claim funds', { defaultCommandTimeout: 200_000 }, () => {
+        it('should claim funds', { defaultCommandTimeout: 300_000 }, () => {
           // increase the timeout for this test as claim button can take ~(20 blocks *10 blocks/sec) to activate
           cy.login({ networkType: 'parentChain' }) // login to L1 to claim the funds (otherwise would need to change network after clicking on claim)