Check status on initial page load

multiversx · Sep 13, 2024 · f601426 · f601426
1 parent d319e8b
commit f601426
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/src/core/methods/trackTransactions/helpers/checkTransactionStatus/checkBatch.ts b/src/core/methods/trackTransactions/helpers/checkTransactionStatus/checkBatch.ts
@@ -98,8 +98,6 @@ function manageTransaction({
     }
 
     if (hasStatusChanged) {
-      //otherwise, it will just trigger the change of status
-
       updateSignedTransactionStatus({
         sessionId,
         status,

diff --git a/src/core/methods/trackTransactions/trackTransactions.ts b/src/core/methods/trackTransactions/trackTransactions.ts
@@ -24,14 +24,17 @@ export async function trackTransactions(props?: TransactionsTrackerType) {
     props?.getTransactionsByHash ?? defaultGetTxByHash;
 
   // Function that handles message (checking transaction status)
-  const onMessage = () => {
+  const recheckStatus = () => {
     checkTransactionStatus({
       shouldRefreshBalance: isWebsocketCompleted,
       getTransactionsByHash,
       ...props
     });
   };
 
+  // recheck on page initial page load
+  recheckStatus();
+
   if (isWebsocketCompleted) {
     // Do not set polling interval if websocket is complete
     if (pollingIntervalTimer) {
@@ -41,13 +44,13 @@ export async function trackTransactions(props?: TransactionsTrackerType) {
     store.subscribe(async ({ account: { websocketEvent } }) => {
       if (websocketEvent?.message && timestamp !== websocketEvent.timestamp) {
         timestamp = websocketEvent.timestamp;
-        onMessage();
+        recheckStatus();
       }
     });
   } else {
     // Set polling interval if websocket is not complete and no existing interval is set
     if (!pollingIntervalTimer) {
-      pollingIntervalTimer = setInterval(onMessage, pollingInterval);
+      pollingIntervalTimer = setInterval(recheckStatus, pollingInterval);
     }
   }