Merge pull request #24003 from Expensify/beaman-revertOnyxDirectCache…

…Access

[CP Staging] [Revert] Perf/onyx upgrade use cache directly

(cherry picked from commit a3c2e1b)

package.json

@@ -117,7 +117,7 @@
     "react-native-key-command": "^1.0.1",
     "react-native-localize": "^2.2.6",
     "react-native-modal": "^13.0.0",
-    "react-native-onyx": "1.0.56",
+    "react-native-onyx": "1.0.52",
     "react-native-pdf": "^6.6.2",
     "react-native-performance": "^4.0.0",
     "react-native-permissions": "^3.0.1",

src/libs/actions/QueuedOnyxUpdates.js

@@ -14,7 +14,7 @@ Onyx.connect({
  * @returns {Promise}
  */
 function queueOnyxUpdates(updates) {
-    return Onyx.set(ONYXKEYS.QUEUED_ONYX_UPDATES, [...queuedOnyxUpdates, ...updates]);
+    return Onyx.merge(ONYXKEYS.QUEUED_ONYX_UPDATES, updates);
 }
 
 function clear() {

tests/unit/EmojiTest.js

@@ -203,7 +203,7 @@ describe('EmojiTest', () => {
                     lastUpdatedAt: 1,
                 },
             ];
-            Onyx.set(ONYXKEYS.FREQUENTLY_USED_EMOJIS, frequentlyEmojisList);
+            Onyx.merge(ONYXKEYS.FREQUENTLY_USED_EMOJIS, frequentlyEmojisList);
 
             return waitForPromisesToResolve().then(() => {
                 // When add a new emoji
@@ -293,7 +293,7 @@ describe('EmojiTest', () => {
                 },
                 {...smileEmoji, count: 1, lastUpdatedAt: 1},
             ];
-            Onyx.set(ONYXKEYS.FREQUENTLY_USED_EMOJIS, frequentlyEmojisList);
+            Onyx.merge(ONYXKEYS.FREQUENTLY_USED_EMOJIS, frequentlyEmojisList);
 
             return waitForPromisesToResolve().then(() => {
                 // When add multiple emojis that either exist or not exist in the list
@@ -464,7 +464,7 @@ describe('EmojiTest', () => {
                 {...bookEmoji, count: 3, lastUpdatedAt: 1},
             ];
             expect(frequentlyEmojisList.length).toBe(CONST.EMOJI_FREQUENT_ROW_COUNT * CONST.EMOJI_NUM_PER_ROW);
-            Onyx.set(ONYXKEYS.FREQUENTLY_USED_EMOJIS, frequentlyEmojisList);
+            Onyx.merge(ONYXKEYS.FREQUENTLY_USED_EMOJIS, frequentlyEmojisList);
 
             return waitForPromisesToResolve().then(() => {
                 // When add new emojis

tests/unit/SidebarOrderTest.js

@@ -296,7 +296,8 @@ describe('Sidebar', () => {
                     })
 
                     // When the draft is removed
-                    .then(() => Onyx.merge(`${ONYXKEYS.COLLECTION.REPORT}${report.reportID}`, {hasDraft: false}))
+                    .then(() => Onyx.merge(`${ONYXKEYS.COLLECTION.REPORT}${report.reportID}`, {hasDraft: null}))
+
                     // Then the pencil icon goes away
                     .then(() => {
                         expect(screen.queryAllByTestId('Pencil Icon')).toHaveLength(0);