From da5ffc3448ac3607963b636163699ae4b1408bae Mon Sep 17 00:00:00 2001
From: Vit Horacek <36083550+mountiny@users.noreply.github.com>
Date: Tue, 9 Sep 2025 15:58:41 +0200
Subject: [PATCH] Revert "Bump onyx to v2.0.139"

---
 package-lock.json           | 8 ++++----
 package.json                | 2 +-
 tests/ui/PaginationTest.tsx | 3 +--
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 1ebec1dc3c50..82683f1087e7 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -114,7 +114,7 @@
         "react-native-modal": "^13.0.0",
         "react-native-nitro-modules": "0.26.2",
         "react-native-nitro-sqlite": "9.1.10",
-        "react-native-onyx": "2.0.139",
+        "react-native-onyx": "2.0.138",
         "react-native-pager-view": "6.5.3",
         "react-native-pdf": "6.7.3",
         "react-native-performance": "^5.1.4",
@@ -31872,9 +31872,9 @@
       }
     },
     "node_modules/react-native-onyx": {
-      "version": "2.0.139",
-      "resolved": "https://registry.npmjs.org/react-native-onyx/-/react-native-onyx-2.0.139.tgz",
-      "integrity": "sha512-WVgXYhCIJ4g7KbpSW17ekl7rMIIrY85GOsRjJCeURTcdwpS+qyNREcXAbtwZpN3zujkkhqe8vcU6lNdXR9l+yQ==",
+      "version": "2.0.138",
+      "resolved": "https://registry.npmjs.org/react-native-onyx/-/react-native-onyx-2.0.138.tgz",
+      "integrity": "sha512-8JeD5O4I/0Jg09lJmhBj1J+BgYxBofs834+7v5dm4zzuJ5bubdY7SRlaKQZ3acjUimsfO8dQfZGZfMzLWauegA==",
       "license": "MIT",
       "dependencies": {
         "ascii-table": "0.0.9",
diff --git a/package.json b/package.json
index c13d74e7417a..46fd7d3c0977 100644
--- a/package.json
+++ b/package.json
@@ -184,7 +184,7 @@
     "react-native-modal": "^13.0.0",
     "react-native-nitro-modules": "0.26.2",
     "react-native-nitro-sqlite": "9.1.10",
-    "react-native-onyx": "2.0.139",
+    "react-native-onyx": "2.0.138",
     "react-native-pager-view": "6.5.3",
     "react-native-pdf": "6.7.3",
     "react-native-performance": "^5.1.4",
diff --git a/tests/ui/PaginationTest.tsx b/tests/ui/PaginationTest.tsx
index 93f50b8bc9b9..c09583603757 100644
--- a/tests/ui/PaginationTest.tsx
+++ b/tests/ui/PaginationTest.tsx
@@ -96,9 +96,9 @@ async function navigateToSidebarOption(reportID: string): Promise<void> {
     await waitFor(() => {
         (NativeNavigation as NativeNavigationMock).triggerTransitionEnd();
     });
-    await waitForBatchedUpdatesWithAct();
     // ReportScreen relies on the onLayout event to receive updates from onyx.
     triggerListLayout(reportID);
+    await waitForBatchedUpdatesWithAct();
 }
 
 function buildCreatedAction(reportActionID: string, created: string) {
@@ -342,7 +342,6 @@ describe('Pagination', () => {
         });
         // Due to https://github.com/facebook/react-native/commit/3485e9ed871886b3e7408f90d623da5c018da493
         // we need to scroll too to trigger `onStartReached` which triggers other updates
-        await waitForBatchedUpdatesWithAct();
         scrollToOffset(0);
         // ReportScreen relies on the onLayout event to receive updates from onyx.
         triggerListLayout();