Merge branch '@chrispader/update-onyx-1.0.54' of github.com:margelo/e…

…xpensify-app-fork into perf/onyx-upgrade-use-cache-directly
Expensify · Jul 27, 2023 · 4e3de64 · 4e3de64
2 parents 568a2ca + 660470f
commit 4e3de64
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 6 deletions.
diff --git a/src/libs/actions/QueuedOnyxUpdates.js b/src/libs/actions/QueuedOnyxUpdates.js
@@ -14,7 +14,7 @@ Onyx.connect({
  * @returns {Promise}
  */
 function queueOnyxUpdates(updates) {
-    return Onyx.merge(ONYXKEYS.QUEUED_ONYX_UPDATES, updates);
+    return Onyx.set(ONYXKEYS.QUEUED_ONYX_UPDATES, [...queuedOnyxUpdates, ...updates]);
 }
 
 function clear() {

diff --git a/tests/unit/EmojiTest.js b/tests/unit/EmojiTest.js
@@ -203,7 +203,7 @@ describe('EmojiTest', () => {
                     lastUpdatedAt: 1,
                 },
             ];
-            Onyx.merge(ONYXKEYS.FREQUENTLY_USED_EMOJIS, frequentlyEmojisList);
+            Onyx.set(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.merge(ONYXKEYS.FREQUENTLY_USED_EMOJIS, frequentlyEmojisList);
+            Onyx.set(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.merge(ONYXKEYS.FREQUENTLY_USED_EMOJIS, frequentlyEmojisList);
+            Onyx.set(ONYXKEYS.FREQUENTLY_USED_EMOJIS, frequentlyEmojisList);
 
             return waitForPromisesToResolve().then(() => {
                 // When add new emojis

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