From 3cb455577ccc23611c75129c4e35dd294c8c98d9 Mon Sep 17 00:00:00 2001
From: VickyStash <vikstash@gmail.com>
Date: Thu, 4 Sep 2025 16:20:18 +0200
Subject: [PATCH 1/2] Bump onyx to v2.0.139

---
 package-lock.json | 8 ++++----
 package.json      | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 7aa0eb844518..bf2d338e1030 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.138",
+        "react-native-onyx": "2.0.139",
         "react-native-pager-view": "6.5.3",
         "react-native-pdf": "6.7.3",
         "react-native-performance": "^5.1.4",
@@ -31866,9 +31866,9 @@
       }
     },
     "node_modules/react-native-onyx": {
-      "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==",
+      "version": "2.0.139",
+      "resolved": "https://registry.npmjs.org/react-native-onyx/-/react-native-onyx-2.0.139.tgz",
+      "integrity": "sha512-WVgXYhCIJ4g7KbpSW17ekl7rMIIrY85GOsRjJCeURTcdwpS+qyNREcXAbtwZpN3zujkkhqe8vcU6lNdXR9l+yQ==",
       "license": "MIT",
       "dependencies": {
         "ascii-table": "0.0.9",
diff --git a/package.json b/package.json
index 59d268e4880c..6a30cc63014b 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.138",
+    "react-native-onyx": "2.0.139",
     "react-native-pager-view": "6.5.3",
     "react-native-pdf": "6.7.3",
     "react-native-performance": "^5.1.4",

From ae41a76186be1958edc9ce3b64a00df9e37060a3 Mon Sep 17 00:00:00 2001
From: VickyStash <vikstash@gmail.com>
Date: Mon, 8 Sep 2025 13:58:40 +0300
Subject: [PATCH 2/2] Fix PaginationTest

---
 tests/ui/PaginationTest.tsx | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tests/ui/PaginationTest.tsx b/tests/ui/PaginationTest.tsx
index c09583603757..93f50b8bc9b9 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,6 +342,7 @@ 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();