Merge pull request #47478 from nkdengineer/fix/46393

fix: Message and Notification Swapping in IOU
Expensify · Sep 2, 2024 · e60b821 · e60b821
2 parents c7934c5 + 1db02c0
commit e60b821
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/src/libs/Network/SequentialQueue.ts b/src/libs/Network/SequentialQueue.ts
@@ -161,7 +161,10 @@ function flush() {
                     resolveIsReadyPromise?.();
                 }
                 currentRequest = null;
-                flushOnyxUpdatesQueue();
+                // The queue can be paused when we sync the data with backend so we should only update the Onyx data when the queue is empty
+                if (PersistedRequests.getAll().length === 0) {
+                    flushOnyxUpdatesQueue();
+                }
             });
         },
     });
@@ -179,7 +182,6 @@ function unpause() {
     const numberOfPersistedRequests = PersistedRequests.getAll().length || 0;
     console.debug(`[SequentialQueue] Unpausing the queue and flushing ${numberOfPersistedRequests} requests`);
     isQueuePaused = false;
-    flushOnyxUpdatesQueue();
     flush();
 }