From 5c392669e6a49103ed11dfd90c3c3ac6102ff475 Mon Sep 17 00:00:00 2001 From: Christoph Pader Date: Wed, 19 Jul 2023 09:30:09 +0200 Subject: [PATCH 1/6] update react-native-onyx to 1.0.54 --- package-lock.json | 14 +++++++------- package.json | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/package-lock.json b/package-lock.json index 129df2684cbe..6a65f49ce868 100644 --- a/package-lock.json +++ b/package-lock.json @@ -77,7 +77,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.52", + "react-native-onyx": "^1.0.54", "react-native-pdf": "^6.6.2", "react-native-performance": "^4.0.0", "react-native-permissions": "^3.0.1", @@ -36783,9 +36783,9 @@ } }, "node_modules/react-native-onyx": { - "version": "1.0.52", - "resolved": "https://registry.npmjs.org/react-native-onyx/-/react-native-onyx-1.0.52.tgz", - "integrity": "sha512-lfIg+tSd+HZF00pr2oFoLY3iTdGYGC6Dd44/YktTsVKB/yIcUq61wBMOitX54Z54ac2/eHKFPicEr2xvBhE2VQ==", + "version": "1.0.54", + "resolved": "https://registry.npmjs.org/react-native-onyx/-/react-native-onyx-1.0.54.tgz", + "integrity": "sha512-6+BvAtjRYNKpMYj0XDSFiR6ZGXzQa58uF/KDCp7pLEcXBBAXytQty9LZSegjz8UbsjxwRxzKz4G8dMgEs+D6Bw==", "dependencies": { "ascii-table": "0.0.9", "fast-equals": "^4.0.3", @@ -68541,9 +68541,9 @@ } }, "react-native-onyx": { - "version": "1.0.52", - "resolved": "https://registry.npmjs.org/react-native-onyx/-/react-native-onyx-1.0.52.tgz", - "integrity": "sha512-lfIg+tSd+HZF00pr2oFoLY3iTdGYGC6Dd44/YktTsVKB/yIcUq61wBMOitX54Z54ac2/eHKFPicEr2xvBhE2VQ==", + "version": "1.0.54", + "resolved": "https://registry.npmjs.org/react-native-onyx/-/react-native-onyx-1.0.54.tgz", + "integrity": "sha512-6+BvAtjRYNKpMYj0XDSFiR6ZGXzQa58uF/KDCp7pLEcXBBAXytQty9LZSegjz8UbsjxwRxzKz4G8dMgEs+D6Bw==", "requires": { "ascii-table": "0.0.9", "fast-equals": "^4.0.3", diff --git a/package.json b/package.json index 3c24af809a71..e6d8ce1adc1c 100644 --- a/package.json +++ b/package.json @@ -115,7 +115,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.52", + "react-native-onyx": "^1.0.54", "react-native-pdf": "^6.6.2", "react-native-performance": "^4.0.0", "react-native-permissions": "^3.0.1", From a36c95499ca047b088e910d9e852f529dd72bee8 Mon Sep 17 00:00:00 2001 From: Christoph Pader Date: Tue, 25 Jul 2023 13:27:19 +0200 Subject: [PATCH 2/6] fix: manually concatenate arrays in QueuedOnyxUpdates --- src/libs/actions/QueuedOnyxUpdates.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libs/actions/QueuedOnyxUpdates.js b/src/libs/actions/QueuedOnyxUpdates.js index d25f44a9aa60..486108dd56cf 100644 --- 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() { From 5db806059028d55b261f6a4d407542b75a9ba2d9 Mon Sep 17 00:00:00 2001 From: Christoph Pader Date: Tue, 25 Jul 2023 14:29:40 +0200 Subject: [PATCH 3/6] fix: invalid usage of Onyx.merge with arrays --- tests/unit/EmojiTest.js | 6 +++--- tests/unit/SidebarOrderTest.js | 3 +-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/tests/unit/EmojiTest.js b/tests/unit/EmojiTest.js index 0e9b7a7c8c0f..69f38fa349af 100644 --- 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 index 7c0e12e6b1bc..a4a2873399c3 100644 --- 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); From 8d438143934df996207d9bbf8f88aaa466103f85 Mon Sep 17 00:00:00 2001 From: Christoph Pader Date: Thu, 27 Jul 2023 11:57:37 +0200 Subject: [PATCH 4/6] update react-native-onyx to 1.0.55 --- package-lock.json | 14 +++++++------- package.json | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/package-lock.json b/package-lock.json index ac5be0b833d6..e4231818b96a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -77,7 +77,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.54", + "react-native-onyx": "^1.0.55", "react-native-pdf": "^6.6.2", "react-native-performance": "^4.0.0", "react-native-permissions": "^3.0.1", @@ -36783,9 +36783,9 @@ } }, "node_modules/react-native-onyx": { - "version": "1.0.54", - "resolved": "https://registry.npmjs.org/react-native-onyx/-/react-native-onyx-1.0.54.tgz", - "integrity": "sha512-6+BvAtjRYNKpMYj0XDSFiR6ZGXzQa58uF/KDCp7pLEcXBBAXytQty9LZSegjz8UbsjxwRxzKz4G8dMgEs+D6Bw==", + "version": "1.0.55", + "resolved": "https://registry.npmjs.org/react-native-onyx/-/react-native-onyx-1.0.55.tgz", + "integrity": "sha512-JtdlBUDT6/7IbE2jBFheKR8BJB43qnD1t3RFanvLSHwQz6thRyMkApHfiFSrsQUbdFw1MYKMLCt5cTvFxQzDmA==", "dependencies": { "ascii-table": "0.0.9", "fast-equals": "^4.0.3", @@ -68541,9 +68541,9 @@ } }, "react-native-onyx": { - "version": "1.0.54", - "resolved": "https://registry.npmjs.org/react-native-onyx/-/react-native-onyx-1.0.54.tgz", - "integrity": "sha512-6+BvAtjRYNKpMYj0XDSFiR6ZGXzQa58uF/KDCp7pLEcXBBAXytQty9LZSegjz8UbsjxwRxzKz4G8dMgEs+D6Bw==", + "version": "1.0.55", + "resolved": "https://registry.npmjs.org/react-native-onyx/-/react-native-onyx-1.0.55.tgz", + "integrity": "sha512-JtdlBUDT6/7IbE2jBFheKR8BJB43qnD1t3RFanvLSHwQz6thRyMkApHfiFSrsQUbdFw1MYKMLCt5cTvFxQzDmA==", "requires": { "ascii-table": "0.0.9", "fast-equals": "^4.0.3", diff --git a/package.json b/package.json index 7bc725383f88..25e13453a99a 100644 --- a/package.json +++ b/package.json @@ -115,7 +115,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.54", + "react-native-onyx": "^1.0.55", "react-native-pdf": "^6.6.2", "react-native-performance": "^4.0.0", "react-native-permissions": "^3.0.1", From 660470f0e4ab4953590d090a8c425ebee826f4e8 Mon Sep 17 00:00:00 2001 From: Christoph Pader Date: Thu, 27 Jul 2023 11:58:44 +0200 Subject: [PATCH 5/6] change onyx to fixed version --- package-lock.json | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package-lock.json b/package-lock.json index e4231818b96a..a61590540259 100644 --- a/package-lock.json +++ b/package-lock.json @@ -77,7 +77,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.55", + "react-native-onyx": "1.0.55", "react-native-pdf": "^6.6.2", "react-native-performance": "^4.0.0", "react-native-permissions": "^3.0.1", diff --git a/package.json b/package.json index 25e13453a99a..c2bd7bc3885a 100644 --- a/package.json +++ b/package.json @@ -115,7 +115,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.55", + "react-native-onyx": "1.0.55", "react-native-pdf": "^6.6.2", "react-native-performance": "^4.0.0", "react-native-permissions": "^3.0.1", From 568a2ca6f2ce7a3ac48638b9eb51cc20acbac982 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hanno=20J=2E=20G=C3=B6decke?= Date: Thu, 27 Jul 2023 18:27:51 +0200 Subject: [PATCH 6/6] upgrade onyx --- package-lock.json | 14 +++++++------- package.json | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/package-lock.json b/package-lock.json index c42cd68688d8..187e4779c991 100644 --- a/package-lock.json +++ b/package-lock.json @@ -77,7 +77,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.52", + "react-native-onyx": "1.0.56", "react-native-pdf": "^6.6.2", "react-native-performance": "^4.0.0", "react-native-permissions": "^3.0.1", @@ -36783,9 +36783,9 @@ } }, "node_modules/react-native-onyx": { - "version": "1.0.52", - "resolved": "https://registry.npmjs.org/react-native-onyx/-/react-native-onyx-1.0.52.tgz", - "integrity": "sha512-lfIg+tSd+HZF00pr2oFoLY3iTdGYGC6Dd44/YktTsVKB/yIcUq61wBMOitX54Z54ac2/eHKFPicEr2xvBhE2VQ==", + "version": "1.0.56", + "resolved": "https://registry.npmjs.org/react-native-onyx/-/react-native-onyx-1.0.56.tgz", + "integrity": "sha512-6KHwCwCgTtgZ2gGgCFxbJRRL4e2tamCjdbb9ca0jDCUgxZ6NQkEkVhZLaFCPwQn1dX7zonbdbaciFjlUxyOVFQ==", "dependencies": { "ascii-table": "0.0.9", "fast-equals": "^4.0.3", @@ -68541,9 +68541,9 @@ } }, "react-native-onyx": { - "version": "1.0.52", - "resolved": "https://registry.npmjs.org/react-native-onyx/-/react-native-onyx-1.0.52.tgz", - "integrity": "sha512-lfIg+tSd+HZF00pr2oFoLY3iTdGYGC6Dd44/YktTsVKB/yIcUq61wBMOitX54Z54ac2/eHKFPicEr2xvBhE2VQ==", + "version": "1.0.56", + "resolved": "https://registry.npmjs.org/react-native-onyx/-/react-native-onyx-1.0.56.tgz", + "integrity": "sha512-6KHwCwCgTtgZ2gGgCFxbJRRL4e2tamCjdbb9ca0jDCUgxZ6NQkEkVhZLaFCPwQn1dX7zonbdbaciFjlUxyOVFQ==", "requires": { "ascii-table": "0.0.9", "fast-equals": "^4.0.3", diff --git a/package.json b/package.json index 52fcd5cb7daa..4bb088aae76c 100644 --- a/package.json +++ b/package.json @@ -115,7 +115,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.52", + "react-native-onyx": "1.0.56", "react-native-pdf": "^6.6.2", "react-native-performance": "^4.0.0", "react-native-permissions": "^3.0.1",