Merge pull request #54110 from bernhardoj/fix/52027-accounting-tab-lo…

…ads-indefinitely

Fix accounting tab load indefinitely

src/libs/Network/SequentialQueue.ts

@@ -128,7 +128,7 @@ function process(): Promise<void> {
     return currentRequestPromise;
 }
 
-function flush() {
+function flush(shouldResetPromise = true) {
     // When the queue is paused, return early. This will keep an requests in the queue and they will get flushed again when the queue is unpaused
     if (isQueuePaused) {
         Log.info('[SequentialQueue] Unable to flush. Queue is paused.');
@@ -154,10 +154,12 @@ function flush() {
 
     isSequentialQueueRunning = true;
 
-    // Reset the isReadyPromise so that the queue will be flushed as soon as the request is finished
-    isReadyPromise = new Promise((resolve) => {
-        resolveIsReadyPromise = resolve;
-    });
+    if (shouldResetPromise) {
+        // Reset the isReadyPromise so that the queue will be flushed as soon as the request is finished
+        isReadyPromise = new Promise((resolve) => {
+            resolveIsReadyPromise = resolve;
+        });
+    }
 
     // Ensure persistedRequests are read from storage before proceeding with the queue
     const connection = Onyx.connect({
@@ -196,7 +198,7 @@ function unpause() {
     const numberOfPersistedRequests = PersistedRequests.getAll().length || 0;
     Log.info(`[SequentialQueue] Unpausing the queue and flushing ${numberOfPersistedRequests} requests`);
     isQueuePaused = false;
-    flush();
+    flush(false);
 }
 
 function isRunning(): boolean {
@@ -252,7 +254,7 @@ function push(newRequest: OnyxRequest) {
 
     // If the queue is running this request will run once it has finished processing the current batch
     if (isSequentialQueueRunning) {
-        isReadyPromise.then(flush);
+        isReadyPromise.then(() => flush());
         return;
     }
 

tests/unit/APITest.ts

@@ -580,4 +580,23 @@ describe('APITests', () => {
                 expect(thirdRequestCommandName).toBe('MockCommandTwo');
             });
     });
+
+    test('Read request should not stuck when SequentialQueue is paused an resumed', async () => {
+        // Given 2 WRITE requests and 1 READ request where the first write request pauses the SequentialQueue
+        const xhr = jest.spyOn(HttpUtils, 'xhr').mockResolvedValueOnce({previousUpdateID: 1});
+        API.write('MockWriteCommandOne' as WriteCommand, {});
+        API.write('MockWriteCommandTwo' as WriteCommand, {});
+        API.read('MockReadCommand' as ReadCommand, null);
+
+        await waitForBatchedUpdates();
+
+        // When the SequentialQueue is unpaused
+        SequentialQueue.unpause();
+
+        await waitForBatchedUpdates();
+
+        // Then the pending READ command should be called
+        const [thirdCommand] = xhr.mock.calls.at(2) ?? [];
+        expect(thirdCommand).toBe('MockReadCommand');
+    });
 });