From f5f579efdb98a7987dff262b273bc882a2582a72 Mon Sep 17 00:00:00 2001
From: Andrew Gable <andrew@expensify.com>
Date: Tue, 16 Jan 2024 12:54:08 -0700
Subject: [PATCH] Merge pull request #34596 from
 Expensify/revert-33554-@chrispader/onyx-replay-effect-fix

[CP Staging] Revert "Bump Onyx (Fix Replay effect)"

(cherry picked from commit 3e9d21c4beec51d82d081d930483ed9eafa39f5f)
---
 package-lock.json                    | 18 +++++++++---------
 package.json                         |  2 +-
 tests/unit/MigrationTest.js          |  4 ++--
 tests/unit/ReportActionsUtilsTest.js |  2 +-
 4 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index f0078d434fbc..af2f3ebdabb9 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -94,7 +94,7 @@
         "react-native-linear-gradient": "^2.8.1",
         "react-native-localize": "^2.2.6",
         "react-native-modal": "^13.0.0",
-        "react-native-onyx": "1.0.126",
+        "react-native-onyx": "1.0.118",
         "react-native-pager-view": "6.2.2",
         "react-native-pdf": "6.7.3",
         "react-native-performance": "^5.1.0",
@@ -47034,17 +47034,17 @@
       }
     },
     "node_modules/react-native-onyx": {
-      "version": "1.0.126",
-      "resolved": "https://registry.npmjs.org/react-native-onyx/-/react-native-onyx-1.0.126.tgz",
-      "integrity": "sha512-tUJI1mQaWXLfyBFYQQWM6mm9GiCqIXGvjbqJkH1fLY3OqbGW6DyH4CxC+qJrqfi4bKZgZHp5xlBHhkPV4pKK2A==",
+      "version": "1.0.118",
+      "resolved": "https://registry.npmjs.org/react-native-onyx/-/react-native-onyx-1.0.118.tgz",
+      "integrity": "sha512-w54jO+Bpu1ElHsrxZXIIpcBqNkrUvuVCQmwWdfOW5LvO4UwsPSwmMxzExbUZ4ip+7CROmm10IgXFaAoyfeYSVQ==",
       "dependencies": {
         "ascii-table": "0.0.9",
         "fast-equals": "^4.0.3",
         "underscore": "^1.13.6"
       },
       "engines": {
-        "node": "20.9.0",
-        "npm": "10.1.0"
+        "node": ">=16.15.1 <=20.9.0",
+        "npm": ">=8.11.0 <=10.1.0"
       },
       "peerDependencies": {
         "idb-keyval": "^6.2.1",
@@ -89702,9 +89702,9 @@
       }
     },
     "react-native-onyx": {
-      "version": "1.0.126",
-      "resolved": "https://registry.npmjs.org/react-native-onyx/-/react-native-onyx-1.0.126.tgz",
-      "integrity": "sha512-tUJI1mQaWXLfyBFYQQWM6mm9GiCqIXGvjbqJkH1fLY3OqbGW6DyH4CxC+qJrqfi4bKZgZHp5xlBHhkPV4pKK2A==",
+      "version": "1.0.118",
+      "resolved": "https://registry.npmjs.org/react-native-onyx/-/react-native-onyx-1.0.118.tgz",
+      "integrity": "sha512-w54jO+Bpu1ElHsrxZXIIpcBqNkrUvuVCQmwWdfOW5LvO4UwsPSwmMxzExbUZ4ip+7CROmm10IgXFaAoyfeYSVQ==",
       "requires": {
         "ascii-table": "0.0.9",
         "fast-equals": "^4.0.3",
diff --git a/package.json b/package.json
index 0eb11fbde3e2..120b2113ef9a 100644
--- a/package.json
+++ b/package.json
@@ -142,7 +142,7 @@
     "react-native-linear-gradient": "^2.8.1",
     "react-native-localize": "^2.2.6",
     "react-native-modal": "^13.0.0",
-    "react-native-onyx": "1.0.126",
+    "react-native-onyx": "1.0.118",
     "react-native-pager-view": "6.2.2",
     "react-native-pdf": "6.7.3",
     "react-native-performance": "^5.1.0",
diff --git a/tests/unit/MigrationTest.js b/tests/unit/MigrationTest.js
index 4a363d1de36b..ebffc71e4e0e 100644
--- a/tests/unit/MigrationTest.js
+++ b/tests/unit/MigrationTest.js
@@ -51,8 +51,8 @@ describe('Migrations', () => {
         it('Should remove any individual reportActions that have no data in Onyx', () =>
             Onyx.multiSet({
                 [`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}1`]: {
-                    1: {},
-                    2: {},
+                    1: null,
+                    2: null,
                 },
             })
                 .then(PersonalDetailsByAccountID)
diff --git a/tests/unit/ReportActionsUtilsTest.js b/tests/unit/ReportActionsUtilsTest.js
index 19a89d1c892c..b8b6eb5e7673 100644
--- a/tests/unit/ReportActionsUtilsTest.js
+++ b/tests/unit/ReportActionsUtilsTest.js
@@ -368,7 +368,7 @@ describe('ReportActionsUtils', () => {
                                     callback: () => {
                                         Onyx.disconnect(connectionID);
                                         const res = ReportActionsUtils.getLastVisibleAction(report.reportID);
-                                        expect(res).toEqual(action2);
+                                        expect(res).toBe(action2);
                                         resolve();
                                     },
                                 });