From b26106ba208d17919744f3cef1d0097aba8e1b6f Mon Sep 17 00:00:00 2001
From: Bill He <bill@dydx.exchange>
Date: Thu, 9 Nov 2023 14:07:46 -0800
Subject: [PATCH] Fix status empty bug

---
 src/hooks/useLocalNotifications.tsx                   | 11 ++++++++++-
 src/hooks/useSquid.tsx                                |  2 +-
 .../forms/AccountManagementForms/WithdrawForm.tsx     |  1 -
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/src/hooks/useLocalNotifications.tsx b/src/hooks/useLocalNotifications.tsx
index a71c992..7774e5f 100644
--- a/src/hooks/useLocalNotifications.tsx
+++ b/src/hooks/useLocalNotifications.tsx
@@ -66,7 +66,16 @@ const useLocalNotificationsContext = () => {
         status: currentStatus,
       } of transferNotifications) {
         try {
-          if (currentStatus && currentStatus?.squidTransactionStatus !== 'ongoing') continue;
+          // skip if error is returned or if the transaction is not ongoing
+          if (
+            // @ts-ignore status.errors is not in the type definition but can be returned
+            currentStatus?.errors ||
+            currentStatus?.error ||
+            (currentStatus?.squidTransactionStatus &&
+              currentStatus?.squidTransactionStatus !== 'ongoing')
+          ) {
+            continue;
+          }
 
           const status = await squid?.getStatus({ transactionId: txHash, toChainId, fromChainId });
           if (status) statuses[txHash] = status;
diff --git a/src/hooks/useSquid.tsx b/src/hooks/useSquid.tsx
index 056c3a4..1e3b240 100644
--- a/src/hooks/useSquid.tsx
+++ b/src/hooks/useSquid.tsx
@@ -8,7 +8,7 @@ import { getSelectedNetwork } from '@/state/appSelectors';
 
 export const NATIVE_TOKEN_ADDRESS = '0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE';
 
-export const STATUS_ERROR_GRACE_PERIOD = 120_000;
+export const STATUS_ERROR_GRACE_PERIOD = 300_000;
 
 const useSquidContext = () => {
   const selectedNetwork = useSelector(getSelectedNetwork);
diff --git a/src/views/forms/AccountManagementForms/WithdrawForm.tsx b/src/views/forms/AccountManagementForms/WithdrawForm.tsx
index 75d5ba2..70730db 100644
--- a/src/views/forms/AccountManagementForms/WithdrawForm.tsx
+++ b/src/views/forms/AccountManagementForms/WithdrawForm.tsx
@@ -44,7 +44,6 @@ import { getTransferInputs } from '@/state/inputsSelectors';
 
 import abacusStateManager from '@/lib/abacus';
 import { MustBigNumber } from '@/lib/numbers';
-import { log } from '@/lib/telemetry';
 
 import { TokenSelectMenu } from './TokenSelectMenu';
 import { WithdrawButtonAndReceipt } from './WithdrawForm/WithdrawButtonAndReceipt';