From 27c4e071033b42c6dc48da421d821b33bc63475a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?F=C3=A1bio=20Henriques?= Date: Tue, 19 May 2026 08:53:54 +0100 Subject: [PATCH 01/10] Bump Onyx to 3.0.75 --- 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 f2ecb53257a2..c2ef245b1ffb 100644 --- a/package-lock.json +++ b/package-lock.json @@ -115,7 +115,7 @@ "react-native-localize": "^3.5.4", "react-native-nitro-modules": "0.35.0", "react-native-nitro-sqlite": "9.6.0", - "react-native-onyx": "3.0.71", + "react-native-onyx": "3.0.75", "react-native-pager-view": "8.0.0", "react-native-pdf": "7.0.2", "react-native-permissions": "^5.4.0", @@ -34993,9 +34993,9 @@ } }, "node_modules/react-native-onyx": { - "version": "3.0.71", - "resolved": "https://registry.npmjs.org/react-native-onyx/-/react-native-onyx-3.0.71.tgz", - "integrity": "sha512-q84y7aULjoRtQMjLP7fXYtI0nDROyfCgSKHEgZNHBwSvSogOEbGbsHw9qGm6jFIjIoOJf6Hzd3+FnIrFu+WVEQ==", + "version": "3.0.75", + "resolved": "https://registry.npmjs.org/react-native-onyx/-/react-native-onyx-3.0.75.tgz", + "integrity": "sha512-HcfN0/uhBjEH7GRrWJtslYb3KlxFSSnIlNcYm0EZsWvdiHQFj9pBgNrpLVRUUMCkmU02aRsu/ZXwuDjnjZ+d6Q==", "license": "MIT", "dependencies": { "ascii-table": "0.0.9", diff --git a/package.json b/package.json index 1cc20fdcb3e2..4d6114d1744d 100644 --- a/package.json +++ b/package.json @@ -179,7 +179,7 @@ "react-native-localize": "^3.5.4", "react-native-nitro-modules": "0.35.0", "react-native-nitro-sqlite": "9.6.0", - "react-native-onyx": "3.0.71", + "react-native-onyx": "3.0.75", "react-native-pager-view": "8.0.0", "react-native-pdf": "7.0.2", "react-native-permissions": "^5.4.0", From cd5720fb7edbef192f3052363a1a8f2ad27786c1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?F=C3=A1bio=20Henriques?= Date: Tue, 19 May 2026 10:26:33 +0100 Subject: [PATCH 02/10] Remove Onyx patch --- patches/react-native-onyx/details.md | 11 --- .../react-native-onyx+3.0.71.patch | 67 ------------------- 2 files changed, 78 deletions(-) delete mode 100644 patches/react-native-onyx/details.md delete mode 100644 patches/react-native-onyx/react-native-onyx+3.0.71.patch diff --git a/patches/react-native-onyx/details.md b/patches/react-native-onyx/details.md deleted file mode 100644 index 765902c6dd6c..000000000000 --- a/patches/react-native-onyx/details.md +++ /dev/null @@ -1,11 +0,0 @@ -# `react-native-onyx` patches - -### [react-native-onyx+3.0.71.patch](react-native-onyx+3.0.71.patch) - -- Reason: - - > Reverts [Onyx PR #770 (the subscription-side skip for skippable collection member ids in subscribeToKey)](https://github.com/Expensify/react-native-onyx/pull/770) and the line [PR #779](https://github.com/Expensify/react-native-onyx/pull/779) added to work around [PR #770](https://github.com/Expensify/react-native-onyx/pull/770)'s silent-no-callback contract. - -- Upstream PR/issue: https://github.com/Expensify/react-native-onyx/pull/785 -- E/App issue: https://github.com/Expensify/App/issues/86181 -- PR Introducing Patch: https://github.com/Expensify/App/pull/90764 \ No newline at end of file diff --git a/patches/react-native-onyx/react-native-onyx+3.0.71.patch b/patches/react-native-onyx/react-native-onyx+3.0.71.patch deleted file mode 100644 index 90666509eba5..000000000000 --- a/patches/react-native-onyx/react-native-onyx+3.0.71.patch +++ /dev/null @@ -1,67 +0,0 @@ -diff --git a/node_modules/react-native-onyx/dist/OnyxUtils.js b/node_modules/react-native-onyx/dist/OnyxUtils.js -index de56f94..495d378 100644 ---- a/node_modules/react-native-onyx/dist/OnyxUtils.js -+++ b/node_modules/react-native-onyx/dist/OnyxUtils.js -@@ -868,24 +868,6 @@ function subscribeToKey(connectOptions) { - const subscriptionID = lastSubscriptionID++; - callbackToStateMapping[subscriptionID] = mapping; - callbackToStateMapping[subscriptionID].subscriptionID = subscriptionID; -- // If the subscriber is attempting to connect to a collection member whose ID is skippable (e.g. "undefined", "null", etc.) -- // we suppress wiring the subscription fully to avoid unnecessary callback emissions such as for "report_undefined". -- // We still return a valid subscriptionID so callers can disconnect safely. -- try { -- const skippableIDs = getSkippableCollectionMemberIDs(); -- if (skippableIDs.size) { -- const [, collectionMemberID] = OnyxKeys_1.default.splitCollectionMemberKey(mapping.key); -- if (skippableIDs.has(collectionMemberID)) { -- // Clean up the provisional mapping to avoid retaining unused subscribers. -- OnyxCache_1.default.addNullishStorageKey(mapping.key); -- delete callbackToStateMapping[subscriptionID]; -- return subscriptionID; -- } -- } -- } -- catch (e) { -- // Not a collection member key, proceed as usual. -- } - // When keyChanged is called, a key is passed and the method looks through all the Subscribers in callbackToStateMapping for the matching key to get the subscriptionID - // to avoid having to loop through all the Subscribers all the time (even when just one connection belongs to one key), - // We create a mapping from key to lists of subscriptionIDs to access the specific list of subscriptionIDs. -@@ -1394,12 +1376,6 @@ function logKeyChanged(onyxMethod, key, value, hasChanged) { - function logKeyRemoved(onyxMethod, key) { - Logger.logInfo(`${onyxMethod} called for key: ${key} => null passed, so key was removed`); - } --/** -- * Getter - returns the callback to state mapping, useful in test environments. -- */ --function getCallbackToStateMapping() { -- return callbackToStateMapping; --} - /** - * Clear internal variables used in this file, useful in test environments. - */ -@@ -1458,6 +1434,5 @@ const OnyxUtils = { - setWithRetry, - multiSetWithRetry, - setCollectionWithRetry, -- getCallbackToStateMapping, - }; - exports.default = OnyxUtils; -diff --git a/node_modules/react-native-onyx/dist/useOnyx.js b/node_modules/react-native-onyx/dist/useOnyx.js -index 9213cff..2e48c73 100644 ---- a/node_modules/react-native-onyx/dist/useOnyx.js -+++ b/node_modules/react-native-onyx/dist/useOnyx.js -@@ -220,12 +220,8 @@ function useOnyx(key, options, dependencies = []) { - newValueRef.current = null; - sourceValueRef.current = undefined; - resultRef.current = [undefined, { status: (options === null || options === void 0 ? void 0 : options.initWithStoredValues) === false ? 'loaded' : 'loading' }]; -+ shouldGetCachedValueRef.current = true; - } -- // Force a cache re-read on every (re)subscription so any side effects from -- // subscribeToKey (e.g. addNullishStorageKey for skippable collection member ids) -- // are reflected in the next getSnapshot. Resetting this flag does not change -- // resultRef by itself, so it doesn't cause an extra mount render. -- shouldGetCachedValueRef.current = true; - hasMountedRef.current = true; - isConnectingRef.current = true; - onStoreChangeFnRef.current = onStoreChange; From 71eea111a3f9eefc69b5961866b836777c6bdbf2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?F=C3=A1bio=20Henriques?= Date: Fri, 12 Jun 2026 14:29:25 +0100 Subject: [PATCH 03/10] Use newest Onyx changes from Onyx store-based PR 1 --- 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 c66c94d2fc9b..80e68e7391e9 100644 --- a/package-lock.json +++ b/package-lock.json @@ -120,7 +120,7 @@ "react-native-localize": "^3.5.4", "react-native-nitro-modules": "0.35.0", "react-native-nitro-sqlite": "9.6.0", - "react-native-onyx": "3.0.83", + "react-native-onyx": "git+https://github.com/Expensify/react-native-onyx.git#01704211bf9363641843f2ecb826bc0633fdce07", "react-native-pager-view": "8.0.0", "react-native-pdf": "7.0.2", "react-native-permissions": "^5.4.0", @@ -35672,9 +35672,9 @@ } }, "node_modules/react-native-onyx": { - "version": "3.0.83", - "resolved": "https://registry.npmjs.org/react-native-onyx/-/react-native-onyx-3.0.83.tgz", - "integrity": "sha512-/OIwvQeXkVaKNsdHWbS1T/16o0iWOlX5KOMF6USKq3ePRVfhBzEOczNgtchAZ5MDStqnZMLNbOsTLwFjLJu56w==", + "version": "3.0.86", + "resolved": "git+ssh://git@github.com/Expensify/react-native-onyx.git#01704211bf9363641843f2ecb826bc0633fdce07", + "integrity": "sha512-OLmcVyXow+O6PbHZ0YvEisw/1cDSiJ9xuMbytQzVDF77cM03CN8p8cF+orRFT1MNSNZ6Jt50giQpFbJCW9XLvA==", "license": "MIT", "dependencies": { "ascii-table": "0.0.9", diff --git a/package.json b/package.json index f6370118ed66..3313b3063acb 100644 --- a/package.json +++ b/package.json @@ -193,7 +193,7 @@ "react-native-localize": "^3.5.4", "react-native-nitro-modules": "0.35.0", "react-native-nitro-sqlite": "9.6.0", - "react-native-onyx": "3.0.83", + "react-native-onyx": "git+https://github.com/Expensify/react-native-onyx.git#01704211bf9363641843f2ecb826bc0633fdce07", "react-native-pager-view": "8.0.0", "react-native-pdf": "7.0.2", "react-native-permissions": "^5.4.0", From 7eecb00ccbdff231573834114ce61c709789b9ec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?F=C3=A1bio=20Henriques?= Date: Wed, 27 May 2026 19:20:17 +0100 Subject: [PATCH 04/10] Refactor collection key Onyx.connect cases (cherry picked from commit 535279b0849d6c4d554d998e9a258087a9b993f8) --- src/libs/actions/Report/index.ts | 17 ++++++++++----- src/libs/actions/Transaction.ts | 21 ++++++++++++++++--- ...replaceOptimisticReportWithActualReport.ts | 17 ++++++++++----- tests/actions/ReportTest.ts | 12 +++++------ 4 files changed, 48 insertions(+), 19 deletions(-) diff --git a/src/libs/actions/Report/index.ts b/src/libs/actions/Report/index.ts index c5bfa6d6c1e6..f2e88d028f69 100644 --- a/src/libs/actions/Report/index.ts +++ b/src/libs/actions/Report/index.ts @@ -401,7 +401,7 @@ type AddAttachmentWithCommentParams = { const addNewMessageWithText = new Set([WRITE_COMMANDS.ADD_COMMENT, WRITE_COMMANDS.ADD_TEXT_AND_ATTACHMENT]); // map of reportID to all reportActions for that report -const allReportActions: OnyxCollection = {}; +let allReportActions: OnyxCollection = {}; const STALE_DM_RECOVERY_TARGET_TTL_MS = 30000; const staleDMRecoveryTargetBySourceReportID: Record = {}; const staleDMRecoverySourceByTargetReportID: Record = {}; @@ -452,12 +452,19 @@ function clearStaleDMRecoveryTargetByTargetReportID(targetReportID: string) { Onyx.connect({ key: ONYXKEYS.COLLECTION.REPORT_ACTIONS, - callback: (actions, key) => { - if (!key || !actions) { + callback: (snapshot) => { + if (!snapshot) { + allReportActions = {}; return; } - const reportID = CollectionUtils.extractCollectionItemID(key); - allReportActions[reportID] = actions; + // Rebuild the rawID-keyed view from the prefixed-key snapshot. Each value + // shares its reference with the snapshot, so downstream consumers still + // benefit from structural-sharing ref-stability for unchanged members. + const next: OnyxCollection = {}; + for (const [k, v] of Object.entries(snapshot as unknown as Record)) { + next[CollectionUtils.extractCollectionItemID(k as `${typeof ONYXKEYS.COLLECTION.REPORT_ACTIONS}${string}`)] = v; + } + allReportActions = next; }, }); diff --git a/src/libs/actions/Transaction.ts b/src/libs/actions/Transaction.ts index 6307a8181666..1e618805ae45 100644 --- a/src/libs/actions/Transaction.ts +++ b/src/libs/actions/Transaction.ts @@ -12,6 +12,7 @@ import type { TransactionThreadInfo, } from '@libs/API/parameters'; import {READ_COMMANDS, WRITE_COMMANDS} from '@libs/API/types'; +import * as CollectionUtils from '@libs/CollectionUtils'; import {getCurrencySymbol} from '@libs/CurrencyUtils'; import DateUtils from '@libs/DateUtils'; import DistanceRequestUtils from '@libs/DistanceRequestUtils'; @@ -95,10 +96,21 @@ Onyx.connect({ }, }); -let allTransactionViolations: TransactionViolations = []; +let allTransactionViolation: OnyxCollection = {}; Onyx.connect({ key: ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS, - callback: (val) => (allTransactionViolations = val ?? []), + callback: (snapshot) => { + if (!snapshot) { + allTransactionViolation = {}; + return; + } + // Rebuild the transactionID-keyed view from the prefixed-key snapshot. + const next: OnyxCollection = {}; + for (const [k, v] of Object.entries(snapshot as unknown as Record)) { + next[CollectionUtils.extractCollectionItemID(k as `${typeof ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS}${string}`)] = v; + } + allTransactionViolation = next; + }, }); type SaveWaypointProps = { @@ -1136,7 +1148,10 @@ function changeTransactionsReport({ optimisticData.push({ onyxMethod: Onyx.METHOD.SET, key: `${ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS}${id}`, - value: allTransactionViolations.filter((violation: TransactionViolation) => violation.name !== CONST.VIOLATIONS.DUPLICATED_TRANSACTION), + // For each duplicate, write its own violations minus the DUPLICATED_TRANSACTION marker. + // Previously this read a stale `allTransactionViolations` flat-array that held only + // the last-fired per-member value (latent bug, now removed alongside per-member dispatch). + value: (allTransactionViolation?.[id] ?? []).filter((violation: TransactionViolation) => violation.name !== CONST.VIOLATIONS.DUPLICATED_TRANSACTION), }); } } diff --git a/src/libs/actions/replaceOptimisticReportWithActualReport.ts b/src/libs/actions/replaceOptimisticReportWithActualReport.ts index 0bb103ce149f..65c4a2064389 100644 --- a/src/libs/actions/replaceOptimisticReportWithActualReport.ts +++ b/src/libs/actions/replaceOptimisticReportWithActualReport.ts @@ -43,16 +43,23 @@ Onyx.connectWithoutView({ let allReports: OnyxCollection; -const allReportActions: OnyxCollection = {}; +let allReportActions: OnyxCollection = {}; // Report actions are cached only to resolve parent actions for IOU cleanup; no UI subscribes, so connectWithoutView() is used. Onyx.connectWithoutView({ key: ONYXKEYS.COLLECTION.REPORT_ACTIONS, - callback: (actions, key) => { - if (!key || !actions) { + callback: (snapshot) => { + if (!snapshot) { + allReportActions = {}; return; } - const reportID = key.replace(ONYXKEYS.COLLECTION.REPORT_ACTIONS, ''); - allReportActions[reportID] = actions; + // Rebuild the rawID-keyed view from the prefixed-key snapshot. Each value + // shares its reference with the snapshot, preserving structural-sharing + // ref-stability for unchanged members. + const next: OnyxCollection = {}; + for (const [k, v] of Object.entries(snapshot as unknown as Record)) { + next[k.replace(ONYXKEYS.COLLECTION.REPORT_ACTIONS, '')] = v; + } + allReportActions = next; }, }); diff --git a/tests/actions/ReportTest.ts b/tests/actions/ReportTest.ts index b25f9e3ea898..3eae033bbf22 100644 --- a/tests/actions/ReportTest.ts +++ b/tests/actions/ReportTest.ts @@ -945,11 +945,11 @@ describe('actions/Report', () => { key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${REPORT_ID}`, callback: (val) => (reportActions = val ?? {}), }); - const reportActionsReactions: OnyxCollection = {}; + let reportActionsReactions: OnyxCollection = {}; Onyx.connect({ key: ONYXKEYS.COLLECTION.REPORT_ACTIONS_REACTIONS, - callback: (val, key) => { - reportActionsReactions[key] = val ?? {}; + callback: (snapshot) => { + reportActionsReactions = snapshot ?? {}; }, }); let reportAction: OnyxTypes.ReportAction | undefined; @@ -1083,11 +1083,11 @@ describe('actions/Report', () => { key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${REPORT_ID}`, callback: (val) => (reportActions = val ?? {}), }); - const reportActionsReactions: OnyxCollection = {}; + let reportActionsReactions: OnyxCollection = {}; Onyx.connect({ key: ONYXKEYS.COLLECTION.REPORT_ACTIONS_REACTIONS, - callback: (val, key) => { - reportActionsReactions[key] = val ?? {}; + callback: (snapshot) => { + reportActionsReactions = snapshot ?? {}; }, }); From 6008df27da5b587c897c0c32a080d53b1ed89d47 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?F=C3=A1bio=20Henriques?= Date: Fri, 12 Jun 2026 17:58:13 +0100 Subject: [PATCH 05/10] Remove waitForCollectionCallback usages and fix resulting type errors The waitForCollectionCallback connect option no longer exists in Onyx store-based PR 1, so remove all usages across the app. Collection-root subscriptions now always deliver snapshots, so the now-properly-typed snapshot callbacks no longer need the `as unknown as Record<...>` casts; rebuild the rawID-keyed views with a plain `.replace()`. Also fix a couple of resulting test type errors: type the collected collection vars in ReportTest as non-undefined, and cast the resolved value in the getOnyxValue single-key helper. --- src/libs/DistanceRequestUtils.ts | 1 - src/libs/Fullstory/common.ts | 1 - src/libs/Middleware/Pagination.ts | 2 - .../Notification/LocalNotification/index.ts | 2 - src/libs/OptionsListUtils/index.ts | 2 - src/libs/Parser.ts | 1 - src/libs/ReportActionsUtils.ts | 3 - src/libs/ReportTitleUtils.ts | 1 - src/libs/ReportUtils.ts | 8 -- src/libs/UnreadIndicatorUpdater/index.ts | 4 - src/libs/actions/App.ts | 2 - src/libs/actions/ClearReportActionErrors.ts | 2 - src/libs/actions/Export.ts | 1 - src/libs/actions/IOU/index.ts | 7 - src/libs/actions/OnyxDerived/index.ts | 1 - src/libs/actions/Policy/Member.ts | 1 - src/libs/actions/Policy/Policy.ts | 1 - .../actions/Report/MarkAllMessageAsRead.tsx | 2 - src/libs/actions/Report/index.ts | 7 +- src/libs/actions/SplitExpenses.ts | 4 - src/libs/actions/Transaction.ts | 14 +- src/libs/actions/TransactionInlineEdit.ts | 4 - ...replaceOptimisticReportWithActualReport.ts | 4 +- src/libs/registerPaginationConfig.ts | 2 - src/libs/telemetry/TelemetrySynchronizer.ts | 2 - src/setup/addUtilsToWindow.ts | 1 - tests/actions/AttachmentTest.ts | 6 - tests/actions/DomainTest.ts | 19 --- .../actions/IOU/CreateDraftTransactionTest.ts | 4 - tests/actions/IOU/PerDiemTest.ts | 2 - tests/actions/IOU/RequestMoneyTest.ts | 40 ------ .../actions/IOUTest/DeleteMoneyRequestTest.ts | 28 ---- tests/actions/IOUTest/DuplicateTest.ts | 14 -- tests/actions/IOUTest/PayMoneyRequestTest.ts | 21 --- tests/actions/IOUTest/ReceiptTest.ts | 1 - .../actions/IOUTest/RejectMoneyRequestTest.ts | 1 - tests/actions/IOUTest/ReportWorkflowTest.ts | 25 ---- tests/actions/IOUTest/SendInvoiceTest.ts | 1 - tests/actions/IOUTest/SplitSelfDMTest.ts | 18 --- tests/actions/IOUTest/SplitTest.ts | 134 ++---------------- tests/actions/IOUTest/TrackExpenseTest.ts | 45 ------ .../actions/IOUTest/UpdateMoneyRequestTest.ts | 2 - tests/actions/MergeTransactionTest.ts | 4 - tests/actions/PolicyCategoryTest.ts | 20 --- tests/actions/PolicyMemberTest.ts | 22 --- tests/actions/PolicyProfileTest.ts | 2 - tests/actions/PolicyRulesTest.ts | 1 - tests/actions/PolicyTagTest.ts | 5 - tests/actions/PolicyTaxTest.ts | 35 ----- tests/actions/PolicyTest.ts | 25 ---- tests/actions/QueuedOnyxUpdatesTest.ts | 5 - tests/actions/ReportTest.ts | 7 +- tests/actions/TransactionTest.ts | 32 ----- tests/unit/DistanceRateTest.ts | 1 - tests/unit/OptionsListUtilsTest.tsx | 2 - tests/utils/getOnyxValue.ts | 2 +- 56 files changed, 25 insertions(+), 579 deletions(-) diff --git a/src/libs/DistanceRequestUtils.ts b/src/libs/DistanceRequestUtils.ts index a0288d2847c6..d8561cc094fb 100644 --- a/src/libs/DistanceRequestUtils.ts +++ b/src/libs/DistanceRequestUtils.ts @@ -32,7 +32,6 @@ let allPolicies: OnyxCollection; Onyx.connectWithoutView({ key: ONYXKEYS.COLLECTION.POLICY, - waitForCollectionCallback: true, callback: (value) => (allPolicies = value), }); diff --git a/src/libs/Fullstory/common.ts b/src/libs/Fullstory/common.ts index 461d49897ab2..70d9c6334530 100644 --- a/src/libs/Fullstory/common.ts +++ b/src/libs/Fullstory/common.ts @@ -14,7 +14,6 @@ import type {GetChatFSClass, ShouldInitialize} from './types'; let allReports: OnyxCollection; Onyx.connectWithoutView({ key: ONYXKEYS.COLLECTION.REPORT, - waitForCollectionCallback: true, callback: (value) => { allReports = value; }, diff --git a/src/libs/Middleware/Pagination.ts b/src/libs/Middleware/Pagination.ts index 2687e2325309..939c6d143330 100644 --- a/src/libs/Middleware/Pagination.ts +++ b/src/libs/Middleware/Pagination.ts @@ -54,14 +54,12 @@ function registerPaginationConfig({ key: config.resourceCollectionKey, - waitForCollectionCallback: true, callback: (data) => { resources.set(config.resourceCollectionKey, data); }, }); Onyx.connectWithoutView({ key: config.pageCollectionKey, - waitForCollectionCallback: true, callback: (data) => { pages.set(config.pageCollectionKey, data); }, diff --git a/src/libs/Notification/LocalNotification/index.ts b/src/libs/Notification/LocalNotification/index.ts index ad915ebecce6..a795c6cddf2b 100644 --- a/src/libs/Notification/LocalNotification/index.ts +++ b/src/libs/Notification/LocalNotification/index.ts @@ -10,7 +10,6 @@ let allPolicies: OnyxCollection; // see https://github.com/Expensify/App/issues/66336 Onyx.connectWithoutView({ key: ONYXKEYS.COLLECTION.POLICY, - waitForCollectionCallback: true, callback: (value) => { allPolicies = value; }, @@ -21,7 +20,6 @@ let allPolicyTags: OnyxCollection; // see https://github.com/Expensify/App/issues/66336 Onyx.connectWithoutView({ key: ONYXKEYS.COLLECTION.POLICY_TAGS, - waitForCollectionCallback: true, callback: (value) => { allPolicyTags = value; }, diff --git a/src/libs/OptionsListUtils/index.ts b/src/libs/OptionsListUtils/index.ts index e5ff8b4c4941..0c9d741c649d 100644 --- a/src/libs/OptionsListUtils/index.ts +++ b/src/libs/OptionsListUtils/index.ts @@ -223,7 +223,6 @@ import type { let allReports: OnyxCollection; Onyx.connect({ key: ONYXKEYS.COLLECTION.REPORT, - waitForCollectionCallback: true, callback: (value) => { allReports = value; }, @@ -239,7 +238,6 @@ const deprecatedCachedOneTransactionThreadReportIDs: Record; Onyx.connect({ key: ONYXKEYS.COLLECTION.REPORT_ACTIONS, - waitForCollectionCallback: true, callback: (actions) => { if (!actions) { return; diff --git a/src/libs/Parser.ts b/src/libs/Parser.ts index 56ccb6bfc12b..8dee5c17fb74 100644 --- a/src/libs/Parser.ts +++ b/src/libs/Parser.ts @@ -9,7 +9,6 @@ const accountIDToNameMap: Record = {}; let reportIDToNameMap: Record = {}; Onyx.connect({ key: ONYXKEYS.COLLECTION.REPORT, - waitForCollectionCallback: true, callback: (value) => { // Clear the map so removed reports don’t linger reportIDToNameMap = {}; diff --git a/src/libs/ReportActionsUtils.ts b/src/libs/ReportActionsUtils.ts index d32403f4eec8..bc5c3041e48b 100644 --- a/src/libs/ReportActionsUtils.ts +++ b/src/libs/ReportActionsUtils.ts @@ -97,7 +97,6 @@ function isHarvestCreatedExpenseReport(origin?: string, originalID?: string): bo let allReportActions: OnyxCollection; Onyx.connect({ key: ONYXKEYS.COLLECTION.REPORT_ACTIONS, - waitForCollectionCallback: true, callback: (actions) => { if (!actions) { return; @@ -109,7 +108,6 @@ Onyx.connect({ let allReports: OnyxCollection; Onyx.connect({ key: ONYXKEYS.COLLECTION.REPORT, - waitForCollectionCallback: true, callback: (value) => { allReports = value; }, @@ -136,7 +134,6 @@ Onyx.connect({ let allReportNameValuePair: OnyxCollection; Onyx.connectWithoutView({ key: ONYXKEYS.COLLECTION.REPORT_NAME_VALUE_PAIRS, - waitForCollectionCallback: true, callback: (value) => { if (!value) { return; diff --git a/src/libs/ReportTitleUtils.ts b/src/libs/ReportTitleUtils.ts index 43d600fd35de..276e6f4ac298 100644 --- a/src/libs/ReportTitleUtils.ts +++ b/src/libs/ReportTitleUtils.ts @@ -17,7 +17,6 @@ let allReportNameValuePairs: Record = {}; */ Onyx.connectWithoutView({ key: ONYXKEYS.COLLECTION.REPORT_NAME_VALUE_PAIRS, - waitForCollectionCallback: true, callback: (val) => { allReportNameValuePairs = (val as Record) ?? {}; }, diff --git a/src/libs/ReportUtils.ts b/src/libs/ReportUtils.ts index ab1aca3a4e5e..35ed256b4f26 100644 --- a/src/libs/ReportUtils.ts +++ b/src/libs/ReportUtils.ts @@ -1039,7 +1039,6 @@ Onyx.connect({ let deprecatedAllReportsDraft: OnyxCollection; Onyx.connect({ key: ONYXKEYS.COLLECTION.REPORT_DRAFT, - waitForCollectionCallback: true, callback: (value) => (deprecatedAllReportsDraft = value), }); @@ -1047,7 +1046,6 @@ let allPolicies: OnyxCollection; let policiesArray: Policy[] = []; Onyx.connect({ key: ONYXKEYS.COLLECTION.POLICY, - waitForCollectionCallback: true, callback: (value) => { allPolicies = value; policiesArray = Object.values(value ?? {}).filter((policy): policy is Policy => !!policy); @@ -1057,7 +1055,6 @@ Onyx.connect({ let allPolicyDrafts: OnyxCollection; Onyx.connect({ key: ONYXKEYS.COLLECTION.POLICY_DRAFTS, - waitForCollectionCallback: true, callback: (value) => (allPolicyDrafts = value), }); @@ -1065,7 +1062,6 @@ let deprecatedAllReports: OnyxCollection; let deprecatedReportsByPolicyID: ReportByPolicyMap; Onyx.connect({ key: ONYXKEYS.COLLECTION.REPORT, - waitForCollectionCallback: true, callback: (value) => { deprecatedAllReports = value; @@ -1102,7 +1098,6 @@ let deprecatedAllTransactions: OnyxCollection = {}; let deprecatedReportsTransactions: Record = {}; Onyx.connect({ key: ONYXKEYS.COLLECTION.TRANSACTION, - waitForCollectionCallback: true, callback: (value) => { if (!value) { return; @@ -1128,7 +1123,6 @@ Onyx.connect({ let allReportActions: OnyxCollection; Onyx.connect({ key: ONYXKEYS.COLLECTION.REPORT_ACTIONS, - waitForCollectionCallback: true, callback: (actions) => { if (!actions) { return; @@ -1141,7 +1135,6 @@ let allReportMetadata: OnyxCollection; const allReportMetadataKeyValue: Record = {}; Onyx.connect({ key: ONYXKEYS.COLLECTION.REPORT_METADATA, - waitForCollectionCallback: true, callback: (value) => { if (!value) { return; @@ -1171,7 +1164,6 @@ Onyx.connectWithoutView({ let allReportNameValuePair: OnyxCollection; Onyx.connect({ key: ONYXKEYS.COLLECTION.REPORT_NAME_VALUE_PAIRS, - waitForCollectionCallback: true, callback: (value) => { if (!value) { return; diff --git a/src/libs/UnreadIndicatorUpdater/index.ts b/src/libs/UnreadIndicatorUpdater/index.ts index 548cea2d76e1..839b33ad860f 100644 --- a/src/libs/UnreadIndicatorUpdater/index.ts +++ b/src/libs/UnreadIndicatorUpdater/index.ts @@ -27,7 +27,6 @@ let allReportNameValuePairs: OnyxCollection = {}; // This subscription is used to update the unread indicators count which is not linked to UI and it does not update any UI state. Onyx.connectWithoutView({ key: ONYXKEYS.COLLECTION.REPORT_NAME_VALUE_PAIRS, - waitForCollectionCallback: true, callback: (value) => { allReportNameValuePairs = value; }, @@ -37,7 +36,6 @@ let allReportActions: OnyxCollection = {}; // This subscription is used to update the unread indicators count which is not linked to UI and it does not update any UI state. Onyx.connectWithoutView({ key: ONYXKEYS.COLLECTION.REPORT_ACTIONS, - waitForCollectionCallback: true, callback: (value) => { allReportActions = value; }, @@ -46,7 +44,6 @@ Onyx.connectWithoutView({ let allDraftComments: OnyxCollection = {}; Onyx.connectWithoutView({ key: ONYXKEYS.COLLECTION.REPORT_DRAFT_COMMENT, - waitForCollectionCallback: true, callback: (value) => { allDraftComments = value; }, @@ -108,7 +105,6 @@ const triggerUnreadUpdate = debounce(() => { // This subscription is used to update the unread indicators count which is not linked to UI and it does not update any UI state. Onyx.connectWithoutView({ key: ONYXKEYS.COLLECTION.REPORT, - waitForCollectionCallback: true, callback: (value) => { allReports = value; triggerUnreadUpdate(); diff --git a/src/libs/actions/App.ts b/src/libs/actions/App.ts index 2e7785835e71..5b5584f0a0cd 100644 --- a/src/libs/actions/App.ts +++ b/src/libs/actions/App.ts @@ -99,7 +99,6 @@ Onyx.connectWithoutView({ let allReports: OnyxCollection; Onyx.connectWithoutView({ key: ONYXKEYS.COLLECTION.REPORT, - waitForCollectionCallback: true, callback: (value) => { allReports = value; }, @@ -298,7 +297,6 @@ function getPolicyParamsForOpenOrReconnect(): Promise { Onyx.disconnect(connection); resolve({policyIDList: getNonOptimisticPolicyIDs(policies)}); diff --git a/src/libs/actions/ClearReportActionErrors.ts b/src/libs/actions/ClearReportActionErrors.ts index fa6d53930616..1b5889ef42ad 100644 --- a/src/libs/actions/ClearReportActionErrors.ts +++ b/src/libs/actions/ClearReportActionErrors.ts @@ -15,14 +15,12 @@ type IgnoreDirection = 'parent' | 'child'; let allReportActions: OnyxCollection; Onyx.connectWithoutView({ key: ONYXKEYS.COLLECTION.REPORT_ACTIONS, - waitForCollectionCallback: true, callback: (value) => (allReportActions = value), }); let allReports: OnyxCollection; Onyx.connectWithoutView({ key: ONYXKEYS.COLLECTION.REPORT, - waitForCollectionCallback: true, callback: (value) => { allReports = value; }, diff --git a/src/libs/actions/Export.ts b/src/libs/actions/Export.ts index 06f31ea271b6..5a92fe0447be 100644 --- a/src/libs/actions/Export.ts +++ b/src/libs/actions/Export.ts @@ -56,7 +56,6 @@ function clearStaleExportDownloads() { // to the entire collection, which would cause unnecessary re-renders on every change. const connectionID = Onyx.connectWithoutView({ key: ONYXKEYS.COLLECTION.EXPORT_DOWNLOAD, - waitForCollectionCallback: true, callback: (exportDownloads) => { Onyx.disconnect(connectionID); if (!exportDownloads) { diff --git a/src/libs/actions/IOU/index.ts b/src/libs/actions/IOU/index.ts index 3105782caffb..1846f7898ee0 100644 --- a/src/libs/actions/IOU/index.ts +++ b/src/libs/actions/IOU/index.ts @@ -16,7 +16,6 @@ Onyx.connect({ let allTransactions: NonNullable> = {}; Onyx.connect({ key: ONYXKEYS.COLLECTION.TRANSACTION, - waitForCollectionCallback: true, callback: (value) => { if (!value) { allTransactions = {}; @@ -30,7 +29,6 @@ Onyx.connect({ let allTransactionDrafts: NonNullable> = {}; Onyx.connect({ key: ONYXKEYS.COLLECTION.TRANSACTION_DRAFT, - waitForCollectionCallback: true, callback: (value) => { allTransactionDrafts = value ?? {}; }, @@ -40,7 +38,6 @@ Onyx.connect({ let allTransactionViolations: NonNullable> = {}; Onyx.connect({ key: ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS, - waitForCollectionCallback: true, callback: (value) => { if (!value) { allTransactionViolations = {}; @@ -54,7 +51,6 @@ Onyx.connect({ let allPolicyTags: OnyxCollection = {}; Onyx.connect({ key: ONYXKEYS.COLLECTION.POLICY_TAGS, - waitForCollectionCallback: true, callback: (value) => { if (!value) { allPolicyTags = {}; @@ -67,7 +63,6 @@ Onyx.connect({ let allReports: OnyxCollection; Onyx.connect({ key: ONYXKEYS.COLLECTION.REPORT, - waitForCollectionCallback: true, callback: (value) => { allReports = value; }, @@ -76,7 +71,6 @@ Onyx.connect({ let allReportNameValuePairs: OnyxCollection; Onyx.connect({ key: ONYXKEYS.COLLECTION.REPORT_NAME_VALUE_PAIRS, - waitForCollectionCallback: true, callback: (value) => { allReportNameValuePairs = value; }, @@ -101,7 +95,6 @@ Onyx.connect({ let allReportActions: OnyxCollection; Onyx.connect({ key: ONYXKEYS.COLLECTION.REPORT_ACTIONS, - waitForCollectionCallback: true, callback: (actions) => { if (!actions) { return; diff --git a/src/libs/actions/OnyxDerived/index.ts b/src/libs/actions/OnyxDerived/index.ts index 57950c582d5f..86c6fb8d8058 100644 --- a/src/libs/actions/OnyxDerived/index.ts +++ b/src/libs/actions/OnyxDerived/index.ts @@ -105,7 +105,6 @@ function init() { if (OnyxKeys.isCollectionKey(dependencyOnyxKey)) { Onyx.connectWithoutView({ key: dependencyOnyxKey, - waitForCollectionCallback: true, callback: (value, collectionKey, sourceValue) => { Log.info(`[OnyxDerived] dependency ${collectionKey} for derived key ${key} changed, recomputing`); setDependencyValue(dependencyIndex, value as Parameters[0][typeof dependencyIndex]); diff --git a/src/libs/actions/Policy/Member.ts b/src/libs/actions/Policy/Member.ts index 24f238a45417..5e33ec609982 100644 --- a/src/libs/actions/Policy/Member.ts +++ b/src/libs/actions/Policy/Member.ts @@ -48,7 +48,6 @@ type WorkspaceMembersRoleData = { let allReportActions: OnyxCollection; Onyx.connect({ key: ONYXKEYS.COLLECTION.REPORT_ACTIONS, - waitForCollectionCallback: true, callback: (actions) => (allReportActions = actions), }); diff --git a/src/libs/actions/Policy/Policy.ts b/src/libs/actions/Policy/Policy.ts index ad7bfe87022b..5ceddff6dfd5 100644 --- a/src/libs/actions/Policy/Policy.ts +++ b/src/libs/actions/Policy/Policy.ts @@ -280,7 +280,6 @@ type SetWorkspaceApprovalModeAdditionalData = { let deprecatedAllReportActions: OnyxCollection; Onyx.connect({ key: ONYXKEYS.COLLECTION.REPORT_ACTIONS, - waitForCollectionCallback: true, callback: (actions) => { deprecatedAllReportActions = actions; }, diff --git a/src/libs/actions/Report/MarkAllMessageAsRead.tsx b/src/libs/actions/Report/MarkAllMessageAsRead.tsx index b7d0a014aa9a..5e49831162ef 100644 --- a/src/libs/actions/Report/MarkAllMessageAsRead.tsx +++ b/src/libs/actions/Report/MarkAllMessageAsRead.tsx @@ -16,14 +16,12 @@ import type {Report, ReportActions} from '@src/types/onyx'; let allReportActions: OnyxCollection; Onyx.connectWithoutView({ key: ONYXKEYS.COLLECTION.REPORT_ACTIONS, - waitForCollectionCallback: true, callback: (value) => (allReportActions = value), }); let allReports: OnyxCollection; Onyx.connectWithoutView({ key: ONYXKEYS.COLLECTION.REPORT, - waitForCollectionCallback: true, callback: (value) => (allReports = value), }); diff --git a/src/libs/actions/Report/index.ts b/src/libs/actions/Report/index.ts index f2e88d028f69..32a401b363cd 100644 --- a/src/libs/actions/Report/index.ts +++ b/src/libs/actions/Report/index.ts @@ -59,7 +59,6 @@ import type UpdateRoomVisibilityParams from '@libs/API/parameters/UpdateRoomVisi import {READ_COMMANDS, SIDE_EFFECT_REQUEST_COMMANDS, WRITE_COMMANDS} from '@libs/API/types'; import * as ApiUtils from '@libs/ApiUtils'; import * as Browser from '@libs/Browser'; -import * as CollectionUtils from '@libs/CollectionUtils'; import type {CustomRNImageManipulatorResult} from '@libs/cropOrRotateImage/types'; import DateUtils from '@libs/DateUtils'; import * as Environment from '@libs/Environment/Environment'; @@ -461,8 +460,8 @@ Onyx.connect({ // shares its reference with the snapshot, so downstream consumers still // benefit from structural-sharing ref-stability for unchanged members. const next: OnyxCollection = {}; - for (const [k, v] of Object.entries(snapshot as unknown as Record)) { - next[CollectionUtils.extractCollectionItemID(k as `${typeof ONYXKEYS.COLLECTION.REPORT_ACTIONS}${string}`)] = v; + for (const [k, v] of Object.entries(snapshot)) { + next[k.replace(ONYXKEYS.COLLECTION.REPORT_ACTIONS, '')] = v; } allReportActions = next; }, @@ -471,7 +470,6 @@ Onyx.connect({ let allReports: OnyxCollection; Onyx.connect({ key: ONYXKEYS.COLLECTION.REPORT, - waitForCollectionCallback: true, callback: (value) => { allReports = value; }, @@ -525,7 +523,6 @@ Onyx.connect({ let allAttachments: OnyxCollection = {}; Onyx.connectWithoutView({ key: ONYXKEYS.COLLECTION.ATTACHMENT, - waitForCollectionCallback: true, callback: (value) => (allAttachments = value), }); diff --git a/src/libs/actions/SplitExpenses.ts b/src/libs/actions/SplitExpenses.ts index d0744ba781f4..d00a825a00f1 100644 --- a/src/libs/actions/SplitExpenses.ts +++ b/src/libs/actions/SplitExpenses.ts @@ -22,7 +22,6 @@ import {initDraftSplitExpenseDataForEdit, initSplitExpenseItemData, resolveSplit let allTransactions: OnyxCollection; Onyx.connectWithoutView({ key: ONYXKEYS.COLLECTION.TRANSACTION, - waitForCollectionCallback: true, callback: (value) => (allTransactions = value), }); @@ -32,7 +31,6 @@ Onyx.connectWithoutView({ let allReports: OnyxCollection; Onyx.connectWithoutView({ key: ONYXKEYS.COLLECTION.REPORT, - waitForCollectionCallback: true, callback: (value) => (allReports = value), }); @@ -42,7 +40,6 @@ Onyx.connectWithoutView({ let allPolicies: OnyxCollection; Onyx.connectWithoutView({ key: ONYXKEYS.COLLECTION.POLICY, - waitForCollectionCallback: true, callback: (value) => (allPolicies = value), }); @@ -70,7 +67,6 @@ let userBillingGracePeriodEnds: OnyxCollection; // be used for `initSplitExpense` Onyx.connectWithoutView({ key: ONYXKEYS.COLLECTION.SHARED_NVP_PRIVATE_USER_BILLING_GRACE_PERIOD_END, - waitForCollectionCallback: true, callback: (value) => (userBillingGracePeriodEnds = value), }); diff --git a/src/libs/actions/Transaction.ts b/src/libs/actions/Transaction.ts index 1e618805ae45..80fc89830047 100644 --- a/src/libs/actions/Transaction.ts +++ b/src/libs/actions/Transaction.ts @@ -12,7 +12,6 @@ import type { TransactionThreadInfo, } from '@libs/API/parameters'; import {READ_COMMANDS, WRITE_COMMANDS} from '@libs/API/types'; -import * as CollectionUtils from '@libs/CollectionUtils'; import {getCurrencySymbol} from '@libs/CurrencyUtils'; import DateUtils from '@libs/DateUtils'; import DistanceRequestUtils from '@libs/DistanceRequestUtils'; @@ -87,7 +86,6 @@ import type TransactionState from '@src/types/utils/TransactionStateType'; let allReports: OnyxCollection = {}; Onyx.connect({ key: ONYXKEYS.COLLECTION.REPORT, - waitForCollectionCallback: true, callback: (value) => { if (!value) { return; @@ -96,20 +94,20 @@ Onyx.connect({ }, }); -let allTransactionViolation: OnyxCollection = {}; +let allTransactionViolations: OnyxCollection = {}; Onyx.connect({ key: ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS, callback: (snapshot) => { if (!snapshot) { - allTransactionViolation = {}; + allTransactionViolations = {}; return; } // Rebuild the transactionID-keyed view from the prefixed-key snapshot. const next: OnyxCollection = {}; - for (const [k, v] of Object.entries(snapshot as unknown as Record)) { - next[CollectionUtils.extractCollectionItemID(k as `${typeof ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS}${string}`)] = v; + for (const [k, v] of Object.entries(snapshot)) { + next[k.replace(ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS, '')] = v; } - allTransactionViolation = next; + allTransactionViolations = next; }, }); @@ -1151,7 +1149,7 @@ function changeTransactionsReport({ // For each duplicate, write its own violations minus the DUPLICATED_TRANSACTION marker. // Previously this read a stale `allTransactionViolations` flat-array that held only // the last-fired per-member value (latent bug, now removed alongside per-member dispatch). - value: (allTransactionViolation?.[id] ?? []).filter((violation: TransactionViolation) => violation.name !== CONST.VIOLATIONS.DUPLICATED_TRANSACTION), + value: (allTransactionViolations?.[id] ?? []).filter((violation: TransactionViolation) => violation.name !== CONST.VIOLATIONS.DUPLICATED_TRANSACTION), }); } } diff --git a/src/libs/actions/TransactionInlineEdit.ts b/src/libs/actions/TransactionInlineEdit.ts index 97c044f275b4..024b3ecea4ea 100644 --- a/src/libs/actions/TransactionInlineEdit.ts +++ b/src/libs/actions/TransactionInlineEdit.ts @@ -67,7 +67,6 @@ type TransactionEditPermissions = { let allTransactions: NonNullable> = {}; Onyx.connectWithoutView({ key: ONYXKEYS.COLLECTION.TRANSACTION, - waitForCollectionCallback: true, callback: (value) => { allTransactions = value ?? {}; }, @@ -76,7 +75,6 @@ Onyx.connectWithoutView({ let allTransactionViolations: NonNullable> = {}; Onyx.connectWithoutView({ key: ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS, - waitForCollectionCallback: true, callback: (value) => { allTransactionViolations = value ?? {}; }, @@ -85,7 +83,6 @@ Onyx.connectWithoutView({ let allReports: NonNullable> = {}; Onyx.connectWithoutView({ key: ONYXKEYS.COLLECTION.REPORT, - waitForCollectionCallback: true, callback: (value) => { allReports = value ?? {}; }, @@ -94,7 +91,6 @@ Onyx.connectWithoutView({ let allReportActions: NonNullable> = {}; Onyx.connectWithoutView({ key: ONYXKEYS.COLLECTION.REPORT_ACTIONS, - waitForCollectionCallback: true, callback: (value) => { allReportActions = value ?? {}; }, diff --git a/src/libs/actions/replaceOptimisticReportWithActualReport.ts b/src/libs/actions/replaceOptimisticReportWithActualReport.ts index 65c4a2064389..e0f8d3a34f2f 100644 --- a/src/libs/actions/replaceOptimisticReportWithActualReport.ts +++ b/src/libs/actions/replaceOptimisticReportWithActualReport.ts @@ -37,7 +37,6 @@ let allReportDraftComments: Record = {}; // Draft comments are cached only for transferring to the preexisting report; no UI subscribes, so connectWithoutView() is used. Onyx.connectWithoutView({ key: ONYXKEYS.COLLECTION.REPORT_DRAFT_COMMENT, - waitForCollectionCallback: true, callback: (value) => (allReportDraftComments = value ?? {}), }); @@ -56,7 +55,7 @@ Onyx.connectWithoutView({ // shares its reference with the snapshot, preserving structural-sharing // ref-stability for unchanged members. const next: OnyxCollection = {}; - for (const [k, v] of Object.entries(snapshot as unknown as Record)) { + for (const [k, v] of Object.entries(snapshot)) { next[k.replace(ONYXKEYS.COLLECTION.REPORT_ACTIONS, '')] = v; } allReportActions = next; @@ -244,7 +243,6 @@ function replaceOptimisticReportWithActualReport(report: Report, draftReportComm // Reports are observed only to detect preexistingReportID and run replacement; no UI subscribes, so connectWithoutView() is used. Onyx.connectWithoutView({ key: ONYXKEYS.COLLECTION.REPORT, - waitForCollectionCallback: true, callback: (value: OnyxCollection) => { allReports = value; diff --git a/src/libs/registerPaginationConfig.ts b/src/libs/registerPaginationConfig.ts index 47940e8cb2c8..7a7e788cdf02 100644 --- a/src/libs/registerPaginationConfig.ts +++ b/src/libs/registerPaginationConfig.ts @@ -15,7 +15,6 @@ import {canUserPerformWriteAction as canUserPerformWriteActionReportUtils} from let allReports: OnyxCollection; Onyx.connectWithoutView({ key: ONYXKEYS.COLLECTION.REPORT, - waitForCollectionCallback: true, callback: (value) => { allReports = value; }, @@ -29,7 +28,6 @@ let allReportNameValuePairs: OnyxCollection; */ Onyx.connectWithoutView({ key: ONYXKEYS.COLLECTION.REPORT_NAME_VALUE_PAIRS, - waitForCollectionCallback: true, callback: (value) => { allReportNameValuePairs = value; }, diff --git a/src/libs/telemetry/TelemetrySynchronizer.ts b/src/libs/telemetry/TelemetrySynchronizer.ts index 16927a0dfdcb..b185fd97eece 100644 --- a/src/libs/telemetry/TelemetrySynchronizer.ts +++ b/src/libs/telemetry/TelemetrySynchronizer.ts @@ -44,7 +44,6 @@ Onyx.connectWithoutView({ Onyx.connectWithoutView({ key: ONYXKEYS.COLLECTION.POLICY, - waitForCollectionCallback: true, callback: (value) => { if (!value) { return; @@ -56,7 +55,6 @@ Onyx.connectWithoutView({ Onyx.connectWithoutView({ key: ONYXKEYS.COLLECTION.REPORT, - waitForCollectionCallback: true, callback: (value) => { if (!value) { return; diff --git a/src/setup/addUtilsToWindow.ts b/src/setup/addUtilsToWindow.ts index d077196209ac..f5ea157778a8 100644 --- a/src/setup/addUtilsToWindow.ts +++ b/src/setup/addUtilsToWindow.ts @@ -34,7 +34,6 @@ export default function addUtilsToWindow() { Onyx.disconnect(connection); resolve(value); }, - waitForCollectionCallback: true, }); }); }; diff --git a/tests/actions/AttachmentTest.ts b/tests/actions/AttachmentTest.ts index 62e952a0d826..5913520e085d 100644 --- a/tests/actions/AttachmentTest.ts +++ b/tests/actions/AttachmentTest.ts @@ -76,7 +76,6 @@ describe('AttachmentStorage', () => { const attachments = await new Promise>((resolve) => { const connection = Onyx.connect({ key: ONYXKEYS.COLLECTION.ATTACHMENT, - waitForCollectionCallback: true, callback: (value) => { Onyx.disconnect(connection); resolve(value); @@ -116,7 +115,6 @@ describe('AttachmentStorage', () => { const attachments = await new Promise>((resolve) => { const connection = Onyx.connect({ key: ONYXKEYS.COLLECTION.ATTACHMENT, - waitForCollectionCallback: true, callback: (value) => { Onyx.disconnect(connection); resolve(value); @@ -145,7 +143,6 @@ describe('AttachmentStorage', () => { Onyx.connect({ key: ONYXKEYS.COLLECTION.ATTACHMENT, - waitForCollectionCallback: true, callback: (value) => { if (!value) { return; @@ -217,7 +214,6 @@ describe('AttachmentStorage', () => { Onyx.connect({ key: ONYXKEYS.COLLECTION.ATTACHMENT, - waitForCollectionCallback: true, callback: (value) => { if (!value) { return; @@ -272,7 +268,6 @@ describe('AttachmentStorage', () => { Onyx.connect({ key: ONYXKEYS.COLLECTION.ATTACHMENT, - waitForCollectionCallback: true, callback: (value) => { if (!value) { return; @@ -342,7 +337,6 @@ describe('AttachmentStorage', () => { Onyx.connect({ key: ONYXKEYS.COLLECTION.ATTACHMENT, - waitForCollectionCallback: true, callback: (value) => { if (!value) { return; diff --git a/tests/actions/DomainTest.ts b/tests/actions/DomainTest.ts index ad0ce054f699..89f7731f7e38 100644 --- a/tests/actions/DomainTest.ts +++ b/tests/actions/DomainTest.ts @@ -81,7 +81,6 @@ describe('actions/Domain', () => { await TestHelper.getOnyxData({ key: ONYXKEYS.FORMS.CREATE_DOMAIN_FORM, - waitForCollectionCallback: false, callback: (form) => { expect(form?.hasCreationSucceeded).toBeFalsy(); expect(form?.errors).toBeFalsy(); @@ -133,7 +132,6 @@ describe('actions/Domain', () => { await TestHelper.getOnyxData({ key: `${ONYXKEYS.COLLECTION.DOMAIN_ERRORS}${domainAccountID}`, - waitForCollectionCallback: false, callback: (errors) => { expect(errors?.errors).toBeFalsy(); }, @@ -141,7 +139,6 @@ describe('actions/Domain', () => { await TestHelper.getOnyxData({ key: `${ONYXKEYS.COLLECTION.DOMAIN_PENDING_ACTIONS}${domainAccountID}`, - waitForCollectionCallback: false, callback: (pendingActions) => { expect(pendingActions?.pendingAction).toBeFalsy(); }, @@ -303,7 +300,6 @@ describe('actions/Domain', () => { await TestHelper.getOnyxData({ key: `${ONYXKEYS.COLLECTION.DOMAIN_ERRORS}${domainAccountID}`, - waitForCollectionCallback: false, callback: (errors) => { expect(errors?.memberErrors?.[email]).toBeFalsy(); expect(errors?.memberErrors?.[optimisticAccountID]).toBeFalsy(); @@ -312,7 +308,6 @@ describe('actions/Domain', () => { await TestHelper.getOnyxData({ key: `${ONYXKEYS.COLLECTION.DOMAIN}${domainAccountID}`, - waitForCollectionCallback: false, callback: (domain) => { const securityGroup = domain?.[DOMAIN_SECURITY_GROUP as keyof typeof domain] as {shared?: Record} | undefined; expect(securityGroup?.shared?.[optimisticAccountID]).toBeFalsy(); @@ -581,7 +576,6 @@ describe('actions/Domain', () => { await TestHelper.getOnyxData({ key: `${ONYXKEYS.COLLECTION.DOMAIN}${domainAccountID}`, - waitForCollectionCallback: false, callback: (domain) => { const delegateData = domain?.[PRIVATE_VACATION_DELEGATE_KEY as keyof typeof domain] as BaseVacationDelegate | undefined; expect(delegateData?.delegate).toBe(previousDelegate); @@ -589,14 +583,12 @@ describe('actions/Domain', () => { }); await TestHelper.getOnyxData({ key: `${ONYXKEYS.COLLECTION.DOMAIN_ERRORS}${domainAccountID}`, - waitForCollectionCallback: false, callback: (errors) => { expect(errors?.memberErrors?.[domainMemberEmail]?.vacationDelegateErrors).toBeFalsy(); }, }); await TestHelper.getOnyxData({ key: `${ONYXKEYS.COLLECTION.DOMAIN_PENDING_ACTIONS}${domainAccountID}`, - waitForCollectionCallback: false, callback: (pendingActions) => { expect(pendingActions?.member?.[domainMemberEmail]?.vacationDelegate).toBeFalsy(); }, @@ -621,7 +613,6 @@ describe('actions/Domain', () => { await TestHelper.getOnyxData({ key: `${ONYXKEYS.COLLECTION.DOMAIN}${domainAccountID}`, - waitForCollectionCallback: false, callback: (domain) => { const delegateData = domain?.[PRIVATE_VACATION_DELEGATE_KEY as keyof typeof domain] as BaseVacationDelegate | undefined; expect(delegateData?.delegate).toBeFalsy(); @@ -654,7 +645,6 @@ describe('actions/Domain', () => { await TestHelper.getOnyxData({ key: `${ONYXKEYS.COLLECTION.DOMAIN_ERRORS}${domainAccountID}`, - waitForCollectionCallback: false, callback: (errors) => { expect(errors?.memberErrors?.[accountID]).toBeFalsy(); expect(errors?.memberErrors?.[email]).toBeFalsy(); @@ -663,7 +653,6 @@ describe('actions/Domain', () => { await TestHelper.getOnyxData({ key: `${ONYXKEYS.COLLECTION.DOMAIN_PENDING_ACTIONS}${domainAccountID}`, - waitForCollectionCallback: false, callback: (pendingActions) => { expect(pendingActions?.member?.[email]).toBeFalsy(); }, @@ -685,7 +674,6 @@ describe('actions/Domain', () => { await TestHelper.getOnyxData({ key: `${ONYXKEYS.COLLECTION.DOMAIN_ERRORS}${domainAccountID}`, - waitForCollectionCallback: false, callback: (errors) => { expect(errors?.memberErrors?.[email]?.twoFactorAuthExemptEmailsError).toBeFalsy(); }, @@ -984,7 +972,6 @@ describe('actions/Domain', () => { setDomainMembersSelectedForMove(memberAccountIDs); await TestHelper.getOnyxData({ key: ONYXKEYS.RAM_ONLY_DOMAIN_MEMBERS_SELECTED_FOR_MOVE, - waitForCollectionCallback: false, callback: (value) => { expect(value).toEqual(memberAccountIDs); }, @@ -995,7 +982,6 @@ describe('actions/Domain', () => { setDomainMembersSelectedForMove([]); await TestHelper.getOnyxData({ key: ONYXKEYS.RAM_ONLY_DOMAIN_MEMBERS_SELECTED_FOR_MOVE, - waitForCollectionCallback: false, callback: (value) => { expect(value).toEqual([]); }, @@ -1007,7 +993,6 @@ describe('actions/Domain', () => { clearDomainMembersSelectedForMove(); await TestHelper.getOnyxData({ key: ONYXKEYS.RAM_ONLY_DOMAIN_MEMBERS_SELECTED_FOR_MOVE, - waitForCollectionCallback: false, callback: (value) => { expect(value).toEqual([]); }, @@ -1191,7 +1176,6 @@ describe('actions/Domain', () => { await TestHelper.getOnyxData({ key: `${ONYXKEYS.COLLECTION.DOMAIN_ERRORS}${domainAccountID}`, - waitForCollectionCallback: false, callback: (errors) => { const groupErrors = errors?.[SECURITY_GROUP_KEY as keyof typeof errors] as Record> | undefined; expect(groupErrors?.errors).toBeFalsy(); @@ -1218,7 +1202,6 @@ describe('actions/Domain', () => { await TestHelper.getOnyxData({ key: `${ONYXKEYS.COLLECTION.DOMAIN_ERRORS}${domainAccountID}`, - waitForCollectionCallback: false, callback: (errors) => { const groupErrors = errors?.[SECURITY_GROUP_KEY as keyof typeof errors] as Record> | undefined; expect(groupErrors?.[settingsName]).toBeFalsy(); @@ -1446,7 +1429,6 @@ describe('actions/Domain', () => { await TestHelper.getOnyxData({ key: `${ONYXKEYS.COLLECTION.DOMAIN}${domainAccountID}`, - waitForCollectionCallback: false, callback: (domain) => { expect((domain as Record)?.[SECURITY_GROUP_KEY]).toBeFalsy(); }, @@ -1454,7 +1436,6 @@ describe('actions/Domain', () => { await TestHelper.getOnyxData({ key: `${ONYXKEYS.COLLECTION.DOMAIN_ERRORS}${domainAccountID}`, - waitForCollectionCallback: false, callback: (errors) => { expect((errors as Record)?.[SECURITY_GROUP_KEY]).toBeFalsy(); }, diff --git a/tests/actions/IOU/CreateDraftTransactionTest.ts b/tests/actions/IOU/CreateDraftTransactionTest.ts index f4110376bd22..6eeb35ad44e6 100644 --- a/tests/actions/IOU/CreateDraftTransactionTest.ts +++ b/tests/actions/IOU/CreateDraftTransactionTest.ts @@ -169,7 +169,6 @@ describe('actions/IOU', () => { let updatedTransactionDrafts: OnyxCollection; await getOnyxData({ key: ONYXKEYS.COLLECTION.TRANSACTION_DRAFT, - waitForCollectionCallback: true, callback: (val) => { updatedTransactionDrafts = val; }, @@ -220,7 +219,6 @@ describe('actions/IOU', () => { let transactionDrafts: OnyxCollection; await getOnyxData({ key: ONYXKEYS.COLLECTION.TRANSACTION_DRAFT, - waitForCollectionCallback: true, callback: (val) => { transactionDrafts = val; }, @@ -260,7 +258,6 @@ describe('actions/IOU', () => { let transactionDrafts: OnyxCollection; await getOnyxData({ key: ONYXKEYS.COLLECTION.TRANSACTION_DRAFT, - waitForCollectionCallback: true, callback: (val) => { transactionDrafts = val; }, @@ -295,7 +292,6 @@ describe('actions/IOU', () => { let transactionDrafts: OnyxCollection; await getOnyxData({ key: ONYXKEYS.COLLECTION.TRANSACTION_DRAFT, - waitForCollectionCallback: true, callback: (val) => { transactionDrafts = val; }, diff --git a/tests/actions/IOU/PerDiemTest.ts b/tests/actions/IOU/PerDiemTest.ts index f8ba62bb4690..521240ac15e3 100644 --- a/tests/actions/IOU/PerDiemTest.ts +++ b/tests/actions/IOU/PerDiemTest.ts @@ -783,7 +783,6 @@ describe('PerDiem', () => { const transactions = await new Promise>((resolve) => { const connection = Onyx.connectWithoutView({ key: ONYXKEYS.COLLECTION.TRANSACTION, - waitForCollectionCallback: true, callback: (val) => { resolve(val ?? {}); Onyx.disconnect(connection); @@ -923,7 +922,6 @@ describe('PerDiem', () => { const transactions = await new Promise>((resolve) => { const connection = Onyx.connect({ key: ONYXKEYS.COLLECTION.TRANSACTION, - waitForCollectionCallback: true, callback: (value) => { Onyx.disconnect(connection); resolve(value); diff --git a/tests/actions/IOU/RequestMoneyTest.ts b/tests/actions/IOU/RequestMoneyTest.ts index 2daf540888e6..2e3edb3a2853 100644 --- a/tests/actions/IOU/RequestMoneyTest.ts +++ b/tests/actions/IOU/RequestMoneyTest.ts @@ -216,7 +216,6 @@ describe('actions/IOU', () => { new Promise((resolve) => { const connection = Onyx.connect({ key: ONYXKEYS.COLLECTION.REPORT, - waitForCollectionCallback: true, callback: (allReports) => { Onyx.disconnect(connection); @@ -271,7 +270,6 @@ describe('actions/IOU', () => { new Promise((resolve) => { const connection = Onyx.connect({ key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${iouReportID}`, - waitForCollectionCallback: false, callback: (reportActionsForIOUReport) => { Onyx.disconnect(connection); @@ -318,7 +316,6 @@ describe('actions/IOU', () => { new Promise((resolve) => { const connection = Onyx.connect({ key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${transactionThread?.reportID}`, - waitForCollectionCallback: false, callback: (reportActionsForTransactionThread) => { Onyx.disconnect(connection); @@ -341,7 +338,6 @@ describe('actions/IOU', () => { new Promise((resolve) => { const connection = Onyx.connect({ key: ONYXKEYS.COLLECTION.TRANSACTION, - waitForCollectionCallback: true, callback: (allTransactions) => { Onyx.disconnect(connection); @@ -377,7 +373,6 @@ describe('actions/IOU', () => { new Promise((resolve) => { const connection = Onyx.connect({ key: ONYXKEYS.COLLECTION.SNAPSHOT, - waitForCollectionCallback: true, callback: (snapshotData) => { Onyx.disconnect(connection); @@ -394,7 +389,6 @@ describe('actions/IOU', () => { new Promise((resolve) => { const connection = Onyx.connect({ key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${iouReportID}`, - waitForCollectionCallback: false, callback: (reportActionsForIOUReport) => { Onyx.disconnect(connection); expect(Object.values(reportActionsForIOUReport ?? {}).length).toBe(2); @@ -411,7 +405,6 @@ describe('actions/IOU', () => { new Promise((resolve) => { const connection = Onyx.connect({ key: `${ONYXKEYS.COLLECTION.TRANSACTION}${transactionID}`, - waitForCollectionCallback: false, callback: (transaction) => { Onyx.disconnect(connection); expect(transaction?.pendingAction).toBeFalsy(); @@ -482,7 +475,6 @@ describe('actions/IOU', () => { new Promise((resolve) => { const connection = Onyx.connect({ key: ONYXKEYS.COLLECTION.REPORT, - waitForCollectionCallback: true, callback: (allReports) => { Onyx.disconnect(connection); @@ -511,7 +503,6 @@ describe('actions/IOU', () => { new Promise((resolve) => { const connection = Onyx.connect({ key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${iouReportID}`, - waitForCollectionCallback: false, callback: (allIOUReportActions) => { Onyx.disconnect(connection); @@ -549,7 +540,6 @@ describe('actions/IOU', () => { new Promise((resolve) => { const connection = Onyx.connect({ key: ONYXKEYS.COLLECTION.TRANSACTION, - waitForCollectionCallback: true, callback: (allTransactions) => { Onyx.disconnect(connection); @@ -588,7 +578,6 @@ describe('actions/IOU', () => { new Promise((resolve) => { const connection = Onyx.connect({ key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${iouReportID}`, - waitForCollectionCallback: false, callback: (reportActionsForIOUReport) => { Onyx.disconnect(connection); expect(Object.values(reportActionsForIOUReport ?? {}).length).toBe(2); @@ -716,7 +705,6 @@ describe('actions/IOU', () => { new Promise((resolve) => { const connection = Onyx.connect({ key: ONYXKEYS.COLLECTION.REPORT, - waitForCollectionCallback: true, callback: (allReports) => { Onyx.disconnect(connection); @@ -741,7 +729,6 @@ describe('actions/IOU', () => { new Promise((resolve) => { const connection = Onyx.connect({ key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${iouReportID}`, - waitForCollectionCallback: false, callback: (reportActionsForIOUReport) => { Onyx.disconnect(connection); @@ -778,7 +765,6 @@ describe('actions/IOU', () => { new Promise((resolve) => { const connection = Onyx.connect({ key: ONYXKEYS.COLLECTION.TRANSACTION, - waitForCollectionCallback: true, callback: (allTransactions) => { Onyx.disconnect(connection); @@ -808,7 +794,6 @@ describe('actions/IOU', () => { new Promise((resolve) => { const connection = Onyx.connect({ key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${iouReportID}`, - waitForCollectionCallback: false, callback: (reportActionsForIOUReport) => { Onyx.disconnect(connection); expect(Object.values(reportActionsForIOUReport ?? {}).length).toBe(3); @@ -825,7 +810,6 @@ describe('actions/IOU', () => { new Promise((resolve) => { const connection = Onyx.connect({ key: ONYXKEYS.COLLECTION.TRANSACTION, - waitForCollectionCallback: true, callback: (allTransactions) => { Onyx.disconnect(connection); for (const transaction of Object.values(allTransactions ?? {})) { @@ -884,7 +868,6 @@ describe('actions/IOU', () => { new Promise((resolve) => { const connection = Onyx.connect({ key: ONYXKEYS.COLLECTION.REPORT, - waitForCollectionCallback: true, callback: (allReports) => { Onyx.disconnect(connection); @@ -916,7 +899,6 @@ describe('actions/IOU', () => { new Promise((resolve) => { const connection = Onyx.connect({ key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${iouReportID}`, - waitForCollectionCallback: false, callback: (reportActionsForIOUReport) => { Onyx.disconnect(connection); @@ -963,7 +945,6 @@ describe('actions/IOU', () => { new Promise((resolve) => { const connection = Onyx.connect({ key: ONYXKEYS.COLLECTION.TRANSACTION, - waitForCollectionCallback: true, callback: (allTransactions) => { Onyx.disconnect(connection); @@ -995,7 +976,6 @@ describe('actions/IOU', () => { new Promise((resolve) => { const connection = Onyx.connect({ key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${iouReportID}`, - waitForCollectionCallback: false, callback: (reportActionsForIOUReport) => { Onyx.disconnect(connection); expect(Object.values(reportActionsForIOUReport ?? {}).length).toBe(2); @@ -1013,7 +993,6 @@ describe('actions/IOU', () => { new Promise((resolve) => { const connection = Onyx.connect({ key: ONYXKEYS.COLLECTION.REPORT_ACTIONS, - waitForCollectionCallback: true, callback: (reportActionsForTransactionThread) => { Onyx.disconnect(connection); expect(Object.values(reportActionsForTransactionThread ?? {}).length).toBe(3); @@ -1031,7 +1010,6 @@ describe('actions/IOU', () => { new Promise((resolve) => { const connection = Onyx.connect({ key: `${ONYXKEYS.COLLECTION.TRANSACTION}${transactionID}`, - waitForCollectionCallback: false, callback: (transaction) => { Onyx.disconnect(connection); expect(transaction?.pendingAction).toBe(CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD); @@ -1060,7 +1038,6 @@ describe('actions/IOU', () => { new Promise((resolve) => { const connection = Onyx.connect({ key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${chatReportID}`, - waitForCollectionCallback: false, callback: (reportActionsForReport) => { Onyx.disconnect(connection); iouAction = Object.values(reportActionsForReport ?? {}).find((reportAction): reportAction is ReportAction => @@ -1079,7 +1056,6 @@ describe('actions/IOU', () => { new Promise((resolve) => { const connection = Onyx.connect({ key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${iouReportID}`, - waitForCollectionCallback: false, callback: (reportActionsForReport) => { Onyx.disconnect(connection); iouAction = Object.values(reportActionsForReport ?? {}).find((reportAction): reportAction is ReportAction => @@ -1098,7 +1074,6 @@ describe('actions/IOU', () => { new Promise((resolve) => { const connection = Onyx.connect({ key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${transactionThreadReport?.reportID}`, - waitForCollectionCallback: false, callback: (reportActionsForReport) => { Onyx.disconnect(connection); expect(reportActionsForReport).toMatchObject({}); @@ -1114,7 +1089,6 @@ describe('actions/IOU', () => { new Promise((resolve) => { const connection = Onyx.connect({ key: `${ONYXKEYS.COLLECTION.TRANSACTION}${transactionID}`, - waitForCollectionCallback: false, callback: (transaction) => { Onyx.disconnect(connection); expect(transaction).toBeFalsy(); @@ -1144,7 +1118,6 @@ describe('actions/IOU', () => { new Promise((resolve) => { const connection = Onyx.connect({ key: ONYXKEYS.COLLECTION.REPORT, - waitForCollectionCallback: true, callback: (allReports) => { Onyx.disconnect(connection); for (const report of Object.values(allReports ?? {})) { @@ -1162,7 +1135,6 @@ describe('actions/IOU', () => { new Promise((resolve) => { const connection = Onyx.connect({ key: ONYXKEYS.COLLECTION.REPORT_ACTIONS, - waitForCollectionCallback: false, callback: (allReportActions) => { Onyx.disconnect(connection); for (const reportAction of Object.values(allReportActions ?? {})) { @@ -1180,7 +1152,6 @@ describe('actions/IOU', () => { new Promise((resolve) => { const connection = Onyx.connect({ key: ONYXKEYS.COLLECTION.TRANSACTION, - waitForCollectionCallback: true, callback: (allTransactions) => { Onyx.disconnect(connection); for (const transaction of Object.values(allTransactions ?? {})) { @@ -1291,7 +1262,6 @@ describe('actions/IOU', () => { let selfDMReportID: string | undefined; await getOnyxData({ key: ONYXKEYS.COLLECTION.REPORT, - waitForCollectionCallback: true, callback: (reports) => { const selfDMReportOnyx = Object.values(reports ?? {}).find((report) => report?.reportID === selfDMReport.reportID); selfDMReportID = selfDMReportOnyx?.reportID; @@ -1306,7 +1276,6 @@ describe('actions/IOU', () => { let linkedTrackedExpenseReportID: string | undefined; await getOnyxData({ key: ONYXKEYS.COLLECTION.TRANSACTION, - waitForCollectionCallback: true, callback: (allTransactions) => { const transaction = Object.values(allTransactions ?? {}).find((t) => !isEmptyObject(t)); linkedTrackedExpenseReportID = transaction?.reportID; @@ -1881,7 +1850,6 @@ describe('actions/IOU', () => { const allReports = await new Promise>((resolve) => { const connection = Onyx.connect({ key: ONYXKEYS.COLLECTION.REPORT, - waitForCollectionCallback: true, callback: (reports) => { Onyx.disconnect(connection); resolve(reports); @@ -1904,7 +1872,6 @@ describe('actions/IOU', () => { const allReportActions = await new Promise>((resolve) => { const connection = Onyx.connect({ key: ONYXKEYS.COLLECTION.REPORT_ACTIONS, - waitForCollectionCallback: true, callback: (actions) => { Onyx.disconnect(connection); resolve(actions); @@ -1924,7 +1891,6 @@ describe('actions/IOU', () => { const allTransactions = await new Promise>((resolve) => { const connection = Onyx.connect({ key: ONYXKEYS.COLLECTION.TRANSACTION, - waitForCollectionCallback: true, callback: (transactions) => { Onyx.disconnect(connection); resolve(transactions); @@ -1979,7 +1945,6 @@ describe('actions/IOU', () => { const updatedTransactionThreadReport = await new Promise>((resolve) => { const connection = Onyx.connect({ key: ONYXKEYS.COLLECTION.REPORT, - waitForCollectionCallback: true, callback: (reports) => { Onyx.disconnect(connection); resolve(reports?.[`${ONYXKEYS.COLLECTION.REPORT}${transactionThreadReport?.reportID}`]); @@ -2054,7 +2019,6 @@ describe('actions/IOU', () => { new Promise((resolve) => { const connection = Onyx.connect({ key: ONYXKEYS.COLLECTION.REPORT, - waitForCollectionCallback: true, callback: (allReports) => { Onyx.disconnect(connection); @@ -2141,7 +2105,6 @@ describe('actions/IOU', () => { new Promise((resolve) => { const connection = Onyx.connect({ key: ONYXKEYS.COLLECTION.REPORT, - waitForCollectionCallback: true, callback: (allReports) => { Onyx.disconnect(connection); @@ -2219,7 +2182,6 @@ describe('actions/IOU', () => { new Promise((resolve) => { const connection = Onyx.connect({ key: ONYXKEYS.COLLECTION.REPORT, - waitForCollectionCallback: true, callback: (allReports) => { Onyx.disconnect(connection); @@ -2292,7 +2254,6 @@ describe('actions/IOU', () => { new Promise((resolve) => { const connection = Onyx.connect({ key: ONYXKEYS.COLLECTION.REPORT, - waitForCollectionCallback: true, callback: (allReports) => { Onyx.disconnect(connection); @@ -2366,7 +2327,6 @@ describe('actions/IOU', () => { new Promise((resolve) => { const connection = Onyx.connect({ key: ONYXKEYS.COLLECTION.REPORT, - waitForCollectionCallback: true, callback: (allReports) => { Onyx.disconnect(connection); diff --git a/tests/actions/IOUTest/DeleteMoneyRequestTest.ts b/tests/actions/IOUTest/DeleteMoneyRequestTest.ts index 7fe0c3f3cabb..7b2471c60aac 100644 --- a/tests/actions/IOUTest/DeleteMoneyRequestTest.ts +++ b/tests/actions/IOUTest/DeleteMoneyRequestTest.ts @@ -193,7 +193,6 @@ describe('actions/IOU/DeleteMoneyRequest', () => { const allReports = await new Promise>((resolve) => { const connection = Onyx.connect({ key: ONYXKEYS.COLLECTION.REPORT, - waitForCollectionCallback: true, callback: (reports) => { Onyx.disconnect(connection); resolve(reports); @@ -230,7 +229,6 @@ describe('actions/IOU/DeleteMoneyRequest', () => { const allReportActions = await new Promise>((resolve) => { const connection = Onyx.connect({ key: ONYXKEYS.COLLECTION.REPORT_ACTIONS, - waitForCollectionCallback: true, callback: (actions) => { Onyx.disconnect(connection); resolve(actions); @@ -251,7 +249,6 @@ describe('actions/IOU/DeleteMoneyRequest', () => { let allTransactions: OnyxCollection; await getOnyxData({ key: ONYXKEYS.COLLECTION.TRANSACTION, - waitForCollectionCallback: true, callback: (val) => { allTransactions = val; }, @@ -293,7 +290,6 @@ describe('actions/IOU/DeleteMoneyRequest', () => { let reportActionsForReport = await new Promise>((resolve) => { const connection = Onyx.connect({ key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${iouReport?.reportID}`, - waitForCollectionCallback: false, callback: (actionsForReport) => { Onyx.disconnect(connection); resolve(actionsForReport); @@ -311,7 +307,6 @@ describe('actions/IOU/DeleteMoneyRequest', () => { const t = await new Promise>((resolve) => { const connection = Onyx.connect({ key: `${ONYXKEYS.COLLECTION.TRANSACTION}${transaction?.transactionID}`, - waitForCollectionCallback: false, callback: (transactionResult) => { Onyx.disconnect(connection); resolve(transactionResult); @@ -330,7 +325,6 @@ describe('actions/IOU/DeleteMoneyRequest', () => { reportActionsForReport = await new Promise>((resolve) => { const connection = Onyx.connect({ key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${iouReport?.reportID}`, - waitForCollectionCallback: false, callback: (actionsForReport) => { Onyx.disconnect(connection); resolve(actionsForReport); @@ -347,7 +341,6 @@ describe('actions/IOU/DeleteMoneyRequest', () => { const tr = await new Promise>((resolve) => { const connection = Onyx.connect({ key: `${ONYXKEYS.COLLECTION.TRANSACTION}${transaction?.transactionID}`, - waitForCollectionCallback: false, callback: (transactionResult) => { Onyx.disconnect(connection); resolve(transactionResult); @@ -383,7 +376,6 @@ describe('actions/IOU/DeleteMoneyRequest', () => { let report = await new Promise>((resolve) => { const connection = Onyx.connect({ key: `${ONYXKEYS.COLLECTION.REPORT}${iouReport?.reportID}`, - waitForCollectionCallback: false, callback: (res) => { Onyx.disconnect(connection); resolve(res); @@ -401,7 +393,6 @@ describe('actions/IOU/DeleteMoneyRequest', () => { report = await new Promise>((resolve) => { const connection = Onyx.connect({ key: `${ONYXKEYS.COLLECTION.REPORT}${iouReport?.reportID}`, - waitForCollectionCallback: false, callback: (res) => { Onyx.disconnect(connection); resolve(res); @@ -467,7 +458,6 @@ describe('actions/IOU/DeleteMoneyRequest', () => { let allReports = await new Promise>((resolve) => { const connection = Onyx.connect({ key: ONYXKEYS.COLLECTION.REPORT, - waitForCollectionCallback: true, callback: (reports) => { Onyx.disconnect(connection); resolve(reports); @@ -488,7 +478,6 @@ describe('actions/IOU/DeleteMoneyRequest', () => { allReports = await new Promise>((resolve) => { const connection = Onyx.connect({ key: ONYXKEYS.COLLECTION.REPORT, - waitForCollectionCallback: true, callback: (reports) => { Onyx.disconnect(connection); resolve(reports); @@ -545,7 +534,6 @@ describe('actions/IOU/DeleteMoneyRequest', () => { const allReportActions = await new Promise>((resolve) => { const connection = Onyx.connect({ key: ONYXKEYS.COLLECTION.REPORT_ACTIONS, - waitForCollectionCallback: true, callback: (actions) => { Onyx.disconnect(connection); resolve(actions); @@ -585,7 +573,6 @@ describe('actions/IOU/DeleteMoneyRequest', () => { let report = await new Promise>((resolve) => { const connection = Onyx.connect({ key: `${ONYXKEYS.COLLECTION.REPORT}${thread.reportID}`, - waitForCollectionCallback: false, callback: (reportData) => { Onyx.disconnect(connection); resolve(reportData); @@ -600,7 +587,6 @@ describe('actions/IOU/DeleteMoneyRequest', () => { report = await new Promise>((resolve) => { const connection = Onyx.connect({ key: `${ONYXKEYS.COLLECTION.REPORT}${thread.reportID}`, - waitForCollectionCallback: false, callback: (reportData) => { Onyx.disconnect(connection); resolve(reportData); @@ -653,7 +639,6 @@ describe('actions/IOU/DeleteMoneyRequest', () => { const allReportActions = await new Promise>((resolve) => { const connection = Onyx.connect({ key: ONYXKEYS.COLLECTION.REPORT_ACTIONS, - waitForCollectionCallback: true, callback: (actions) => { Onyx.disconnect(connection); resolve(actions); @@ -710,7 +695,6 @@ describe('actions/IOU/DeleteMoneyRequest', () => { await new Promise((resolve) => { const connection = Onyx.connect({ key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${iouReport?.reportID}`, - waitForCollectionCallback: false, callback: (reportActionsForReport) => { Onyx.disconnect(connection); createIOUAction = Object.values(reportActionsForReport ?? {}).find((reportAction): reportAction is ReportAction => @@ -742,7 +726,6 @@ describe('actions/IOU/DeleteMoneyRequest', () => { const report = await new Promise>((resolve) => { const connection = Onyx.connect({ key: `${ONYXKEYS.COLLECTION.REPORT}${thread.reportID}`, - waitForCollectionCallback: false, callback: (reportData) => { Onyx.disconnect(connection); resolve(reportData); @@ -830,7 +813,6 @@ describe('actions/IOU/DeleteMoneyRequest', () => { const allReportActions = await new Promise>((resolve) => { const connection = Onyx.connect({ key: ONYXKEYS.COLLECTION.REPORT_ACTIONS, - waitForCollectionCallback: true, callback: (actions) => { Onyx.disconnect(connection); resolve(actions); @@ -864,7 +846,6 @@ describe('actions/IOU/DeleteMoneyRequest', () => { await new Promise((resolve) => { const connection = Onyx.connect({ key: `${ONYXKEYS.COLLECTION.REPORT}${thread.reportID}`, - waitForCollectionCallback: false, callback: (report) => { Onyx.disconnect(connection); expect(report?.reportID).toBeFalsy(); @@ -882,7 +863,6 @@ describe('actions/IOU/DeleteMoneyRequest', () => { await new Promise((resolve) => { const connection = Onyx.connect({ key: `${ONYXKEYS.COLLECTION.REPORT}${thread.reportID}`, - waitForCollectionCallback: false, callback: (report) => { Onyx.disconnect(connection); expect(report).toBeFalsy(); @@ -931,7 +911,6 @@ describe('actions/IOU/DeleteMoneyRequest', () => { const allReportActions = await new Promise>((resolve) => { const connection = Onyx.connect({ key: ONYXKEYS.COLLECTION.REPORT_ACTIONS, - waitForCollectionCallback: true, callback: (actions) => { Onyx.disconnect(connection); resolve(actions); @@ -967,7 +946,6 @@ describe('actions/IOU/DeleteMoneyRequest', () => { await new Promise((resolve) => { const connection = Onyx.connect({ key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${iouReport?.reportID}`, - waitForCollectionCallback: false, callback: (reportActionsForReport) => { Onyx.disconnect(connection); createIOUAction = Object.values(reportActionsForReport ?? {}).find((reportAction): reportAction is ReportAction => @@ -1061,7 +1039,6 @@ describe('actions/IOU/DeleteMoneyRequest', () => { await new Promise((resolve) => { const connection = Onyx.connect({ key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${iouReport?.reportID}`, - waitForCollectionCallback: false, callback: (reportActionsForReport) => { Onyx.disconnect(connection); createIOUAction = Object.values(reportActionsForReport ?? {}).find((reportAction): reportAction is ReportAction => @@ -1081,7 +1058,6 @@ describe('actions/IOU/DeleteMoneyRequest', () => { await new Promise((resolve) => { const connection = Onyx.connect({ key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${iouReport?.reportID}`, - waitForCollectionCallback: false, callback: (reportActionsForReport) => { Onyx.disconnect(connection); createIOUAction = Object.values(reportActionsForReport ?? {}).find((reportAction): reportAction is ReportAction => @@ -1246,7 +1222,6 @@ describe('actions/IOU/DeleteMoneyRequest', () => { const allReportActions = await new Promise>((resolve) => { const connection = Onyx.connect({ key: ONYXKEYS.COLLECTION.REPORT_ACTIONS, - waitForCollectionCallback: true, callback: (actions) => { Onyx.disconnect(connection); resolve(actions); @@ -1283,7 +1258,6 @@ describe('actions/IOU/DeleteMoneyRequest', () => { let allReports = await new Promise>((resolve) => { const connection = Onyx.connect({ key: ONYXKEYS.COLLECTION.REPORT, - waitForCollectionCallback: true, callback: (reports) => { Onyx.disconnect(connection); resolve(reports); @@ -1301,7 +1275,6 @@ describe('actions/IOU/DeleteMoneyRequest', () => { allReports = await new Promise>((resolve) => { const connection = Onyx.connect({ key: ONYXKEYS.COLLECTION.REPORT, - waitForCollectionCallback: true, callback: (reports) => { Onyx.disconnect(connection); resolve(reports); @@ -1471,7 +1444,6 @@ describe('actions/IOU/DeleteMoneyRequest', () => { const allReportActions = await new Promise>((resolve) => { const connection = Onyx.connect({ key: ONYXKEYS.COLLECTION.REPORT_ACTIONS, - waitForCollectionCallback: true, callback: (actions) => { Onyx.disconnect(connection); resolve(actions); diff --git a/tests/actions/IOUTest/DuplicateTest.ts b/tests/actions/IOUTest/DuplicateTest.ts index fc387144c05a..2fd73ec51fb3 100644 --- a/tests/actions/IOUTest/DuplicateTest.ts +++ b/tests/actions/IOUTest/DuplicateTest.ts @@ -552,7 +552,6 @@ describe('actions/Duplicate', () => { await new Promise((resolve) => { const connection = Onyx.connect({ key: `${ONYXKEYS.COLLECTION.REPORT}${transactionThreadReport1.reportID}`, - waitForCollectionCallback: false, callback: (report) => { Onyx.disconnect(connection); expect(report?.reportID).toBeFalsy(); @@ -564,7 +563,6 @@ describe('actions/Duplicate', () => { await new Promise((resolve) => { const connection = Onyx.connect({ key: `${ONYXKEYS.COLLECTION.REPORT}${transactionThreadReport2.reportID}`, - waitForCollectionCallback: false, callback: (report) => { Onyx.disconnect(connection); expect(report?.reportID).toBeFalsy(); @@ -1218,7 +1216,6 @@ describe('actions/Duplicate', () => { recentWaypoints = (await getOnyxValue(ONYXKEYS.NVP_RECENT_WAYPOINTS)) ?? []; await getOnyxData({ key: `${ONYXKEYS.COLLECTION.POLICY_TAGS}`, - waitForCollectionCallback: true, callback: (value) => { targetPolicyTags = value?.[`${ONYXKEYS.COLLECTION.POLICY_TAGS}${mockPolicy.id}`] ?? {}; }, @@ -1270,7 +1267,6 @@ describe('actions/Duplicate', () => { await getOnyxData({ key: ONYXKEYS.COLLECTION.TRANSACTION, - waitForCollectionCallback: true, callback: (allTransactions) => { duplicatedTransaction = Object.values(allTransactions ?? {}).find((t) => !!t); }, @@ -1334,7 +1330,6 @@ describe('actions/Duplicate', () => { await getOnyxData({ key: ONYXKEYS.COLLECTION.TRANSACTION, - waitForCollectionCallback: true, callback: (allTransactions) => { const transactions = Object.values(allTransactions ?? {}).filter((t) => !!t); expect(transactions).toHaveLength(1); @@ -1389,7 +1384,6 @@ describe('actions/Duplicate', () => { let duplicatedTransaction: OnyxEntry; await getOnyxData({ key: ONYXKEYS.COLLECTION.TRANSACTION, - waitForCollectionCallback: true, callback: (allTransactions) => { duplicatedTransaction = Object.values(allTransactions ?? {}).find((t) => !!t); }, @@ -1438,7 +1432,6 @@ describe('actions/Duplicate', () => { let duplicatedTransaction: OnyxEntry; await getOnyxData({ key: ONYXKEYS.COLLECTION.TRANSACTION, - waitForCollectionCallback: true, callback: (allTransactions) => { duplicatedTransaction = Object.values(allTransactions ?? {}).find((t) => !!t); }, @@ -1488,7 +1481,6 @@ describe('actions/Duplicate', () => { await getOnyxData({ key: ONYXKEYS.COLLECTION.TRANSACTION, - waitForCollectionCallback: true, callback: (allTransactions) => { duplicatedTransaction = Object.values(allTransactions ?? {}).find((t) => !!t); }, @@ -1540,7 +1532,6 @@ describe('actions/Duplicate', () => { await getOnyxData({ key: ONYXKEYS.COLLECTION.TRANSACTION, - waitForCollectionCallback: true, callback: (allTransactions) => { duplicatedTransaction = Object.values(allTransactions ?? {}).find((t) => !!t); }, @@ -1602,7 +1593,6 @@ describe('actions/Duplicate', () => { await getOnyxData({ key: ONYXKEYS.COLLECTION.TRANSACTION, - waitForCollectionCallback: true, callback: (allTransactions) => { const transactions = Object.values(allTransactions ?? {}).filter((t) => !!t); expect(transactions).toHaveLength(1); @@ -1780,7 +1770,6 @@ describe('actions/Duplicate', () => { let duplicatedTransaction: OnyxEntry; await getOnyxData({ key: ONYXKEYS.COLLECTION.TRANSACTION, - waitForCollectionCallback: true, callback: (allTransactions) => { duplicatedTransaction = Object.values(allTransactions ?? {}).find((t) => !!t && t.transactionID !== transactionID); }, @@ -1968,7 +1957,6 @@ describe('actions/Duplicate', () => { await getOnyxData({ key: ONYXKEYS.COLLECTION.TRANSACTION, - waitForCollectionCallback: true, callback: (allTransactions) => { duplicatedTransaction = Object.values(allTransactions ?? {}).find((t) => !!t); }, @@ -2021,7 +2009,6 @@ describe('actions/Duplicate', () => { await getOnyxData({ key: ONYXKEYS.COLLECTION.TRANSACTION, - waitForCollectionCallback: true, callback: (allTransactions) => { duplicatedTransaction = Object.values(allTransactions ?? {}).find((t) => !!t); }, @@ -2337,7 +2324,6 @@ describe('actions/Duplicate', () => { let duplicatedTransaction: OnyxEntry; await getOnyxData({ key: ONYXKEYS.COLLECTION.TRANSACTION, - waitForCollectionCallback: true, callback: (allTransactions) => { duplicatedTransaction = Object.values(allTransactions ?? {}).find((t) => !!t && t.transactionID !== scanExpenseTx.transactionID); }, diff --git a/tests/actions/IOUTest/PayMoneyRequestTest.ts b/tests/actions/IOUTest/PayMoneyRequestTest.ts index 4ffa711dec26..c8e8867c9503 100644 --- a/tests/actions/IOUTest/PayMoneyRequestTest.ts +++ b/tests/actions/IOUTest/PayMoneyRequestTest.ts @@ -166,7 +166,6 @@ describe('actions/IOU/PayMoneyRequest', () => { new Promise((resolve) => { const connection = Onyx.connect({ key: ONYXKEYS.COLLECTION.REPORT, - waitForCollectionCallback: true, callback: (allReports) => { Onyx.disconnect(connection); @@ -199,7 +198,6 @@ describe('actions/IOU/PayMoneyRequest', () => { new Promise((resolve) => { const connection = Onyx.connect({ key: ONYXKEYS.COLLECTION.REPORT_ACTIONS, - waitForCollectionCallback: true, callback: (allReportActions) => { Onyx.disconnect(connection); @@ -221,7 +219,6 @@ describe('actions/IOU/PayMoneyRequest', () => { new Promise((resolve) => { const connection = Onyx.connect({ key: ONYXKEYS.COLLECTION.TRANSACTION, - waitForCollectionCallback: true, callback: (allTransactions) => { Onyx.disconnect(connection); expect(Object.values(allTransactions ?? {}).length).toBe(1); @@ -261,7 +258,6 @@ describe('actions/IOU/PayMoneyRequest', () => { new Promise((resolve) => { const connection = Onyx.connect({ key: ONYXKEYS.COLLECTION.REPORT, - waitForCollectionCallback: true, callback: (allReports) => { Onyx.disconnect(connection); @@ -285,7 +281,6 @@ describe('actions/IOU/PayMoneyRequest', () => { new Promise((resolve) => { const connection = Onyx.connect({ key: ONYXKEYS.COLLECTION.REPORT_ACTIONS, - waitForCollectionCallback: true, callback: (allReportActions) => { Onyx.disconnect(connection); @@ -309,7 +304,6 @@ describe('actions/IOU/PayMoneyRequest', () => { new Promise((resolve) => { const connection = Onyx.connect({ key: ONYXKEYS.COLLECTION.REPORT, - waitForCollectionCallback: true, callback: (allReports) => { Onyx.disconnect(connection); @@ -333,7 +327,6 @@ describe('actions/IOU/PayMoneyRequest', () => { new Promise((resolve) => { const connection = Onyx.connect({ key: ONYXKEYS.COLLECTION.REPORT_ACTIONS, - waitForCollectionCallback: true, callback: (allReportActions) => { Onyx.disconnect(connection); @@ -391,7 +384,6 @@ describe('actions/IOU/PayMoneyRequest', () => { new Promise((resolve) => { const connection = Onyx.connect({ key: ONYXKEYS.COLLECTION.REPORT, - waitForCollectionCallback: true, callback: (allReports) => { Onyx.disconnect(connection); chatReport = Object.values(allReports ?? {}).find((report) => report?.chatType === CONST.REPORT.CHAT_TYPE.POLICY_EXPENSE_CHAT); @@ -438,7 +430,6 @@ describe('actions/IOU/PayMoneyRequest', () => { new Promise((resolve) => { const connection = Onyx.connect({ key: ONYXKEYS.COLLECTION.REPORT, - waitForCollectionCallback: true, callback: (allReports) => { Onyx.disconnect(connection); expenseReport = Object.values(allReports ?? {}).find((report) => report?.type === CONST.REPORT.TYPE.IOU); @@ -473,7 +464,6 @@ describe('actions/IOU/PayMoneyRequest', () => { new Promise((resolve) => { const connection = Onyx.connect({ key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${expenseReport?.reportID}`, - waitForCollectionCallback: false, callback: (allActions) => { Onyx.disconnect(connection); expect(Object.values(allActions ?? {})).toEqual( @@ -503,7 +493,6 @@ describe('actions/IOU/PayMoneyRequest', () => { new Promise((resolve) => { const connection = Onyx.connect({ key: ONYXKEYS.COLLECTION.REPORT, - waitForCollectionCallback: true, callback: (allReports) => { Onyx.disconnect(connection); const updatedIOUReport = Object.values(allReports ?? {}).find((report) => report?.type === CONST.REPORT.TYPE.IOU); @@ -556,7 +545,6 @@ describe('actions/IOU/PayMoneyRequest', () => { new Promise((resolve) => { const connection = Onyx.connect({ key: ONYXKEYS.COLLECTION.REPORT, - waitForCollectionCallback: true, callback: (allReports) => { Onyx.disconnect(connection); chatReport = Object.values(allReports ?? {}).find((report) => report?.chatType === CONST.REPORT.CHAT_TYPE.POLICY_EXPENSE_CHAT); @@ -603,7 +591,6 @@ describe('actions/IOU/PayMoneyRequest', () => { new Promise((resolve) => { const connection = Onyx.connect({ key: ONYXKEYS.COLLECTION.REPORT, - waitForCollectionCallback: true, callback: (allReports) => { Onyx.disconnect(connection); expenseReport = Object.values(allReports ?? {}).find((report) => report?.type === CONST.REPORT.TYPE.IOU); @@ -639,7 +626,6 @@ describe('actions/IOU/PayMoneyRequest', () => { new Promise((resolve) => { const connection = Onyx.connect({ key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${expenseReport?.reportID}`, - waitForCollectionCallback: false, callback: (allActions) => { Onyx.disconnect(connection); const erroredAction = Object.values(allActions ?? {}).find((action) => !isEmptyObject(action?.errors)); @@ -1366,7 +1352,6 @@ describe('actions/IOU/PayMoneyRequest', () => { .then(() => getOnyxData({ key: ONYXKEYS.COLLECTION.REPORT, - waitForCollectionCallback: true, callback: (allReports) => { chatReport = Object.values(allReports ?? {}).find((report) => report?.chatType === CONST.REPORT.CHAT_TYPE.POLICY_EXPENSE_CHAT); }, @@ -1409,7 +1394,6 @@ describe('actions/IOU/PayMoneyRequest', () => { // And given an expense report has now been created which holds the IOU getOnyxData({ key: ONYXKEYS.COLLECTION.REPORT, - waitForCollectionCallback: true, callback: (allReports) => { expenseReport = Object.values(allReports ?? {}).find((report) => report?.type === CONST.REPORT.TYPE.IOU); }, @@ -1446,7 +1430,6 @@ describe('actions/IOU/PayMoneyRequest', () => { .then(() => getOnyxData({ key: ONYXKEYS.COLLECTION.REPORT, - waitForCollectionCallback: true, callback: (allReports) => { const chatReportData = allReports?.[`${ONYXKEYS.COLLECTION.REPORT}${chatReport?.reportID}`]; // Then the policy expense chat report has the iouReportID of the IOU expense report @@ -1492,7 +1475,6 @@ describe('actions/IOU/PayMoneyRequest', () => { // Get the policy expense chat report await getOnyxData({ key: ONYXKEYS.COLLECTION.REPORT, - waitForCollectionCallback: true, callback: (allReports) => { chatReport = Object.values(allReports ?? {}).find((report) => report?.chatType === CONST.REPORT.CHAT_TYPE.POLICY_EXPENSE_CHAT); }, @@ -1533,7 +1515,6 @@ describe('actions/IOU/PayMoneyRequest', () => { // And given an expense report has now been created which holds the IOU await getOnyxData({ key: ONYXKEYS.COLLECTION.REPORT, - waitForCollectionCallback: true, callback: (allReports) => { expenseReport = Object.values(allReports ?? {}).find((report) => report?.type === CONST.REPORT.TYPE.IOU); }, @@ -1742,7 +1723,6 @@ describe('actions/IOU/PayMoneyRequest', () => { // Get the policy expense chat report await getOnyxData({ key: ONYXKEYS.COLLECTION.REPORT, - waitForCollectionCallback: true, callback: (allReports) => { chatReport = Object.values(allReports ?? {}).find((report) => report?.chatType === CONST.REPORT.CHAT_TYPE.POLICY_EXPENSE_CHAT); }, @@ -1783,7 +1763,6 @@ describe('actions/IOU/PayMoneyRequest', () => { // And given an expense report has now been created which holds the IOU await getOnyxData({ key: ONYXKEYS.COLLECTION.REPORT, - waitForCollectionCallback: true, callback: (allReports) => { expenseReport = Object.values(allReports ?? {}).find((report) => report?.type === CONST.REPORT.TYPE.IOU); }, diff --git a/tests/actions/IOUTest/ReceiptTest.ts b/tests/actions/IOUTest/ReceiptTest.ts index b19f5f2ce834..0a67062b00d2 100644 --- a/tests/actions/IOUTest/ReceiptTest.ts +++ b/tests/actions/IOUTest/ReceiptTest.ts @@ -119,7 +119,6 @@ describe('actions/IOU/Receipt', () => { return new Promise>((resolve) => { const connection = Onyx.connect({ key: ONYXKEYS.COLLECTION.TRANSACTION, - waitForCollectionCallback: true, callback: (transactions) => { Onyx.disconnect(connection); resolve(transactions[`${ONYXKEYS.COLLECTION.TRANSACTION}${id}`]); diff --git a/tests/actions/IOUTest/RejectMoneyRequestTest.ts b/tests/actions/IOUTest/RejectMoneyRequestTest.ts index 70b800c3fcb9..9934e1b657b2 100644 --- a/tests/actions/IOUTest/RejectMoneyRequestTest.ts +++ b/tests/actions/IOUTest/RejectMoneyRequestTest.ts @@ -276,7 +276,6 @@ describe('actions/IOU/RejectMoneyRequest', () => { let allReports: OnyxCollection; await getOnyxData({ key: ONYXKEYS.COLLECTION.REPORT, - waitForCollectionCallback: true, callback: (reports) => { allReports = reports; }, diff --git a/tests/actions/IOUTest/ReportWorkflowTest.ts b/tests/actions/IOUTest/ReportWorkflowTest.ts index b343b622ead6..0a5ae5c64c2e 100644 --- a/tests/actions/IOUTest/ReportWorkflowTest.ts +++ b/tests/actions/IOUTest/ReportWorkflowTest.ts @@ -162,7 +162,6 @@ describe('actions/IOU/ReportWorkflow', () => { new Promise((resolve) => { const connection = Onyx.connect({ key: ONYXKEYS.COLLECTION.REPORT, - waitForCollectionCallback: true, callback: (allReports) => { Onyx.disconnect(connection); chatReport = Object.values(allReports ?? {}).find((report) => report?.chatType === CONST.REPORT.CHAT_TYPE.POLICY_EXPENSE_CHAT); @@ -209,7 +208,6 @@ describe('actions/IOU/ReportWorkflow', () => { new Promise((resolve) => { const connection = Onyx.connect({ key: ONYXKEYS.COLLECTION.REPORT, - waitForCollectionCallback: true, callback: (allReports) => { Onyx.disconnect(connection); expenseReport = Object.values(allReports ?? {}).find((report) => report?.type === CONST.REPORT.TYPE.EXPENSE); @@ -227,7 +225,6 @@ describe('actions/IOU/ReportWorkflow', () => { new Promise((resolve) => { const connection = Onyx.connect({ key: ONYXKEYS.COLLECTION.REPORT, - waitForCollectionCallback: true, callback: (allReports) => { Onyx.disconnect(connection); expenseReport = Object.values(allReports ?? {}).find((report) => report?.type === CONST.REPORT.TYPE.EXPENSE); @@ -264,7 +261,6 @@ describe('actions/IOU/ReportWorkflow', () => { new Promise((resolve) => { const connection = Onyx.connect({ key: ONYXKEYS.COLLECTION.REPORT, - waitForCollectionCallback: true, callback: (allReports) => { Onyx.disconnect(connection); expenseReport = Object.values(allReports ?? {}).find((report) => report?.type === CONST.REPORT.TYPE.EXPENSE); @@ -311,7 +307,6 @@ describe('actions/IOU/ReportWorkflow', () => { new Promise((resolve) => { const connection = Onyx.connect({ key: ONYXKEYS.COLLECTION.REPORT, - waitForCollectionCallback: true, callback: (allReports) => { Onyx.disconnect(connection); chatReport = Object.values(allReports ?? {}).find((report) => report?.chatType === CONST.REPORT.CHAT_TYPE.POLICY_EXPENSE_CHAT); @@ -391,7 +386,6 @@ describe('actions/IOU/ReportWorkflow', () => { new Promise((resolve) => { const connection = Onyx.connect({ key: ONYXKEYS.COLLECTION.REPORT, - waitForCollectionCallback: true, callback: (allReports) => { Onyx.disconnect(connection); chatReport = Object.values(allReports ?? {}).find((report) => report?.chatType === CONST.REPORT.CHAT_TYPE.POLICY_EXPENSE_CHAT); @@ -438,7 +432,6 @@ describe('actions/IOU/ReportWorkflow', () => { new Promise((resolve) => { const connection = Onyx.connect({ key: ONYXKEYS.COLLECTION.REPORT, - waitForCollectionCallback: true, callback: (allReports) => { Onyx.disconnect(connection); chatReport = Object.values(allReports ?? {}).find((report) => report?.chatType === CONST.REPORT.CHAT_TYPE.POLICY_EXPENSE_CHAT); @@ -485,7 +478,6 @@ describe('actions/IOU/ReportWorkflow', () => { new Promise((resolve) => { const connection = Onyx.connect({ key: ONYXKEYS.COLLECTION.POLICY, - waitForCollectionCallback: true, callback: (allPolicies) => { Onyx.disconnect(connection); policy = Object.values(allPolicies ?? {}).find((p): p is OnyxEntry => p?.name === "Carlos's Workspace"); @@ -500,7 +492,6 @@ describe('actions/IOU/ReportWorkflow', () => { new Promise((resolve) => { const connection = Onyx.connect({ key: ONYXKEYS.COLLECTION.REPORT, - waitForCollectionCallback: true, callback: (allReports) => { Onyx.disconnect(connection); expenseReport = Object.values(allReports ?? {}).find((report) => report?.type === CONST.REPORT.TYPE.EXPENSE); @@ -526,7 +517,6 @@ describe('actions/IOU/ReportWorkflow', () => { new Promise((resolve) => { const connection = Onyx.connect({ key: ONYXKEYS.COLLECTION.REPORT, - waitForCollectionCallback: true, callback: (allReports) => { Onyx.disconnect(connection); expenseReport = Object.values(allReports ?? {}).find((report) => report?.type === CONST.REPORT.TYPE.EXPENSE); @@ -566,7 +556,6 @@ describe('actions/IOU/ReportWorkflow', () => { new Promise((resolve) => { const connection = Onyx.connect({ key: ONYXKEYS.COLLECTION.REPORT, - waitForCollectionCallback: true, callback: (allReports) => { Onyx.disconnect(connection); expenseReport = Object.values(allReports ?? {}).find((report) => report?.type === CONST.REPORT.TYPE.EXPENSE); @@ -618,7 +607,6 @@ describe('actions/IOU/ReportWorkflow', () => { new Promise((resolve) => { const connection = Onyx.connect({ key: ONYXKEYS.COLLECTION.REPORT, - waitForCollectionCallback: true, callback: (allReports) => { Onyx.disconnect(connection); chatReport = Object.values(allReports ?? {}).find((report) => report?.chatType === CONST.REPORT.CHAT_TYPE.POLICY_EXPENSE_CHAT); @@ -665,7 +653,6 @@ describe('actions/IOU/ReportWorkflow', () => { new Promise((resolve) => { const connection = Onyx.connect({ key: ONYXKEYS.COLLECTION.REPORT, - waitForCollectionCallback: true, callback: (allReports) => { Onyx.disconnect(connection); chatReport = Object.values(allReports ?? {}).find((report) => report?.chatType === CONST.REPORT.CHAT_TYPE.POLICY_EXPENSE_CHAT); @@ -712,7 +699,6 @@ describe('actions/IOU/ReportWorkflow', () => { new Promise((resolve) => { const connection = Onyx.connect({ key: ONYXKEYS.COLLECTION.REPORT, - waitForCollectionCallback: true, callback: (allReports) => { Onyx.disconnect(connection); chatReport = Object.values(allReports ?? {}).find((report) => report?.chatType === CONST.REPORT.CHAT_TYPE.POLICY_EXPENSE_CHAT); @@ -759,7 +745,6 @@ describe('actions/IOU/ReportWorkflow', () => { new Promise((resolve) => { const connection = Onyx.connect({ key: ONYXKEYS.COLLECTION.POLICY, - waitForCollectionCallback: true, callback: (allPolicies) => { Onyx.disconnect(connection); policy = Object.values(allPolicies ?? {}).find((p): p is OnyxEntry => p?.name === "Carlos's Workspace"); @@ -774,7 +759,6 @@ describe('actions/IOU/ReportWorkflow', () => { new Promise((resolve) => { const connection = Onyx.connect({ key: ONYXKEYS.COLLECTION.REPORT, - waitForCollectionCallback: true, callback: (allReports) => { Onyx.disconnect(connection); expenseReport = Object.values(allReports ?? {}).find((report) => report?.type === CONST.REPORT.TYPE.EXPENSE); @@ -800,7 +784,6 @@ describe('actions/IOU/ReportWorkflow', () => { new Promise((resolve) => { const connection = Onyx.connect({ key: ONYXKEYS.COLLECTION.REPORT, - waitForCollectionCallback: true, callback: (allReports) => { Onyx.disconnect(connection); expenseReport = Object.values(allReports ?? {}).find((report) => report?.type === CONST.REPORT.TYPE.EXPENSE); @@ -838,7 +821,6 @@ describe('actions/IOU/ReportWorkflow', () => { new Promise((resolve) => { const connection = Onyx.connect({ key: ONYXKEYS.COLLECTION.REPORT, - waitForCollectionCallback: true, callback: (allReports) => { Onyx.disconnect(connection); expenseReport = Object.values(allReports ?? {}).find((report) => report?.type === CONST.REPORT.TYPE.EXPENSE); @@ -890,7 +872,6 @@ describe('actions/IOU/ReportWorkflow', () => { new Promise((resolve) => { const connection = Onyx.connect({ key: ONYXKEYS.COLLECTION.POLICY, - waitForCollectionCallback: true, callback: (allPolicies) => { Onyx.disconnect(connection); policy = Object.values(allPolicies ?? {}).find((p): p is OnyxEntry => p?.id === policyID); @@ -906,7 +887,6 @@ describe('actions/IOU/ReportWorkflow', () => { new Promise((resolve) => { const connection = Onyx.connect({ key: ONYXKEYS.COLLECTION.REPORT, - waitForCollectionCallback: true, callback: (allReports) => { Onyx.disconnect(connection); chatReport = Object.values(allReports ?? {}).find( @@ -955,7 +935,6 @@ describe('actions/IOU/ReportWorkflow', () => { new Promise((resolve) => { const connection = Onyx.connect({ key: ONYXKEYS.COLLECTION.REPORT, - waitForCollectionCallback: true, callback: (allReports) => { Onyx.disconnect(connection); expenseReport = Object.values(allReports ?? {}).find((report) => report?.type === CONST.REPORT.TYPE.EXPENSE && report?.policyID === policyID); @@ -973,7 +952,6 @@ describe('actions/IOU/ReportWorkflow', () => { new Promise((resolve) => { const connection = Onyx.connect({ key: ONYXKEYS.COLLECTION.REPORT, - waitForCollectionCallback: true, callback: (allReports) => { Onyx.disconnect(connection); expenseReport = Object.values(allReports ?? {}).find((report) => report?.type === CONST.REPORT.TYPE.EXPENSE && report?.policyID === policyID); @@ -1009,7 +987,6 @@ describe('actions/IOU/ReportWorkflow', () => { new Promise((resolve) => { const connection = Onyx.connect({ key: ONYXKEYS.COLLECTION.REPORT, - waitForCollectionCallback: true, callback: (allReports) => { Onyx.disconnect(connection); expenseReport = Object.values(allReports ?? {}).find((report) => report?.type === CONST.REPORT.TYPE.EXPENSE && report?.policyID === policyID); @@ -1118,7 +1095,6 @@ describe('actions/IOU/ReportWorkflow', () => { let chatReport: OnyxEntry; await getOnyxData({ key: ONYXKEYS.COLLECTION.REPORT, - waitForCollectionCallback: true, callback: (allReports) => { chatReport = Object.values(allReports ?? {}).find((report) => report?.chatType === CONST.REPORT.CHAT_TYPE.POLICY_EXPENSE_CHAT && report?.policyID === policyID); }, @@ -1158,7 +1134,6 @@ describe('actions/IOU/ReportWorkflow', () => { let expenseReport: OnyxEntry; await getOnyxData({ key: ONYXKEYS.COLLECTION.REPORT, - waitForCollectionCallback: true, callback: (allReports) => { expenseReport = Object.values(allReports ?? {}).find((report) => report?.type === CONST.REPORT.TYPE.EXPENSE && report?.policyID === policyID); }, diff --git a/tests/actions/IOUTest/SendInvoiceTest.ts b/tests/actions/IOUTest/SendInvoiceTest.ts index 61f818f2c36c..5f4fabd85aa5 100644 --- a/tests/actions/IOUTest/SendInvoiceTest.ts +++ b/tests/actions/IOUTest/SendInvoiceTest.ts @@ -651,7 +651,6 @@ describe('actions/SendInvoice', () => { await new Promise((resolve) => { const connection = Onyx.connect({ key: ONYXKEYS.COLLECTION.TRANSACTION, - waitForCollectionCallback: true, callback: (allTransactions) => { Onyx.disconnect(connection); const transactionValue = Object.values(allTransactions).at(0); diff --git a/tests/actions/IOUTest/SplitSelfDMTest.ts b/tests/actions/IOUTest/SplitSelfDMTest.ts index 9c01ef337b58..7268fb1d1a81 100644 --- a/tests/actions/IOUTest/SplitSelfDMTest.ts +++ b/tests/actions/IOUTest/SplitSelfDMTest.ts @@ -150,21 +150,18 @@ describe('updateSplitTransactionsFromSplitExpensesFlow - selfDM', () => { await getOnyxData({ key: ONYXKEYS.COLLECTION.TRANSACTION, - waitForCollectionCallback: true, callback: (value) => { allTransactions = value; }, }); await getOnyxData({ key: ONYXKEYS.COLLECTION.REPORT, - waitForCollectionCallback: true, callback: (value) => { allReports = value; }, }); await getOnyxData({ key: ONYXKEYS.COLLECTION.REPORT_NAME_VALUE_PAIRS, - waitForCollectionCallback: true, callback: (value) => { allReportNameValuePairs = value; }, @@ -237,21 +234,18 @@ describe('updateSplitTransactionsFromSplitExpensesFlow - selfDM', () => { await getOnyxData({ key: ONYXKEYS.COLLECTION.TRANSACTION, - waitForCollectionCallback: true, callback: (value) => { allTransactions = value; }, }); await getOnyxData({ key: ONYXKEYS.COLLECTION.REPORT, - waitForCollectionCallback: true, callback: (value) => { allReports = value; }, }); await getOnyxData({ key: ONYXKEYS.COLLECTION.REPORT_NAME_VALUE_PAIRS, - waitForCollectionCallback: true, callback: (value) => { allReportNameValuePairs = value; }, @@ -337,28 +331,24 @@ describe('updateSplitTransactionsFromSplitExpensesFlow - selfDM', () => { await getOnyxData({ key: ONYXKEYS.COLLECTION.TRANSACTION, - waitForCollectionCallback: true, callback: (value) => { allTransactions = value; }, }); await getOnyxData({ key: ONYXKEYS.COLLECTION.REPORT, - waitForCollectionCallback: true, callback: (value) => { allReports = value; }, }); await getOnyxData({ key: ONYXKEYS.COLLECTION.REPORT_NAME_VALUE_PAIRS, - waitForCollectionCallback: true, callback: (value) => { allReportNameValuePairs = value; }, }); await getOnyxData({ key: ONYXKEYS.COLLECTION.SNAPSHOT, - waitForCollectionCallback: true, callback: (value) => { allSnapshots = value as OnyxCollection; }, @@ -437,21 +427,18 @@ describe('updateSplitTransactionsFromSplitExpensesFlow - selfDM', () => { await getOnyxData({ key: ONYXKEYS.COLLECTION.TRANSACTION, - waitForCollectionCallback: true, callback: (value) => { allTransactions = value; }, }); await getOnyxData({ key: ONYXKEYS.COLLECTION.REPORT, - waitForCollectionCallback: true, callback: (value) => { allReports = value; }, }); await getOnyxData({ key: ONYXKEYS.COLLECTION.REPORT_NAME_VALUE_PAIRS, - waitForCollectionCallback: true, callback: (value) => { allReportNameValuePairs = value; }, @@ -510,7 +497,6 @@ describe('updateSplitTransactionsFromSplitExpensesFlow - selfDM', () => { // Step 2: Re-fetch allTransactions (now contains the created children) await getOnyxData({ key: ONYXKEYS.COLLECTION.TRANSACTION, - waitForCollectionCallback: true, callback: (value) => { allTransactions = value; }, @@ -584,14 +570,12 @@ describe('updateSplitTransactionsFromSplitExpensesFlow - selfDM', () => { await getOnyxData({ key: ONYXKEYS.COLLECTION.TRANSACTION, - waitForCollectionCallback: true, callback: (value) => { allTransactions = value; }, }); await getOnyxData({ key: ONYXKEYS.COLLECTION.REPORT, - waitForCollectionCallback: true, callback: (value) => { allReports = value; for (const key of Object.keys(value ?? {})) { @@ -601,7 +585,6 @@ describe('updateSplitTransactionsFromSplitExpensesFlow - selfDM', () => { }); await getOnyxData({ key: ONYXKEYS.COLLECTION.REPORT_NAME_VALUE_PAIRS, - waitForCollectionCallback: true, callback: (value) => { allReportNameValuePairs = value; }, @@ -659,7 +642,6 @@ describe('updateSplitTransactionsFromSplitExpensesFlow - selfDM', () => { let newIouReport: OnyxEntry | undefined; await getOnyxData({ key: ONYXKEYS.COLLECTION.REPORT, - waitForCollectionCallback: true, callback: (allReportsAfter) => { // Check if any NEW IOU-type report was created after the split newIouReport = Object.entries(allReportsAfter ?? {}) diff --git a/tests/actions/IOUTest/SplitTest.ts b/tests/actions/IOUTest/SplitTest.ts index 0d9be57f16fe..230074baed25 100644 --- a/tests/actions/IOUTest/SplitTest.ts +++ b/tests/actions/IOUTest/SplitTest.ts @@ -173,7 +173,6 @@ const getPolicyTags = async (reportID: string) => { let allPolicyTags: OnyxCollection; await getOnyxData({ key: `${ONYXKEYS.COLLECTION.POLICY_TAGS}`, - waitForCollectionCallback: true, callback: (value) => { allPolicyTags = value; }, @@ -188,7 +187,6 @@ const getPolicyTags = async (reportID: string) => { const getParticipantsPolicyTags = async (participants: IOUParticipant[]) => { let participantsPolicyTags: Record = {}; await getOnyxData({ - waitForCollectionCallback: true, key: `${ONYXKEYS.COLLECTION.POLICY_TAGS}`, callback: (tags) => { participantsPolicyTags = participants.reduce>((acc, participant) => { @@ -415,7 +413,6 @@ describe('split expense', () => { new Promise((resolve) => { const connection = Onyx.connect({ key: ONYXKEYS.COLLECTION.REPORT, - waitForCollectionCallback: true, callback: (allReports) => { Onyx.disconnect(connection); @@ -493,7 +490,6 @@ describe('split expense', () => { new Promise((resolve) => { const connection = Onyx.connect({ key: ONYXKEYS.COLLECTION.REPORT_ACTIONS, - waitForCollectionCallback: true, callback: (allReportActions) => { Onyx.disconnect(connection); @@ -583,7 +579,6 @@ describe('split expense', () => { new Promise((resolve) => { const connection = Onyx.connect({ key: ONYXKEYS.COLLECTION.TRANSACTION, - waitForCollectionCallback: true, callback: (allTransactions) => { Onyx.disconnect(connection); @@ -649,7 +644,6 @@ describe('split expense', () => { new Promise((resolve) => { const connection = Onyx.connect({ key: ONYXKEYS.PERSONAL_DETAILS_LIST, - waitForCollectionCallback: false, callback: (allPersonalDetails) => { Onyx.disconnect(connection); expect(allPersonalDetails).toMatchObject({ @@ -671,7 +665,6 @@ describe('split expense', () => { new Promise((resolve) => { const connection = Onyx.connect({ key: ONYXKEYS.COLLECTION.REPORT, - waitForCollectionCallback: true, callback: (allReports) => { Onyx.disconnect(connection); for (const report of Object.values(allReports ?? {})) { @@ -692,7 +685,6 @@ describe('split expense', () => { new Promise((resolve) => { const connection = Onyx.connect({ key: ONYXKEYS.COLLECTION.REPORT_ACTIONS, - waitForCollectionCallback: true, callback: (allReportActions) => { Onyx.disconnect(connection); for (const reportAction of Object.values(allReportActions ?? {})) { @@ -708,7 +700,6 @@ describe('split expense', () => { new Promise((resolve) => { const connection = Onyx.connect({ key: ONYXKEYS.COLLECTION.TRANSACTION, - waitForCollectionCallback: true, callback: (allTransactions) => { Onyx.disconnect(connection); for (const transaction of Object.values(allTransactions ?? {})) { @@ -969,7 +960,6 @@ describe('split expense', () => { const optimisticTransaction = await new Promise>((resolve) => { const connection = Onyx.connect({ key: ONYXKEYS.COLLECTION.TRANSACTION, - waitForCollectionCallback: true, callback: (transactions) => { Onyx.disconnect(connection); resolve(Object.values(transactions ?? {}).find((transaction) => transaction?.amount === -(transactionAmount / 2))); @@ -1232,21 +1222,18 @@ describe('split expense', () => { let allReportNameValuePairs: OnyxCollection; await getOnyxData({ key: ONYXKEYS.COLLECTION.TRANSACTION, - waitForCollectionCallback: true, callback: (value) => { allTransactions = value; }, }); await getOnyxData({ key: ONYXKEYS.COLLECTION.REPORT, - waitForCollectionCallback: true, callback: (value) => { allReports = value; }, }); await getOnyxData({ key: ONYXKEYS.COLLECTION.REPORT_NAME_VALUE_PAIRS, - waitForCollectionCallback: true, callback: (value) => { allReportNameValuePairs = value; }, @@ -1297,7 +1284,6 @@ describe('split expense', () => { const splitTransactions = await new Promise((resolve) => { const connection = Onyx.connect({ key: ONYXKEYS.COLLECTION.TRANSACTION, - waitForCollectionCallback: true, callback: (transactions) => { Onyx.disconnect(connection); const splits = Object.values(transactions ?? {}).filter((t) => t?.transactionID !== originalTransactionID && t?.comment?.originalTransactionID === originalTransactionID); @@ -1361,7 +1347,6 @@ describe('split expense', () => { const transactions = await new Promise>((resolve) => { const connection = Onyx.connect({ key: ONYXKEYS.COLLECTION.TRANSACTION, - waitForCollectionCallback: true, callback: (value) => { Onyx.disconnect(connection); resolve(value); @@ -1422,7 +1407,6 @@ describe('split expense', () => { const allReports = await new Promise>((resolve) => { const connection = Onyx.connect({ key: ONYXKEYS.COLLECTION.REPORT, - waitForCollectionCallback: true, callback: (reports) => { Onyx.disconnect(connection); resolve(reports); @@ -1436,7 +1420,6 @@ describe('split expense', () => { const transactions = await new Promise>((resolve) => { const connection = Onyx.connect({ key: ONYXKEYS.COLLECTION.TRANSACTION, - waitForCollectionCallback: true, callback: (value) => { Onyx.disconnect(connection); resolve(value); @@ -1491,7 +1474,6 @@ describe('split expense', () => { const allTransactions = await new Promise>((resolve) => { const connection = Onyx.connect({ key: ONYXKEYS.COLLECTION.TRANSACTION, - waitForCollectionCallback: true, callback: (transactions) => { Onyx.disconnect(connection); resolve(transactions); @@ -1506,7 +1488,6 @@ describe('split expense', () => { const allReportActions = await new Promise>>((resolve) => { const connection = Onyx.connect({ key: ONYXKEYS.COLLECTION.REPORT_ACTIONS, - waitForCollectionCallback: true, callback: (actions) => { Onyx.disconnect(connection); resolve(actions as OnyxCollection>); @@ -1738,21 +1719,18 @@ describe('updateSplitTransactionsFromSplitExpensesFlow', () => { let allReportNameValuePairs: OnyxCollection; await getOnyxData({ key: ONYXKEYS.COLLECTION.TRANSACTION, - waitForCollectionCallback: true, callback: (value) => { allTransactions = value; }, }); await getOnyxData({ key: ONYXKEYS.COLLECTION.REPORT, - waitForCollectionCallback: true, callback: (value) => { allReports = value; }, }); await getOnyxData({ key: ONYXKEYS.COLLECTION.REPORT_NAME_VALUE_PAIRS, - waitForCollectionCallback: true, callback: (value) => { allReportNameValuePairs = value; }, @@ -1858,21 +1836,18 @@ describe('updateSplitTransactionsFromSplitExpensesFlow', () => { let allReportNameValuePairs: OnyxCollection; await getOnyxData({ key: ONYXKEYS.COLLECTION.TRANSACTION, - waitForCollectionCallback: true, callback: (value) => { allTransactions = value; }, }); await getOnyxData({ key: ONYXKEYS.COLLECTION.REPORT, - waitForCollectionCallback: true, callback: (value) => { allReports = value; }, }); await getOnyxData({ key: ONYXKEYS.COLLECTION.REPORT_NAME_VALUE_PAIRS, - waitForCollectionCallback: true, callback: (value) => { allReportNameValuePairs = value; }, @@ -1990,21 +1965,18 @@ describe('updateSplitTransactionsFromSplitExpensesFlow', () => { let allReportNameValuePairs: OnyxCollection; await getOnyxData({ key: ONYXKEYS.COLLECTION.TRANSACTION, - waitForCollectionCallback: true, callback: (value) => { allTransactions = value; }, }); await getOnyxData({ key: ONYXKEYS.COLLECTION.REPORT, - waitForCollectionCallback: true, callback: (value) => { allReports = value; }, }); await getOnyxData({ key: ONYXKEYS.COLLECTION.REPORT_NAME_VALUE_PAIRS, - waitForCollectionCallback: true, callback: (value) => { allReportNameValuePairs = value; }, @@ -2090,7 +2062,6 @@ describe('updateSplitTransactionsFromSplitExpensesFlow', () => { await getOnyxData({ key: ONYXKEYS.COLLECTION.REPORT, - waitForCollectionCallback: true, callback: (allReports) => { chatReport = Object.values(allReports ?? {}).find((report) => report?.chatType === CONST.REPORT.CHAT_TYPE.POLICY_EXPENSE_CHAT); }, @@ -2127,14 +2098,12 @@ describe('updateSplitTransactionsFromSplitExpensesFlow', () => { await getOnyxData({ key: ONYXKEYS.COLLECTION.REPORT, - waitForCollectionCallback: true, callback: (allReports) => { expenseReport = Object.values(allReports ?? {}).find((report) => report?.type === CONST.REPORT.TYPE.EXPENSE); }, }); await getOnyxData({ key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${expenseReport?.reportID}`, - waitForCollectionCallback: false, callback: (allReportActions) => { const iouActions = Object.values(allReportActions ?? {}).filter((reportAction): reportAction is ReportAction => isMoneyRequestAction(reportAction), @@ -2156,21 +2125,18 @@ describe('updateSplitTransactionsFromSplitExpensesFlow', () => { let allReportNameValuePairs: OnyxCollection; await getOnyxData({ key: ONYXKEYS.COLLECTION.TRANSACTION, - waitForCollectionCallback: true, callback: (value) => { allTransactions = value; }, }); await getOnyxData({ key: ONYXKEYS.COLLECTION.REPORT, - waitForCollectionCallback: true, callback: (value) => { allReports = value; }, }); await getOnyxData({ key: ONYXKEYS.COLLECTION.REPORT_NAME_VALUE_PAIRS, - waitForCollectionCallback: true, callback: (value) => { allReportNameValuePairs = value; }, @@ -2216,7 +2182,6 @@ describe('updateSplitTransactionsFromSplitExpensesFlow', () => { // Verify child transactions were created (prerequisite for isReverseSplitOperation in step 2) await getOnyxData({ key: ONYXKEYS.COLLECTION.TRANSACTION, - waitForCollectionCallback: true, callback: (value) => { allTransactions = value; }, @@ -2229,14 +2194,12 @@ describe('updateSplitTransactionsFromSplitExpensesFlow', () => { const differentReportID = rand64(); await getOnyxData({ key: ONYXKEYS.COLLECTION.REPORT, - waitForCollectionCallback: true, callback: (value) => { allReports = value; }, }); await getOnyxData({ key: ONYXKEYS.COLLECTION.REPORT_NAME_VALUE_PAIRS, - waitForCollectionCallback: true, callback: (value) => { allReportNameValuePairs = value; }, @@ -2316,7 +2279,6 @@ describe('updateSplitTransactionsFromSplitExpensesFlow', () => { await getOnyxData({ key: ONYXKEYS.COLLECTION.REPORT, - waitForCollectionCallback: true, callback: (allReports) => { chatReport = Object.values(allReports ?? {}).find((report) => report?.chatType === CONST.REPORT.CHAT_TYPE.POLICY_EXPENSE_CHAT); }, @@ -2353,14 +2315,12 @@ describe('updateSplitTransactionsFromSplitExpensesFlow', () => { await getOnyxData({ key: ONYXKEYS.COLLECTION.REPORT, - waitForCollectionCallback: true, callback: (allReports) => { expenseReport = Object.values(allReports ?? {}).find((report) => report?.type === CONST.REPORT.TYPE.EXPENSE); }, }); await getOnyxData({ key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${expenseReport?.reportID}`, - waitForCollectionCallback: false, callback: (allReportActions) => { const iouActions = Object.values(allReportActions ?? {}).filter((reportAction): reportAction is ReportAction => isMoneyRequestAction(reportAction), @@ -2382,21 +2342,18 @@ describe('updateSplitTransactionsFromSplitExpensesFlow', () => { let allReportNameValuePairs: OnyxCollection; await getOnyxData({ key: ONYXKEYS.COLLECTION.TRANSACTION, - waitForCollectionCallback: true, callback: (value) => { allTransactions = value; }, }); await getOnyxData({ key: ONYXKEYS.COLLECTION.REPORT, - waitForCollectionCallback: true, callback: (value) => { allReports = value; }, }); await getOnyxData({ key: ONYXKEYS.COLLECTION.REPORT_NAME_VALUE_PAIRS, - waitForCollectionCallback: true, callback: (value) => { allReportNameValuePairs = value; }, @@ -2442,7 +2399,6 @@ describe('updateSplitTransactionsFromSplitExpensesFlow', () => { // Verify child transactions were created await getOnyxData({ key: ONYXKEYS.COLLECTION.TRANSACTION, - waitForCollectionCallback: true, callback: (value) => { allTransactions = value; }, @@ -2455,7 +2411,6 @@ describe('updateSplitTransactionsFromSplitExpensesFlow', () => { const splitTx1 = allTransactions?.[`${ONYXKEYS.COLLECTION.TRANSACTION}${splitTransactionID1}`]; await getOnyxData({ key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${splitTx1?.reportID}`, - waitForCollectionCallback: false, callback: (allReportActions) => { const iouAction = Object.values(allReportActions ?? {}).find( (action): action is ReportAction => @@ -2495,21 +2450,18 @@ describe('updateSplitTransactionsFromSplitExpensesFlow', () => { // Step 3: Revert to 1 split (triggers isReverseSplitOperation) await getOnyxData({ key: ONYXKEYS.COLLECTION.TRANSACTION, - waitForCollectionCallback: true, callback: (value) => { allTransactions = value; }, }); await getOnyxData({ key: ONYXKEYS.COLLECTION.REPORT, - waitForCollectionCallback: true, callback: (value) => { allReports = value; }, }); await getOnyxData({ key: ONYXKEYS.COLLECTION.REPORT_NAME_VALUE_PAIRS, - waitForCollectionCallback: true, callback: (value) => { allReportNameValuePairs = value; }, @@ -2567,7 +2519,6 @@ describe('updateSplitTransactionsFromSplitExpensesFlow', () => { let newIOUAction: ReportAction | undefined; await getOnyxData({ key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${revertExpenseReportID}`, - waitForCollectionCallback: false, callback: (allReportActions) => { newIOUAction = Object.values(allReportActions ?? {}).findLast( (action): action is ReportAction => @@ -2667,21 +2618,18 @@ describe('updateSplitTransactionsFromSplitExpensesFlow', () => { let allReportNameValuePairs: OnyxCollection; await getOnyxData({ key: ONYXKEYS.COLLECTION.TRANSACTION, - waitForCollectionCallback: true, callback: (value) => { allTransactions = value; }, }); await getOnyxData({ key: ONYXKEYS.COLLECTION.REPORT, - waitForCollectionCallback: true, callback: (value) => { allReports = value; }, }); await getOnyxData({ key: ONYXKEYS.COLLECTION.REPORT_NAME_VALUE_PAIRS, - waitForCollectionCallback: true, callback: (value) => { allReportNameValuePairs = value; }, @@ -2802,21 +2750,18 @@ describe('updateSplitTransactionsFromSplitExpensesFlow', () => { let allReportNameValuePairs: OnyxCollection; await getOnyxData({ key: ONYXKEYS.COLLECTION.TRANSACTION, - waitForCollectionCallback: true, callback: (value) => { allTransactions = value; }, }); await getOnyxData({ key: ONYXKEYS.COLLECTION.REPORT, - waitForCollectionCallback: true, callback: (value) => { allReports = value; }, }); await getOnyxData({ key: ONYXKEYS.COLLECTION.REPORT_NAME_VALUE_PAIRS, - waitForCollectionCallback: true, callback: (value) => { allReportNameValuePairs = value; }, @@ -2901,7 +2846,6 @@ describe('updateSplitTransactionsFromSplitExpensesFlow', () => { await waitForBatchedUpdates(); await getOnyxData({ key: ONYXKEYS.COLLECTION.REPORT, - waitForCollectionCallback: true, callback: (allReports) => { chatReport = Object.values(allReports ?? {}).find((report) => report?.chatType === CONST.REPORT.CHAT_TYPE.POLICY_EXPENSE_CHAT); }, @@ -2936,14 +2880,12 @@ describe('updateSplitTransactionsFromSplitExpensesFlow', () => { await waitForBatchedUpdates(); await getOnyxData({ key: ONYXKEYS.COLLECTION.REPORT, - waitForCollectionCallback: true, callback: (allReports) => { expenseReport = Object.values(allReports ?? {}).find((report) => report?.type === CONST.REPORT.TYPE.EXPENSE); }, }); await getOnyxData({ key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${expenseReport?.reportID}`, - waitForCollectionCallback: false, callback: (allReportsAction) => { const iouActions = Object.values(allReportsAction ?? {}).filter((reportAction): reportAction is ReportAction => isMoneyRequestAction(reportAction), @@ -2988,21 +2930,18 @@ describe('updateSplitTransactionsFromSplitExpensesFlow', () => { let allReportNameValuePairs: OnyxCollection; await getOnyxData({ key: ONYXKEYS.COLLECTION.TRANSACTION, - waitForCollectionCallback: true, callback: (value) => { allTransactions = value; }, }); await getOnyxData({ key: ONYXKEYS.COLLECTION.REPORT, - waitForCollectionCallback: true, callback: (value) => { allReports = value; }, }); await getOnyxData({ key: ONYXKEYS.COLLECTION.REPORT_NAME_VALUE_PAIRS, - waitForCollectionCallback: true, callback: (value) => { allReportNameValuePairs = value; }, @@ -3079,7 +3018,6 @@ describe('updateSplitTransactionsFromSplitExpensesFlow', () => { await waitForBatchedUpdates(); await getOnyxData({ key: ONYXKEYS.COLLECTION.REPORT, - waitForCollectionCallback: true, callback: (allReports) => { chatReport = Object.values(allReports ?? {}).find((report) => report?.chatType === CONST.REPORT.CHAT_TYPE.POLICY_EXPENSE_CHAT); }, @@ -3114,14 +3052,12 @@ describe('updateSplitTransactionsFromSplitExpensesFlow', () => { await waitForBatchedUpdates(); await getOnyxData({ key: ONYXKEYS.COLLECTION.REPORT, - waitForCollectionCallback: true, callback: (allReports) => { expenseReport = Object.values(allReports ?? {}).find((report) => report?.type === CONST.REPORT.TYPE.EXPENSE); }, }); await getOnyxData({ key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${expenseReport?.reportID}`, - waitForCollectionCallback: false, callback: (allReportsAction) => { const iouActions = Object.values(allReportsAction ?? {}).filter((reportAction): reportAction is ReportAction => isMoneyRequestAction(reportAction), @@ -3166,21 +3102,18 @@ describe('updateSplitTransactionsFromSplitExpensesFlow', () => { let allReportNameValuePairs: OnyxCollection; await getOnyxData({ key: ONYXKEYS.COLLECTION.TRANSACTION, - waitForCollectionCallback: true, callback: (value) => { allTransactions = value; }, }); await getOnyxData({ key: ONYXKEYS.COLLECTION.REPORT, - waitForCollectionCallback: true, callback: (value) => { allReports = value; }, }); await getOnyxData({ key: ONYXKEYS.COLLECTION.REPORT_NAME_VALUE_PAIRS, - waitForCollectionCallback: true, callback: (value) => { allReportNameValuePairs = value; }, @@ -3261,7 +3194,6 @@ describe('updateSplitTransactionsFromSplitExpensesFlow', () => { await getOnyxData({ key: ONYXKEYS.COLLECTION.REPORT, - waitForCollectionCallback: true, callback: (allReports) => { chatReport = Object.values(allReports ?? {}).find((report) => report?.chatType === CONST.REPORT.CHAT_TYPE.POLICY_EXPENSE_CHAT); }, @@ -3298,7 +3230,6 @@ describe('updateSplitTransactionsFromSplitExpensesFlow', () => { await getOnyxData({ key: ONYXKEYS.COLLECTION.REPORT, - waitForCollectionCallback: true, callback: (allReports) => { expenseReport = Object.values(allReports ?? {}).find((report) => report?.type === CONST.REPORT.TYPE.EXPENSE); }, @@ -3306,7 +3237,6 @@ describe('updateSplitTransactionsFromSplitExpensesFlow', () => { await getOnyxData({ key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${expenseReport?.reportID}`, - waitForCollectionCallback: false, callback: (allReportsAction) => { const iouActions = Object.values(allReportsAction ?? {}).filter((reportAction): reportAction is ReportAction => isMoneyRequestAction(reportAction), @@ -3357,21 +3287,18 @@ describe('updateSplitTransactionsFromSplitExpensesFlow', () => { await getOnyxData({ key: ONYXKEYS.COLLECTION.TRANSACTION, - waitForCollectionCallback: true, callback: (value) => { allTransactions = value; }, }); await getOnyxData({ key: ONYXKEYS.COLLECTION.REPORT, - waitForCollectionCallback: true, callback: (value) => { allReports = value; }, }); await getOnyxData({ key: ONYXKEYS.COLLECTION.REPORT_NAME_VALUE_PAIRS, - waitForCollectionCallback: true, callback: (value) => { allReportNameValuePairs = value; }, @@ -3453,7 +3380,6 @@ describe('updateSplitTransactionsFromSplitExpensesFlow', () => { await getOnyxData({ key: ONYXKEYS.COLLECTION.REPORT, - waitForCollectionCallback: true, callback: (allReports) => { chatReport = Object.values(allReports ?? {}).find((report) => report?.chatType === CONST.REPORT.CHAT_TYPE.POLICY_EXPENSE_CHAT); }, @@ -3491,7 +3417,6 @@ describe('updateSplitTransactionsFromSplitExpensesFlow', () => { await getOnyxData({ key: ONYXKEYS.COLLECTION.REPORT, - waitForCollectionCallback: true, callback: (allReports) => { expenseReport = Object.values(allReports ?? {}).find((report) => report?.type === CONST.REPORT.TYPE.EXPENSE); }, @@ -3500,7 +3425,6 @@ describe('updateSplitTransactionsFromSplitExpensesFlow', () => { // Get the original transaction ID and transaction thread report ID await getOnyxData({ key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${expenseReport?.reportID}`, - waitForCollectionCallback: false, callback: (allReportsAction) => { const iouActions = Object.values(allReportsAction ?? {}).filter((reportAction): reportAction is ReportAction => isMoneyRequestAction(reportAction), @@ -3526,7 +3450,6 @@ describe('updateSplitTransactionsFromSplitExpensesFlow', () => { let firstIOU: ReportAction | undefined; await getOnyxData({ key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${expenseReport?.reportID}`, - waitForCollectionCallback: false, callback: (allReportsAction) => { const iouActions = Object.values(allReportsAction ?? {}).filter((reportAction): reportAction is ReportAction => isMoneyRequestAction(reportAction), @@ -3572,21 +3495,18 @@ describe('updateSplitTransactionsFromSplitExpensesFlow', () => { await getOnyxData({ key: ONYXKEYS.COLLECTION.TRANSACTION, - waitForCollectionCallback: true, callback: (value) => { allTransactions = value; }, }); await getOnyxData({ key: ONYXKEYS.COLLECTION.REPORT, - waitForCollectionCallback: true, callback: (value) => { allReports = value; }, }); await getOnyxData({ key: ONYXKEYS.COLLECTION.REPORT_NAME_VALUE_PAIRS, - waitForCollectionCallback: true, callback: (value) => { allReportNameValuePairs = value; }, @@ -3644,7 +3564,6 @@ describe('updateSplitTransactionsFromSplitExpensesFlow', () => { await getOnyxData({ key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${expenseReport?.reportID}`, - waitForCollectionCallback: false, callback: (allReportsAction) => { const iouActions = Object.values(allReportsAction ?? {}).filter((reportAction): reportAction is ReportAction => isMoneyRequestAction(reportAction), @@ -3719,7 +3638,6 @@ describe('updateSplitTransactions', () => { await getOnyxData({ key: ONYXKEYS.COLLECTION.REPORT, - waitForCollectionCallback: true, callback: (allReports) => { chatReport = Object.values(allReports ?? {}).find((report) => report?.chatType === CONST.REPORT.CHAT_TYPE.POLICY_EXPENSE_CHAT); }, @@ -3749,14 +3667,12 @@ describe('updateSplitTransactions', () => { await getOnyxData({ key: ONYXKEYS.COLLECTION.REPORT, - waitForCollectionCallback: true, callback: (allReports) => { expenseReport = Object.values(allReports ?? {}).find((report) => report?.type === CONST.REPORT.TYPE.EXPENSE); }, }); await getOnyxData({ key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${expenseReport?.reportID}`, - waitForCollectionCallback: false, callback: (allReportsAction) => { const iouActions = Object.values(allReportsAction ?? {}).filter((reportAction): reportAction is ReportAction => isMoneyRequestAction(reportAction), @@ -3772,9 +3688,9 @@ describe('updateSplitTransactions', () => { let allTransactions: OnyxCollection; let allReports: OnyxCollection; let allReportNameValuePairs: OnyxCollection; - await getOnyxData({key: ONYXKEYS.COLLECTION.TRANSACTION, waitForCollectionCallback: true, callback: (v) => (allTransactions = v)}); - await getOnyxData({key: ONYXKEYS.COLLECTION.REPORT, waitForCollectionCallback: true, callback: (v) => (allReports = v)}); - await getOnyxData({key: ONYXKEYS.COLLECTION.REPORT_NAME_VALUE_PAIRS, waitForCollectionCallback: true, callback: (v) => (allReportNameValuePairs = v)}); + await getOnyxData({key: ONYXKEYS.COLLECTION.TRANSACTION, callback: (v) => (allTransactions = v)}); + await getOnyxData({key: ONYXKEYS.COLLECTION.REPORT, callback: (v) => (allReports = v)}); + await getOnyxData({key: ONYXKEYS.COLLECTION.REPORT_NAME_VALUE_PAIRS, callback: (v) => (allReportNameValuePairs = v)}); const reportID = originalTransaction?.reportID ?? String(CONST.DEFAULT_NUMBER_ID); const policyTags = await getPolicyTags(reportID); @@ -3851,7 +3767,6 @@ describe('updateSplitTransactions', () => { await getOnyxData({ key: ONYXKEYS.COLLECTION.REPORT, - waitForCollectionCallback: true, callback: (allReports) => { chatReport = Object.values(allReports ?? {}).find((report) => report?.chatType === CONST.REPORT.CHAT_TYPE.POLICY_EXPENSE_CHAT); }, @@ -3882,14 +3797,12 @@ describe('updateSplitTransactions', () => { await getOnyxData({ key: ONYXKEYS.COLLECTION.REPORT, - waitForCollectionCallback: true, callback: (allReports) => { expenseReport = Object.values(allReports ?? {}).find((report) => report?.type === CONST.REPORT.TYPE.EXPENSE); }, }); await getOnyxData({ key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${expenseReport?.reportID}`, - waitForCollectionCallback: false, callback: (allReportsAction) => { const iouActions = Object.values(allReportsAction ?? {}).filter((reportAction): reportAction is ReportAction => isMoneyRequestAction(reportAction), @@ -3905,9 +3818,9 @@ describe('updateSplitTransactions', () => { let allTransactions: OnyxCollection; let allReports: OnyxCollection; let allReportNameValuePairs: OnyxCollection; - await getOnyxData({key: ONYXKEYS.COLLECTION.TRANSACTION, waitForCollectionCallback: true, callback: (v) => (allTransactions = v)}); - await getOnyxData({key: ONYXKEYS.COLLECTION.REPORT, waitForCollectionCallback: true, callback: (v) => (allReports = v)}); - await getOnyxData({key: ONYXKEYS.COLLECTION.REPORT_NAME_VALUE_PAIRS, waitForCollectionCallback: true, callback: (v) => (allReportNameValuePairs = v)}); + await getOnyxData({key: ONYXKEYS.COLLECTION.TRANSACTION, callback: (v) => (allTransactions = v)}); + await getOnyxData({key: ONYXKEYS.COLLECTION.REPORT, callback: (v) => (allReports = v)}); + await getOnyxData({key: ONYXKEYS.COLLECTION.REPORT_NAME_VALUE_PAIRS, callback: (v) => (allReportNameValuePairs = v)}); const reportID = originalTransaction?.reportID ?? String(CONST.DEFAULT_NUMBER_ID); const policyTags = await getPolicyTags(reportID); @@ -3985,7 +3898,6 @@ describe('updateSplitTransactions', () => { await getOnyxData({ key: ONYXKEYS.COLLECTION.REPORT, - waitForCollectionCallback: true, callback: (allReports) => { chatReport = Object.values(allReports ?? {}).find((report) => report?.chatType === CONST.REPORT.CHAT_TYPE.POLICY_EXPENSE_CHAT); }, @@ -4015,14 +3927,12 @@ describe('updateSplitTransactions', () => { await getOnyxData({ key: ONYXKEYS.COLLECTION.REPORT, - waitForCollectionCallback: true, callback: (allReports) => { expenseReport = Object.values(allReports ?? {}).find((report) => report?.type === CONST.REPORT.TYPE.EXPENSE); }, }); await getOnyxData({ key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${expenseReport?.reportID}`, - waitForCollectionCallback: false, callback: (allReportsAction) => { const iouActions = Object.values(allReportsAction ?? {}).filter((reportAction): reportAction is ReportAction => isMoneyRequestAction(reportAction), @@ -4036,9 +3946,9 @@ describe('updateSplitTransactions', () => { let allTransactions: OnyxCollection; let allReports: OnyxCollection; let allReportNameValuePairs: OnyxCollection; - await getOnyxData({key: ONYXKEYS.COLLECTION.TRANSACTION, waitForCollectionCallback: true, callback: (v) => (allTransactions = v)}); - await getOnyxData({key: ONYXKEYS.COLLECTION.REPORT, waitForCollectionCallback: true, callback: (v) => (allReports = v)}); - await getOnyxData({key: ONYXKEYS.COLLECTION.REPORT_NAME_VALUE_PAIRS, waitForCollectionCallback: true, callback: (v) => (allReportNameValuePairs = v)}); + await getOnyxData({key: ONYXKEYS.COLLECTION.TRANSACTION, callback: (v) => (allTransactions = v)}); + await getOnyxData({key: ONYXKEYS.COLLECTION.REPORT, callback: (v) => (allReports = v)}); + await getOnyxData({key: ONYXKEYS.COLLECTION.REPORT_NAME_VALUE_PAIRS, callback: (v) => (allReportNameValuePairs = v)}); const reportID = originalTransaction?.reportID ?? String(CONST.DEFAULT_NUMBER_ID); const policyTags = await getPolicyTags(reportID); @@ -4093,10 +4003,10 @@ describe('updateSplitTransactions', () => { let allReports: OnyxCollection; let allReportActions: OnyxCollection; let allReportNameValuePairs: OnyxCollection; - await getOnyxData({key: ONYXKEYS.COLLECTION.TRANSACTION, waitForCollectionCallback: true, callback: (value) => (allTransactions = value)}); - await getOnyxData({key: ONYXKEYS.COLLECTION.REPORT, waitForCollectionCallback: true, callback: (value) => (allReports = value)}); - await getOnyxData({key: ONYXKEYS.COLLECTION.REPORT_NAME_VALUE_PAIRS, waitForCollectionCallback: true, callback: (value) => (allReportNameValuePairs = value)}); - await getOnyxData({key: ONYXKEYS.COLLECTION.REPORT_ACTIONS, waitForCollectionCallback: true, callback: (value) => (allReportActions = value)}); + await getOnyxData({key: ONYXKEYS.COLLECTION.TRANSACTION, callback: (value) => (allTransactions = value)}); + await getOnyxData({key: ONYXKEYS.COLLECTION.REPORT, callback: (value) => (allReports = value)}); + await getOnyxData({key: ONYXKEYS.COLLECTION.REPORT_NAME_VALUE_PAIRS, callback: (value) => (allReportNameValuePairs = value)}); + await getOnyxData({key: ONYXKEYS.COLLECTION.REPORT_ACTIONS, callback: (value) => (allReportActions = value)}); return {allTransactions, allReports, allReportNameValuePairs, allReportActions}; }; @@ -4127,7 +4037,6 @@ describe('updateSplitTransactions', () => { await getOnyxData({ key: ONYXKEYS.COLLECTION.REPORT, - waitForCollectionCallback: true, callback: (allReports) => { chatReport = Object.values(allReports ?? {}).find((report) => report?.chatType === CONST.REPORT.CHAT_TYPE.POLICY_EXPENSE_CHAT); }, @@ -4157,7 +4066,6 @@ describe('updateSplitTransactions', () => { await getOnyxData({ key: ONYXKEYS.COLLECTION.REPORT, - waitForCollectionCallback: true, callback: (allReports) => { expenseReport = Object.values(allReports ?? {}).find((report) => report?.type === CONST.REPORT.TYPE.EXPENSE && report?.chatReportID === chatReport?.reportID); }, @@ -4172,7 +4080,6 @@ describe('updateSplitTransactions', () => { await getOnyxData({ key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${expenseReport?.reportID}`, - waitForCollectionCallback: false, callback: (allReportActions) => { const iouActions = Object.values(allReportActions ?? {}).filter((reportAction) => isMoneyRequestAction(reportAction)); firstIOU = iouActions.at(0); @@ -4183,7 +4090,6 @@ describe('updateSplitTransactions', () => { if (!originalTransactionID) { await getOnyxData({ key: ONYXKEYS.COLLECTION.REPORT_ACTIONS, - waitForCollectionCallback: true, callback: (allReportActions) => { for (const reportActions of Object.values(allReportActions ?? {})) { const iouAction = Object.values(reportActions ?? {}).find((reportAction): reportAction is ReportAction => @@ -4202,7 +4108,6 @@ describe('updateSplitTransactions', () => { if (!originalTransactionID && expenseReport?.reportID) { await getOnyxData({ key: ONYXKEYS.COLLECTION.TRANSACTION, - waitForCollectionCallback: true, callback: (allTransactions) => { const transaction = Object.values(allTransactions ?? {}).find((item) => item?.reportID === expenseReport?.reportID && !item?.comment?.originalTransactionID); originalTransactionID = transaction?.transactionID; @@ -6870,7 +6775,6 @@ describe('createDistanceRequest', () => { let allTransactions: OnyxCollection; await getOnyxData({ key: ONYXKEYS.COLLECTION.TRANSACTION, - waitForCollectionCallback: true, callback: (transactions) => { allTransactions = transactions; }, @@ -6891,7 +6795,6 @@ describe('createDistanceRequest', () => { let allTransactions: OnyxCollection; await getOnyxData({ key: ONYXKEYS.COLLECTION.TRANSACTION, - waitForCollectionCallback: true, callback: (transactions) => { allTransactions = transactions; }, @@ -6923,7 +6826,6 @@ describe('createDistanceRequest', () => { let allTransactions: OnyxCollection; await getOnyxData({ key: ONYXKEYS.COLLECTION.TRANSACTION, - waitForCollectionCallback: true, callback: (transactions) => { allTransactions = transactions; }, @@ -6942,7 +6844,6 @@ describe('createDistanceRequest', () => { let allTransactions: OnyxCollection; await getOnyxData({ key: ONYXKEYS.COLLECTION.TRANSACTION, - waitForCollectionCallback: true, callback: (transactions) => { allTransactions = transactions; }, @@ -6980,7 +6881,6 @@ describe('createDistanceRequest', () => { let allTransactions: OnyxCollection; await getOnyxData({ key: ONYXKEYS.COLLECTION.TRANSACTION, - waitForCollectionCallback: true, callback: (transactions) => { allTransactions = transactions; }, @@ -7006,7 +6906,6 @@ describe('createDistanceRequest', () => { let allTransactions: OnyxCollection; await getOnyxData({ key: ONYXKEYS.COLLECTION.TRANSACTION, - waitForCollectionCallback: true, callback: (transactions) => { allTransactions = transactions; }, @@ -7025,7 +6924,6 @@ describe('createDistanceRequest', () => { let allTransactions: OnyxCollection; await getOnyxData({ key: ONYXKEYS.COLLECTION.TRANSACTION, - waitForCollectionCallback: true, callback: (transactions) => { allTransactions = transactions; }, @@ -7047,7 +6945,6 @@ describe('createDistanceRequest', () => { let allTransactions: OnyxCollection; await getOnyxData({ key: ONYXKEYS.COLLECTION.TRANSACTION, - waitForCollectionCallback: true, callback: (transactions) => { allTransactions = transactions; }, @@ -7069,7 +6966,6 @@ describe('createDistanceRequest', () => { let allTransactions: OnyxCollection; await getOnyxData({ key: ONYXKEYS.COLLECTION.TRANSACTION, - waitForCollectionCallback: true, callback: (transactions) => { allTransactions = transactions; }, @@ -7093,7 +6989,6 @@ describe('createDistanceRequest', () => { let allTransactions: OnyxCollection; await getOnyxData({ key: ONYXKEYS.COLLECTION.TRANSACTION, - waitForCollectionCallback: true, callback: (transactions) => { allTransactions = transactions; }, @@ -7129,7 +7024,6 @@ describe('createDistanceRequest', () => { let allTransactions: OnyxCollection; await getOnyxData({ key: ONYXKEYS.COLLECTION.TRANSACTION, - waitForCollectionCallback: true, callback: (transactions) => { allTransactions = transactions; }, @@ -7163,7 +7057,6 @@ describe('createDistanceRequest', () => { let allTransactions: OnyxCollection; await getOnyxData({ key: ONYXKEYS.COLLECTION.TRANSACTION, - waitForCollectionCallback: true, callback: (transactions) => { allTransactions = transactions; }, @@ -7188,7 +7081,6 @@ describe('createDistanceRequest', () => { let allTransactions: OnyxCollection; await getOnyxData({ key: ONYXKEYS.COLLECTION.TRANSACTION, - waitForCollectionCallback: true, callback: (transactions) => { allTransactions = transactions; }, diff --git a/tests/actions/IOUTest/TrackExpenseTest.ts b/tests/actions/IOUTest/TrackExpenseTest.ts index 5f09c61e9cda..6bc8de62eb72 100644 --- a/tests/actions/IOUTest/TrackExpenseTest.ts +++ b/tests/actions/IOUTest/TrackExpenseTest.ts @@ -230,7 +230,6 @@ describe('actions/IOU/TrackExpense', () => { const transaction = await new Promise>((resolve) => { const connection = Onyx.connect({ key: ONYXKEYS.COLLECTION.TRANSACTION, - waitForCollectionCallback: true, callback: (transactions) => { Onyx.disconnect(connection); const trackedExpenseTransaction = Object.values(transactions ?? {}).at(0); @@ -247,7 +246,6 @@ describe('actions/IOU/TrackExpense', () => { const allReportActions = await new Promise>((resolve) => { const connection = Onyx.connect({ key: ONYXKEYS.COLLECTION.REPORT_ACTIONS, - waitForCollectionCallback: true, callback: (reportActions) => { Onyx.disconnect(connection); resolve(reportActions); @@ -286,7 +284,6 @@ describe('actions/IOU/TrackExpense', () => { let allTransactionsDraft: OnyxCollection; await getOnyxData({ key: ONYXKEYS.COLLECTION.TRANSACTION_DRAFT, - waitForCollectionCallback: true, callback: (val) => { allTransactionsDraft = val; }, @@ -336,7 +333,6 @@ describe('actions/IOU/TrackExpense', () => { await new Promise((resolve) => { const connection = Onyx.connect({ key: ONYXKEYS.COLLECTION.TRANSACTION, - waitForCollectionCallback: true, callback: (transactions) => { Onyx.disconnect(connection); const categorizedTransaction = transactions?.[`${ONYXKEYS.COLLECTION.TRANSACTION}${transaction?.transactionID}`]; @@ -424,7 +420,6 @@ describe('actions/IOU/TrackExpense', () => { const selfDMReportActionsOnyx = await new Promise>((resolve) => { const connection = Onyx.connect({ key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${selfDMReport.reportID}`, - waitForCollectionCallback: false, callback: (value) => { Onyx.disconnect(connection); resolve(value); @@ -478,7 +473,6 @@ describe('actions/IOU/TrackExpense', () => { const policyExpenseChatOnyx = await new Promise>((resolve) => { const connection = Onyx.connect({ key: `${ONYXKEYS.COLLECTION.REPORT}${policyExpenseChat.reportID}`, - waitForCollectionCallback: false, callback: (value) => { Onyx.disconnect(connection); resolve(value); @@ -488,7 +482,6 @@ describe('actions/IOU/TrackExpense', () => { const policyOnyx = await new Promise>((resolve) => { const connection = Onyx.connect({ key: `${ONYXKEYS.COLLECTION.POLICY}${policy.id}`, - waitForCollectionCallback: false, callback: (value) => { Onyx.disconnect(connection); resolve(value); @@ -560,7 +553,6 @@ describe('actions/IOU/TrackExpense', () => { const selfDMReportActionsOnyx = await new Promise>((resolve) => { const connection = Onyx.connect({ key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${selfDMReport.reportID}`, - waitForCollectionCallback: false, callback: (value) => { Onyx.disconnect(connection); resolve(value); @@ -614,7 +606,6 @@ describe('actions/IOU/TrackExpense', () => { const policyExpenseChatOnyx = await new Promise>((resolve) => { const connection = Onyx.connect({ key: `${ONYXKEYS.COLLECTION.REPORT}${policyExpenseChat.reportID}`, - waitForCollectionCallback: false, callback: (value) => { Onyx.disconnect(connection); resolve(value); @@ -624,7 +615,6 @@ describe('actions/IOU/TrackExpense', () => { const policyOnyx = await new Promise>((resolve) => { const connection = Onyx.connect({ key: `${ONYXKEYS.COLLECTION.POLICY}${policy.id}`, - waitForCollectionCallback: false, callback: (value) => { Onyx.disconnect(connection); resolve(value); @@ -700,7 +690,6 @@ describe('actions/IOU/TrackExpense', () => { const selfDMReportActionsOnyx = await new Promise>((resolve) => { const connection = Onyx.connect({ key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${selfDMReport.reportID}`, - waitForCollectionCallback: false, callback: (value) => { Onyx.disconnect(connection); resolve(value); @@ -754,7 +743,6 @@ describe('actions/IOU/TrackExpense', () => { const policyOnyx = await new Promise>((resolve) => { const connection = Onyx.connect({ key: `${ONYXKEYS.COLLECTION.POLICY}${policy.id}`, - waitForCollectionCallback: false, callback: (value) => { Onyx.disconnect(connection); resolve(value); @@ -838,7 +826,6 @@ describe('actions/IOU/TrackExpense', () => { const selfDMReportActionsOnyx = await new Promise>((resolve) => { const connection = Onyx.connect({ key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${selfDMReport.reportID}`, - waitForCollectionCallback: false, callback: (value) => { Onyx.disconnect(connection); resolve(value); @@ -892,7 +879,6 @@ describe('actions/IOU/TrackExpense', () => { const allReports = await new Promise>((resolve) => { const connection = Onyx.connect({ key: ONYXKEYS.COLLECTION.REPORT, - waitForCollectionCallback: true, callback: (reports) => { Onyx.disconnect(connection); resolve(reports); @@ -995,7 +981,6 @@ describe('actions/IOU/TrackExpense', () => { const selfDMReportActionsOnyx = await new Promise>((resolve) => { const connection = Onyx.connect({ key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${selfDMReport.reportID}`, - waitForCollectionCallback: false, callback: (value) => { Onyx.disconnect(connection); resolve(value); @@ -1051,7 +1036,6 @@ describe('actions/IOU/TrackExpense', () => { const accountantChatNvpAfter = await new Promise>((resolve) => { const connection = Onyx.connect({ key: `${ONYXKEYS.COLLECTION.REPORT_NAME_VALUE_PAIRS}${accountantExpenseChatID}`, - waitForCollectionCallback: false, callback: (value) => { Onyx.disconnect(connection); resolve(value); @@ -1061,7 +1045,6 @@ describe('actions/IOU/TrackExpense', () => { const expenseReportNvpAfter = await new Promise>((resolve) => { const connection = Onyx.connect({ key: `${ONYXKEYS.COLLECTION.REPORT_NAME_VALUE_PAIRS}${archivedExpenseReportID}`, - waitForCollectionCallback: false, callback: (value) => { Onyx.disconnect(connection); resolve(value); @@ -1130,7 +1113,6 @@ describe('actions/IOU/TrackExpense', () => { let transactions: OnyxCollection; await getOnyxData({ key: ONYXKEYS.COLLECTION.TRANSACTION, - waitForCollectionCallback: true, callback: (val) => { transactions = val; }, @@ -1183,7 +1165,6 @@ describe('actions/IOU/TrackExpense', () => { let transactions: OnyxCollection; await getOnyxData({ key: ONYXKEYS.COLLECTION.TRANSACTION, - waitForCollectionCallback: true, callback: (val) => { transactions = val; }, @@ -1211,7 +1192,6 @@ describe('actions/IOU/TrackExpense', () => { let transactions: OnyxCollection; await getOnyxData({ key: ONYXKEYS.COLLECTION.TRANSACTION, - waitForCollectionCallback: true, callback: (val) => { transactions = val; }, @@ -1259,7 +1239,6 @@ describe('actions/IOU/TrackExpense', () => { let transactions: OnyxCollection; await getOnyxData({ key: ONYXKEYS.COLLECTION.TRANSACTION, - waitForCollectionCallback: true, callback: (val) => { transactions = val; }, @@ -1288,7 +1267,6 @@ describe('actions/IOU/TrackExpense', () => { let transactionDrafts: OnyxCollection; await getOnyxData({ key: ONYXKEYS.COLLECTION.TRANSACTION_DRAFT, - waitForCollectionCallback: true, callback: (val) => { transactionDrafts = val; }, @@ -1335,7 +1313,6 @@ describe('actions/IOU/TrackExpense', () => { let finalTransactions: OnyxCollection; await getOnyxData({ key: ONYXKEYS.COLLECTION.TRANSACTION, - waitForCollectionCallback: true, callback: (val) => { finalTransactions = val; }, @@ -1365,7 +1342,6 @@ describe('actions/IOU/TrackExpense', () => { let transactions: OnyxCollection; await getOnyxData({ key: ONYXKEYS.COLLECTION.TRANSACTION, - waitForCollectionCallback: true, callback: (val) => { transactions = val; }, @@ -1444,7 +1420,6 @@ describe('actions/IOU/TrackExpense', () => { let transactions: OnyxCollection; await getOnyxData({ key: ONYXKEYS.COLLECTION.TRANSACTION, - waitForCollectionCallback: true, callback: (val) => { transactions = val; }, @@ -1470,7 +1445,6 @@ describe('actions/IOU/TrackExpense', () => { let transactions: OnyxCollection; await getOnyxData({ key: ONYXKEYS.COLLECTION.TRANSACTION, - waitForCollectionCallback: true, callback: (val) => { transactions = val; }, @@ -1500,7 +1474,6 @@ describe('actions/IOU/TrackExpense', () => { let transactions: OnyxCollection; await getOnyxData({ key: ONYXKEYS.COLLECTION.TRANSACTION, - waitForCollectionCallback: true, callback: (val) => { transactions = val; }, @@ -1521,7 +1494,6 @@ describe('actions/IOU/TrackExpense', () => { const reports = await new Promise>((resolve) => { const connection = Onyx.connect({ key: ONYXKEYS.COLLECTION.REPORT, - waitForCollectionCallback: true, callback: (val) => { Onyx.disconnect(connection); resolve(val); @@ -1544,7 +1516,6 @@ describe('actions/IOU/TrackExpense', () => { const reports = await new Promise>((resolve) => { const connection = Onyx.connect({ key: ONYXKEYS.COLLECTION.REPORT, - waitForCollectionCallback: true, callback: (val) => { Onyx.disconnect(connection); resolve(val); @@ -1567,7 +1538,6 @@ describe('actions/IOU/TrackExpense', () => { let transactions: OnyxCollection; await getOnyxData({ key: ONYXKEYS.COLLECTION.TRANSACTION, - waitForCollectionCallback: true, callback: (val) => { transactions = val; }, @@ -1594,7 +1564,6 @@ describe('actions/IOU/TrackExpense', () => { let transactions: OnyxCollection; await getOnyxData({ key: ONYXKEYS.COLLECTION.TRANSACTION, - waitForCollectionCallback: true, callback: (val) => { transactions = val; }, @@ -1635,7 +1604,6 @@ describe('actions/IOU/TrackExpense', () => { let transactions: OnyxCollection; await getOnyxData({ key: ONYXKEYS.COLLECTION.TRANSACTION, - waitForCollectionCallback: true, callback: (val) => { transactions = val; }, @@ -1675,7 +1643,6 @@ describe('actions/IOU/TrackExpense', () => { let transactions: OnyxCollection; await getOnyxData({ key: ONYXKEYS.COLLECTION.TRANSACTION, - waitForCollectionCallback: true, callback: (val) => { transactions = val; }, @@ -1704,7 +1671,6 @@ describe('actions/IOU/TrackExpense', () => { let transactions: OnyxCollection; await getOnyxData({ key: ONYXKEYS.COLLECTION.TRANSACTION, - waitForCollectionCallback: true, callback: (val) => { transactions = val; }, @@ -1732,7 +1698,6 @@ describe('actions/IOU/TrackExpense', () => { let transactions: OnyxCollection; await getOnyxData({ key: ONYXKEYS.COLLECTION.TRANSACTION, - waitForCollectionCallback: true, callback: (val) => { transactions = val; }, @@ -1763,7 +1728,6 @@ describe('actions/IOU/TrackExpense', () => { let transactions: OnyxCollection; await getOnyxData({ key: ONYXKEYS.COLLECTION.TRANSACTION, - waitForCollectionCallback: true, callback: (val) => { transactions = val; }, @@ -1796,7 +1760,6 @@ describe('actions/IOU/TrackExpense', () => { let transactions: OnyxCollection; await getOnyxData({ key: ONYXKEYS.COLLECTION.TRANSACTION, - waitForCollectionCallback: true, callback: (val) => { transactions = val; }, @@ -2045,7 +2008,6 @@ describe('actions/IOU/TrackExpense', () => { let transactions: OnyxCollection; await getOnyxData({ key: ONYXKEYS.COLLECTION.TRANSACTION, - waitForCollectionCallback: true, callback: (val) => { transactions = val; }, @@ -2146,7 +2108,6 @@ describe('actions/IOU/TrackExpense', () => { const allReports = await new Promise>((resolve) => { const connection = Onyx.connect({ key: ONYXKEYS.COLLECTION.REPORT, - waitForCollectionCallback: true, callback: (reports) => { Onyx.disconnect(connection); resolve(reports); @@ -2175,7 +2136,6 @@ describe('actions/IOU/TrackExpense', () => { const allReportActions = await new Promise>((resolve) => { const connection = Onyx.connect({ key: ONYXKEYS.COLLECTION.REPORT_ACTIONS, - waitForCollectionCallback: true, callback: (actions) => { Onyx.disconnect(connection); resolve(actions); @@ -2195,7 +2155,6 @@ describe('actions/IOU/TrackExpense', () => { const allTransactions = await new Promise>((resolve) => { const connection = Onyx.connect({ key: ONYXKEYS.COLLECTION.TRANSACTION, - waitForCollectionCallback: true, callback: (transactions) => { Onyx.disconnect(connection); resolve(transactions); @@ -2288,7 +2247,6 @@ describe('actions/IOU/TrackExpense', () => { const allReportActions = await new Promise>((resolve) => { const connection = Onyx.connect({ key: ONYXKEYS.COLLECTION.REPORT_ACTIONS, - waitForCollectionCallback: true, callback: (actions) => { Onyx.disconnect(connection); resolve(actions); @@ -2449,7 +2407,6 @@ describe('actions/IOU/TrackExpense', () => { const allReports = await new Promise>((resolve) => { const connection = Onyx.connect({ key: ONYXKEYS.COLLECTION.REPORT, - waitForCollectionCallback: true, callback: (actions) => { Onyx.disconnect(connection); resolve(actions); @@ -2460,7 +2417,6 @@ describe('actions/IOU/TrackExpense', () => { const allReportActions = await new Promise>((resolve) => { const connection = Onyx.connect({ key: ONYXKEYS.COLLECTION.REPORT_ACTIONS, - waitForCollectionCallback: true, callback: (actions) => { Onyx.disconnect(connection); resolve(actions); @@ -2471,7 +2427,6 @@ describe('actions/IOU/TrackExpense', () => { const allTransactions = await new Promise>((resolve) => { const connection = Onyx.connect({ key: ONYXKEYS.COLLECTION.TRANSACTION, - waitForCollectionCallback: true, callback: (actions) => { Onyx.disconnect(connection); resolve(actions); diff --git a/tests/actions/IOUTest/UpdateMoneyRequestTest.ts b/tests/actions/IOUTest/UpdateMoneyRequestTest.ts index c4112c98cd19..2910828ccb60 100644 --- a/tests/actions/IOUTest/UpdateMoneyRequestTest.ts +++ b/tests/actions/IOUTest/UpdateMoneyRequestTest.ts @@ -436,7 +436,6 @@ describe('actions/IOU/UpdateMoneyRequest', () => { const updatedTransaction = await new Promise>((resolve) => { const connection = Onyx.connect({ key: ONYXKEYS.COLLECTION.TRANSACTION, - waitForCollectionCallback: true, callback: (transactions) => { Onyx.disconnect(connection); const newTransaction = transactions[`${ONYXKEYS.COLLECTION.TRANSACTION}${fakeTransaction.transactionID}`]; @@ -507,7 +506,6 @@ describe('actions/IOU/UpdateMoneyRequest', () => { const updatedTransaction = await new Promise>((resolve) => { const connection = Onyx.connect({ key: ONYXKEYS.COLLECTION.TRANSACTION, - waitForCollectionCallback: true, callback: (transactions) => { Onyx.disconnect(connection); const newTransaction = transactions[`${ONYXKEYS.COLLECTION.TRANSACTION}${fakeTransaction.transactionID}`]; diff --git a/tests/actions/MergeTransactionTest.ts b/tests/actions/MergeTransactionTest.ts index acd60562e109..bddd5379cb06 100644 --- a/tests/actions/MergeTransactionTest.ts +++ b/tests/actions/MergeTransactionTest.ts @@ -1230,7 +1230,6 @@ describe('mergeTransactionRequest', () => { await new Promise((resolve) => { const connection = Onyx.connect({ key: `${ONYXKEYS.COLLECTION.REPORT}${thread.reportID}`, - waitForCollectionCallback: false, callback: (report) => { Onyx.disconnect(connection); expect(report?.reportID).toBeFalsy(); @@ -1253,7 +1252,6 @@ describe('mergeTransactionRequest', () => { await new Promise((resolve) => { const connection = Onyx.connect({ key: `${ONYXKEYS.COLLECTION.REPORT}${thread.reportID}`, - waitForCollectionCallback: false, callback: (report) => { Onyx.disconnect(connection); expect(report).toBeFalsy(); @@ -1373,7 +1371,6 @@ describe('mergeTransactionRequest', () => { await new Promise((resolve) => { const connection = Onyx.connect({ key: `${ONYXKEYS.COLLECTION.REPORT}${thread.reportID}`, - waitForCollectionCallback: false, callback: (report) => { Onyx.disconnect(connection); expect(report?.reportID).toBeFalsy(); @@ -1390,7 +1387,6 @@ describe('mergeTransactionRequest', () => { await new Promise((resolve) => { const connection = Onyx.connect({ key: `${ONYXKEYS.COLLECTION.REPORT}${thread.reportID}`, - waitForCollectionCallback: false, callback: (report) => { Onyx.disconnect(connection); expect(report).toBeFalsy(); diff --git a/tests/actions/PolicyCategoryTest.ts b/tests/actions/PolicyCategoryTest.ts index e1c72d805b61..6ae393660205 100644 --- a/tests/actions/PolicyCategoryTest.ts +++ b/tests/actions/PolicyCategoryTest.ts @@ -54,7 +54,6 @@ describe('actions/PolicyCategory', () => { await new Promise((resolve) => { const connection = Onyx.connect({ key: `${ONYXKEYS.COLLECTION.POLICY}${fakePolicy.id}`, - waitForCollectionCallback: false, callback: (policy) => { Onyx.disconnect(connection); // Check if policy requiresCategory was updated with correct values @@ -70,7 +69,6 @@ describe('actions/PolicyCategory', () => { await new Promise((resolve) => { const connection = Onyx.connect({ key: `${ONYXKEYS.COLLECTION.POLICY}${fakePolicy.id}`, - waitForCollectionCallback: false, callback: (policy) => { Onyx.disconnect(connection); // Check if the policy pendingFields was cleared @@ -103,7 +101,6 @@ describe('actions/PolicyCategory', () => { await new Promise((resolve) => { const connection = Onyx.connect({ key: `${ONYXKEYS.COLLECTION.POLICY_CATEGORIES}${fakePolicy.id}`, - waitForCollectionCallback: false, callback: (policyCategories) => { Onyx.disconnect(connection); const newCategory = policyCategories?.[newCategoryName]; @@ -120,7 +117,6 @@ describe('actions/PolicyCategory', () => { await new Promise((resolve) => { const connection = Onyx.connect({ key: `${ONYXKEYS.COLLECTION.POLICY_CATEGORIES}${fakePolicy.id}`, - waitForCollectionCallback: false, callback: (policyCategories) => { Onyx.disconnect(connection); @@ -153,7 +149,6 @@ describe('actions/PolicyCategory', () => { await new Promise((resolve) => { const connection = Onyx.connect({ key: `${ONYXKEYS.COLLECTION.POLICY_CATEGORIES}${fakePolicy.id}`, - waitForCollectionCallback: false, callback: (policyCategories) => { Onyx.disconnect(connection); @@ -171,7 +166,6 @@ describe('actions/PolicyCategory', () => { await new Promise((resolve) => { const connection = Onyx.connect({ key: `${ONYXKEYS.COLLECTION.POLICY_CATEGORIES}${fakePolicy.id}`, - waitForCollectionCallback: false, callback: (policyCategories) => { Onyx.disconnect(connection); @@ -214,7 +208,6 @@ describe('actions/PolicyCategory', () => { await new Promise((resolve) => { const connection = Onyx.connect({ key: `${ONYXKEYS.COLLECTION.POLICY_CATEGORIES}${fakePolicy.id}`, - waitForCollectionCallback: false, callback: (policyCategories) => { Onyx.disconnect(connection); @@ -231,7 +224,6 @@ describe('actions/PolicyCategory', () => { await new Promise((resolve) => { const connection = Onyx.connect({ key: `${ONYXKEYS.COLLECTION.POLICY_CATEGORIES}${fakePolicy.id}`, - waitForCollectionCallback: false, callback: (policyCategories) => { Onyx.disconnect(connection); @@ -261,7 +253,6 @@ describe('actions/PolicyCategory', () => { await new Promise((resolve) => { const connection = Onyx.connect({ key: `${ONYXKEYS.COLLECTION.POLICY_CATEGORIES}${fakePolicy.id}`, - waitForCollectionCallback: false, callback: (policyCategories) => { Onyx.disconnect(connection); @@ -275,7 +266,6 @@ describe('actions/PolicyCategory', () => { await new Promise((resolve) => { const connection = Onyx.connect({ key: `${ONYXKEYS.COLLECTION.POLICY_CATEGORIES}${fakePolicy.id}`, - waitForCollectionCallback: false, callback: (policyCategories) => { Onyx.disconnect(connection); expect(policyCategories?.[categoryNameToDelete]).toBeFalsy(); @@ -315,7 +305,6 @@ describe('actions/PolicyCategory', () => { await new Promise((resolve) => { const connection = Onyx.connect({ key: `${ONYXKEYS.COLLECTION.POLICY}${fakePolicy.id}`, - waitForCollectionCallback: false, callback: (policy) => { Onyx.disconnect(connection); expect(policy?.pendingFields?.areCategoriesEnabled).toBe(CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE); @@ -326,7 +315,6 @@ describe('actions/PolicyCategory', () => { await new Promise((resolve) => { const connection = Onyx.connect({ key: `${ONYXKEYS.COLLECTION.POLICY_CATEGORIES}${fakePolicy.id}`, - waitForCollectionCallback: false, callback: (policyCategories) => { Onyx.disconnect(connection); expect(Object.values(policyCategories ?? {}).every((category) => category.enabled === false)).toBeTruthy(); @@ -340,7 +328,6 @@ describe('actions/PolicyCategory', () => { await new Promise((resolve) => { const connection = Onyx.connect({ key: `${ONYXKEYS.COLLECTION.POLICY}${fakePolicy.id}`, - waitForCollectionCallback: false, callback: (policy) => { Onyx.disconnect(connection); expect(policy?.areCategoriesEnabled).toBe(false); @@ -379,7 +366,6 @@ describe('actions/PolicyCategory', () => { await new Promise((resolve) => { const connection = Onyx.connect({ key: `${ONYXKEYS.COLLECTION.POLICY}${fakePolicy.id}`, - waitForCollectionCallback: false, callback: (policy) => { Onyx.disconnect(connection); expect(policy?.pendingFields?.areCategoriesEnabled).toBe(CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE); @@ -390,7 +376,6 @@ describe('actions/PolicyCategory', () => { await new Promise((resolve) => { const connection = Onyx.connect({ key: `${ONYXKEYS.COLLECTION.POLICY_CATEGORIES}${fakePolicy.id}`, - waitForCollectionCallback: false, callback: (policyCategories) => { Onyx.disconnect(connection); expect(Object.values(policyCategories ?? {}).every((category) => category.enabled === true)).toBeTruthy(); @@ -404,7 +389,6 @@ describe('actions/PolicyCategory', () => { await new Promise((resolve) => { const connection = Onyx.connect({ key: `${ONYXKEYS.COLLECTION.POLICY}${fakePolicy.id}`, - waitForCollectionCallback: false, callback: (policy) => { Onyx.disconnect(connection); expect(policy?.areCategoriesEnabled).toBe(true); @@ -743,7 +727,6 @@ describe('actions/PolicyCategory', () => { await new Promise((resolve) => { const connection = Onyx.connect({ key: `${ONYXKEYS.COLLECTION.POLICY_CATEGORIES}${fakePolicy.id}`, - waitForCollectionCallback: false, callback: (policyCategories) => { Onyx.disconnect(connection); const category = policyCategories?.[categoryName]; @@ -765,7 +748,6 @@ describe('actions/PolicyCategory', () => { await new Promise((resolve) => { const connection = Onyx.connect({ key: `${ONYXKEYS.COLLECTION.POLICY_CATEGORIES}${fakePolicy.id}`, - waitForCollectionCallback: false, callback: (policyCategories) => { Onyx.disconnect(connection); const category = policyCategories?.[categoryName]; @@ -818,7 +800,6 @@ describe('actions/PolicyCategory', () => { await new Promise((resolve) => { const connection = Onyx.connect({ key: `${ONYXKEYS.COLLECTION.POLICY_CATEGORIES}${fakePolicy.id}`, - waitForCollectionCallback: false, callback: (policyCategories) => { Onyx.disconnect(connection); const category = policyCategories?.[categoryName]; @@ -840,7 +821,6 @@ describe('actions/PolicyCategory', () => { await new Promise((resolve) => { const connection = Onyx.connect({ key: `${ONYXKEYS.COLLECTION.POLICY_CATEGORIES}${fakePolicy.id}`, - waitForCollectionCallback: false, callback: (policyCategories) => { Onyx.disconnect(connection); const category = policyCategories?.[categoryName]; diff --git a/tests/actions/PolicyMemberTest.ts b/tests/actions/PolicyMemberTest.ts index 414995f62ed0..05570a899209 100644 --- a/tests/actions/PolicyMemberTest.ts +++ b/tests/actions/PolicyMemberTest.ts @@ -57,7 +57,6 @@ describe('actions/PolicyMember', () => { await new Promise((resolve) => { const connection = Onyx.connect({ key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${fakeReport.reportID}`, - waitForCollectionCallback: false, callback: (reportActions) => { Onyx.disconnect(connection); @@ -76,7 +75,6 @@ describe('actions/PolicyMember', () => { await new Promise((resolve) => { const connection = Onyx.connect({ key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${fakeReport.reportID}`, - waitForCollectionCallback: false, callback: (reportActions) => { Onyx.disconnect(connection); @@ -116,7 +114,6 @@ describe('actions/PolicyMember', () => { await new Promise((resolve) => { const connection = Onyx.connect({ key: `${ONYXKEYS.COLLECTION.POLICY}${fakePolicy.id}`, - waitForCollectionCallback: false, callback: (policy) => { Onyx.disconnect(connection); const employee = policy?.employeeList?.[fakeUser2?.login ?? '']; @@ -143,7 +140,6 @@ describe('actions/PolicyMember', () => { await new Promise((resolve) => { const connection = Onyx.connect({ key: `${ONYXKEYS.COLLECTION.POLICY}${fakePolicy.id}`, - waitForCollectionCallback: false, callback: (policy) => { Onyx.disconnect(connection); const employee = policy?.employeeList?.[fakeUser2?.login ?? '']; @@ -159,7 +155,6 @@ describe('actions/PolicyMember', () => { await new Promise((resolve) => { const connection = Onyx.connect({ key: `${ONYXKEYS.COLLECTION.POLICY}${fakePolicy.id}`, - waitForCollectionCallback: false, callback: (policy) => { Onyx.disconnect(connection); resolve(); @@ -195,7 +190,6 @@ describe('actions/PolicyMember', () => { await new Promise((resolve) => { const connection = Onyx.connect({ key: `${ONYXKEYS.COLLECTION.POLICY}${fakePolicy.id}`, - waitForCollectionCallback: false, callback: (policy) => { Onyx.disconnect(connection); expect(policy?.errorFields).toBeFalsy(); @@ -211,7 +205,6 @@ describe('actions/PolicyMember', () => { await new Promise((resolve) => { const connection = Onyx.connect({ key: `${ONYXKEYS.COLLECTION.POLICY}${fakePolicy.id}`, - waitForCollectionCallback: false, callback: (policy) => { Onyx.disconnect(connection); expect(policy?.isLoading).toBeFalsy(); @@ -246,7 +239,6 @@ describe('actions/PolicyMember', () => { await new Promise((resolve) => { const connection = Onyx.connect({ key: `${ONYXKEYS.COLLECTION.POLICY}${fakePolicy.id}`, - waitForCollectionCallback: false, callback: (policy) => { Onyx.disconnect(connection); expect(policy?.errorFields).toBeFalsy(); @@ -262,7 +254,6 @@ describe('actions/PolicyMember', () => { await new Promise((resolve) => { const connection = Onyx.connect({ key: `${ONYXKEYS.COLLECTION.POLICY}${fakePolicy.id}`, - waitForCollectionCallback: false, callback: (policy) => { Onyx.disconnect(connection); expect(policy?.isLoading).toBeFalsy(); @@ -294,7 +285,6 @@ describe('actions/PolicyMember', () => { await new Promise((resolve) => { const connection = Onyx.connect({ key: `${ONYXKEYS.COLLECTION.POLICY}${fakePolicy.id}`, - waitForCollectionCallback: false, callback: (policy) => { Onyx.disconnect(connection); expect(policy?.isLoading).toBeFalsy(); @@ -321,7 +311,6 @@ describe('actions/PolicyMember', () => { await new Promise((resolve) => { const connection = Onyx.connect({ key: `${ONYXKEYS.COLLECTION.POLICY}${fakePolicy.id}`, - waitForCollectionCallback: false, callback: (policy) => { Onyx.disconnect(connection); expect(policy?.errorFields).toBeFalsy(); @@ -346,7 +335,6 @@ describe('actions/PolicyMember', () => { await new Promise((resolve) => { const connection = Onyx.connect({ key: `${ONYXKEYS.COLLECTION.POLICY}${fakePolicy.id}`, - waitForCollectionCallback: false, callback: (policy) => { Onyx.disconnect(connection); expect(policy?.isLoading).toBeFalsy(); @@ -383,7 +371,6 @@ describe('actions/PolicyMember', () => { await new Promise((resolve) => { const connection = Onyx.connect({ key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`, - waitForCollectionCallback: false, callback: (policyResult) => { Onyx.disconnect(connection); const newEmployee = policyResult?.employeeList?.[newUserEmail]; @@ -486,7 +473,6 @@ describe('actions/PolicyMember', () => { await new Promise((resolve) => { const connection = Onyx.connect({ key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`, - waitForCollectionCallback: false, callback: (policyResult) => { Onyx.disconnect(connection); const newEmployee = policyResult?.employeeList?.[newUserEmail]; @@ -519,7 +505,6 @@ describe('actions/PolicyMember', () => { await new Promise((resolve) => { const connection = Onyx.connect({ key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`, - waitForCollectionCallback: false, callback: (policyResult) => { Onyx.disconnect(connection); const newEmployee = policyResult?.employeeList?.[newUserEmail]; @@ -1234,7 +1219,6 @@ describe('actions/PolicyMember', () => { const draft = await new Promise((resolve) => { const connection = Onyx.connect({ key: `${ONYXKEYS.COLLECTION.WORKSPACE_INVITE_MEMBERS_DRAFT}${policyID}`, - waitForCollectionCallback: false, callback: (value) => { Onyx.disconnect(connection); resolve(value as typeof invitedEmailsToAccountIDs | null | undefined); @@ -1276,7 +1260,6 @@ describe('actions/PolicyMember', () => { const draft = await new Promise | null | undefined>((resolve) => { const connection = Onyx.connect({ key: `${ONYXKEYS.COLLECTION.WORKSPACE_INVITE_MEMBERS_DRAFT}${policyID}`, - waitForCollectionCallback: false, callback: (value) => { Onyx.disconnect(connection); resolve(value as Record | null | undefined); @@ -1313,7 +1296,6 @@ describe('actions/PolicyMember', () => { const draft = await new Promise | null | undefined>((resolve) => { const connection = Onyx.connect({ key: `${ONYXKEYS.COLLECTION.WORKSPACE_INVITE_MEMBERS_DRAFT}${policyID}`, - waitForCollectionCallback: false, callback: (value) => { Onyx.disconnect(connection); resolve(value as Record | null | undefined); @@ -1346,7 +1328,6 @@ describe('actions/PolicyMember', () => { const savedDraft1 = await new Promise | null | undefined>((resolve) => { const connection = Onyx.connect({ key: `${ONYXKEYS.COLLECTION.WORKSPACE_INVITE_MEMBERS_DRAFT}${policyID1}`, - waitForCollectionCallback: false, callback: (value) => { Onyx.disconnect(connection); resolve(value as Record | null | undefined); @@ -1357,7 +1338,6 @@ describe('actions/PolicyMember', () => { const savedDraft2 = await new Promise | null | undefined>((resolve) => { const connection = Onyx.connect({ key: `${ONYXKEYS.COLLECTION.WORKSPACE_INVITE_MEMBERS_DRAFT}${policyID2}`, - waitForCollectionCallback: false, callback: (value) => { Onyx.disconnect(connection); resolve(value as Record | null | undefined); @@ -1390,7 +1370,6 @@ describe('actions/PolicyMember', () => { const draft = await new Promise | null | undefined>((resolve) => { const connection = Onyx.connect({ key: `${ONYXKEYS.COLLECTION.WORKSPACE_INVITE_MEMBERS_DRAFT}${policyID}`, - waitForCollectionCallback: false, callback: (value) => { Onyx.disconnect(connection); resolve(value as Record | null | undefined); @@ -1422,7 +1401,6 @@ describe('actions/PolicyMember', () => { const draft = await new Promise | null | undefined>((resolve) => { const connection = Onyx.connect({ key: `${ONYXKEYS.COLLECTION.WORKSPACE_INVITE_MEMBERS_DRAFT}${policyID}`, - waitForCollectionCallback: false, callback: (value) => { Onyx.disconnect(connection); resolve(value as Record | null | undefined); diff --git a/tests/actions/PolicyProfileTest.ts b/tests/actions/PolicyProfileTest.ts index 7232ed33227f..d78e65f776e4 100644 --- a/tests/actions/PolicyProfileTest.ts +++ b/tests/actions/PolicyProfileTest.ts @@ -38,7 +38,6 @@ describe('actions/PolicyProfile', () => { await new Promise((resolve) => { const connection = Onyx.connect({ key: `${ONYXKEYS.COLLECTION.POLICY}${fakePolicy.id}`, - waitForCollectionCallback: false, callback: (policy) => { Onyx.disconnect(connection); @@ -54,7 +53,6 @@ describe('actions/PolicyProfile', () => { await new Promise((resolve) => { const connection = Onyx.connect({ key: `${ONYXKEYS.COLLECTION.POLICY}${fakePolicy.id}`, - waitForCollectionCallback: false, callback: (policy) => { Onyx.disconnect(connection); expect(policy?.pendingFields?.description).toBeFalsy(); diff --git a/tests/actions/PolicyRulesTest.ts b/tests/actions/PolicyRulesTest.ts index d49be875dcbc..9a3258c0ba7e 100644 --- a/tests/actions/PolicyRulesTest.ts +++ b/tests/actions/PolicyRulesTest.ts @@ -18,7 +18,6 @@ function getPolicy(policyID: string): Promise { return new Promise((resolve) => { const connection = Onyx.connect({ key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`, - waitForCollectionCallback: false, callback: (policy) => { Onyx.disconnect(connection); resolve(policy); diff --git a/tests/actions/PolicyTagTest.ts b/tests/actions/PolicyTagTest.ts index 78ecb9788fd6..f155a9769021 100644 --- a/tests/actions/PolicyTagTest.ts +++ b/tests/actions/PolicyTagTest.ts @@ -64,7 +64,6 @@ describe('actions/Policy', () => { new Promise((resolve) => { const connection = Onyx.connect({ key: `${ONYXKEYS.COLLECTION.POLICY}${fakePolicy.id}`, - waitForCollectionCallback: false, callback: (policy) => { Onyx.disconnect(connection); @@ -84,7 +83,6 @@ describe('actions/Policy', () => { new Promise((resolve) => { const connection = Onyx.connect({ key: `${ONYXKEYS.COLLECTION.POLICY}${fakePolicy.id}`, - waitForCollectionCallback: false, callback: (policy) => { Onyx.disconnect(connection); expect(policy?.pendingFields?.requiresTag).toBeFalsy(); @@ -112,7 +110,6 @@ describe('actions/Policy', () => { new Promise((resolve) => { const connection = Onyx.connect({ key: `${ONYXKEYS.COLLECTION.POLICY}${fakePolicy.id}`, - waitForCollectionCallback: false, callback: (policy) => { Onyx.disconnect(connection); @@ -132,7 +129,6 @@ describe('actions/Policy', () => { new Promise((resolve) => { const connection = Onyx.connect({ key: `${ONYXKEYS.COLLECTION.POLICY}${fakePolicy.id}`, - waitForCollectionCallback: false, callback: (policy) => { Onyx.disconnect(connection); expect(policy?.pendingFields?.requiresTag).toBeFalsy(); @@ -164,7 +160,6 @@ describe('actions/Policy', () => { new Promise((resolve) => { const connection = Onyx.connect({ key: `${ONYXKEYS.COLLECTION.POLICY}${fakePolicy.id}`, - waitForCollectionCallback: false, callback: (policy) => { Onyx.disconnect(connection); expect(policy?.pendingFields?.requiresTag).toBeFalsy(); diff --git a/tests/actions/PolicyTaxTest.ts b/tests/actions/PolicyTaxTest.ts index afebe7674f4e..8fe82483203d 100644 --- a/tests/actions/PolicyTaxTest.ts +++ b/tests/actions/PolicyTaxTest.ts @@ -59,7 +59,6 @@ describe('actions/PolicyTax', () => { new Promise((resolve) => { const connection = Onyx.connect({ key: `${ONYXKEYS.COLLECTION.POLICY}${fakePolicy.id}`, - waitForCollectionCallback: false, callback: (policy) => { Onyx.disconnect(connection); expect(policy?.taxRates?.name).toBe(customTaxName); @@ -77,7 +76,6 @@ describe('actions/PolicyTax', () => { new Promise((resolve) => { const connection = Onyx.connect({ key: `${ONYXKEYS.COLLECTION.POLICY}${fakePolicy.id}`, - waitForCollectionCallback: false, callback: (policy) => { Onyx.disconnect(connection); expect(policy?.taxRates?.pendingFields?.name).toBeFalsy(); @@ -100,7 +98,6 @@ describe('actions/PolicyTax', () => { new Promise((resolve) => { const connection = Onyx.connect({ key: `${ONYXKEYS.COLLECTION.POLICY}${fakePolicy.id}`, - waitForCollectionCallback: false, callback: (policy) => { Onyx.disconnect(connection); expect(policy?.taxRates?.name).toBe(customTaxName); @@ -121,7 +118,6 @@ describe('actions/PolicyTax', () => { new Promise((resolve) => { const connection = Onyx.connect({ key: `${ONYXKEYS.COLLECTION.POLICY}${fakePolicy.id}`, - waitForCollectionCallback: false, callback: (policy) => { Onyx.disconnect(connection); expect(policy?.taxRates?.name).toBe(originalCustomTaxName); @@ -147,7 +143,6 @@ describe('actions/PolicyTax', () => { new Promise((resolve) => { const connection = Onyx.connect({ key: `${ONYXKEYS.COLLECTION.POLICY}${fakePolicy.id}`, - waitForCollectionCallback: false, callback: (policy) => { Onyx.disconnect(connection); expect(policy?.taxRates?.defaultExternalID).toBe(taxCode); @@ -165,7 +160,6 @@ describe('actions/PolicyTax', () => { new Promise((resolve) => { const connection = Onyx.connect({ key: `${ONYXKEYS.COLLECTION.POLICY}${fakePolicy.id}`, - waitForCollectionCallback: false, callback: (policy) => { Onyx.disconnect(connection); expect(policy?.taxRates?.pendingFields?.defaultExternalID).toBeFalsy(); @@ -188,7 +182,6 @@ describe('actions/PolicyTax', () => { new Promise((resolve) => { const connection = Onyx.connect({ key: `${ONYXKEYS.COLLECTION.POLICY}${fakePolicy.id}`, - waitForCollectionCallback: false, callback: (policy) => { Onyx.disconnect(connection); expect(policy?.taxRates?.defaultExternalID).toBe(taxCode); @@ -209,7 +202,6 @@ describe('actions/PolicyTax', () => { new Promise((resolve) => { const connection = Onyx.connect({ key: `${ONYXKEYS.COLLECTION.POLICY}${fakePolicy.id}`, - waitForCollectionCallback: false, callback: (policy) => { Onyx.disconnect(connection); expect(policy?.taxRates?.defaultExternalID).toBe(originalDefaultExternalID); @@ -234,7 +226,6 @@ describe('actions/PolicyTax', () => { new Promise((resolve) => { const connection = Onyx.connect({ key: `${ONYXKEYS.COLLECTION.POLICY}${fakePolicy.id}`, - waitForCollectionCallback: false, callback: (policy) => { Onyx.disconnect(connection); expect(policy?.taxRates?.foreignTaxDefault).toBe(taxCode); @@ -252,7 +243,6 @@ describe('actions/PolicyTax', () => { new Promise((resolve) => { const connection = Onyx.connect({ key: `${ONYXKEYS.COLLECTION.POLICY}${fakePolicy.id}`, - waitForCollectionCallback: false, callback: (policy) => { Onyx.disconnect(connection); // Check if the policy pendingFields was cleared @@ -276,7 +266,6 @@ describe('actions/PolicyTax', () => { new Promise((resolve) => { const connection = Onyx.connect({ key: `${ONYXKEYS.COLLECTION.POLICY}${fakePolicy.id}`, - waitForCollectionCallback: false, callback: (policy) => { Onyx.disconnect(connection); expect(policy?.taxRates?.foreignTaxDefault).toBe(taxCode); @@ -298,7 +287,6 @@ describe('actions/PolicyTax', () => { new Promise((resolve) => { const connection = Onyx.connect({ key: `${ONYXKEYS.COLLECTION.POLICY}${fakePolicy.id}`, - waitForCollectionCallback: false, callback: (policy) => { Onyx.disconnect(connection); // Check if the policy pendingFields was cleared @@ -328,7 +316,6 @@ describe('actions/PolicyTax', () => { new Promise((resolve) => { const connection = Onyx.connect({ key: `${ONYXKEYS.COLLECTION.POLICY}${fakePolicy.id}`, - waitForCollectionCallback: false, callback: (policy) => { Onyx.disconnect(connection); const createdTax = policy?.taxRates?.taxes?.[newTaxRate.code ?? '']; @@ -348,7 +335,6 @@ describe('actions/PolicyTax', () => { new Promise((resolve) => { const connection = Onyx.connect({ key: `${ONYXKEYS.COLLECTION.POLICY}${fakePolicy.id}`, - waitForCollectionCallback: false, callback: (policy) => { Onyx.disconnect(connection); const createdTax = policy?.taxRates?.taxes?.[newTaxRate.code ?? '']; @@ -376,7 +362,6 @@ describe('actions/PolicyTax', () => { new Promise((resolve) => { const connection = Onyx.connect({ key: `${ONYXKEYS.COLLECTION.POLICY}${fakePolicy.id}`, - waitForCollectionCallback: false, callback: (policy) => { Onyx.disconnect(connection); const createdTax = policy?.taxRates?.taxes?.[newTaxRate.code ?? '']; @@ -399,7 +384,6 @@ describe('actions/PolicyTax', () => { new Promise((resolve) => { const connection = Onyx.connect({ key: `${ONYXKEYS.COLLECTION.POLICY}${fakePolicy.id}`, - waitForCollectionCallback: false, callback: (policy) => { Onyx.disconnect(connection); const createdTax = policy?.taxRates?.taxes?.[newTaxRate.code ?? '']; @@ -422,7 +406,6 @@ describe('actions/PolicyTax', () => { new Promise((resolve) => { const connection = Onyx.connect({ key: `${ONYXKEYS.COLLECTION.POLICY}${fakePolicy.id}`, - waitForCollectionCallback: false, callback: (policy) => { Onyx.disconnect(connection); const disabledTax = policy?.taxRates?.taxes?.[disableTaxID]; @@ -442,7 +425,6 @@ describe('actions/PolicyTax', () => { new Promise((resolve) => { const connection = Onyx.connect({ key: `${ONYXKEYS.COLLECTION.POLICY}${fakePolicy.id}`, - waitForCollectionCallback: false, callback: (policy) => { Onyx.disconnect(connection); const disabledTax = policy?.taxRates?.taxes?.[disableTaxID]; @@ -466,7 +448,6 @@ describe('actions/PolicyTax', () => { new Promise((resolve) => { const connection = Onyx.connect({ key: `${ONYXKEYS.COLLECTION.POLICY}${fakePolicy.id}`, - waitForCollectionCallback: false, callback: (policy) => { Onyx.disconnect(connection); const disabledTax = policy?.taxRates?.taxes?.[disableTaxID]; @@ -489,7 +470,6 @@ describe('actions/PolicyTax', () => { new Promise((resolve) => { const connection = Onyx.connect({ key: `${ONYXKEYS.COLLECTION.POLICY}${fakePolicy.id}`, - waitForCollectionCallback: false, callback: (policy) => { Onyx.disconnect(connection); const disabledTax = policy?.taxRates?.taxes?.[disableTaxID]; @@ -517,7 +497,6 @@ describe('actions/PolicyTax', () => { new Promise((resolve) => { const connection = Onyx.connect({ key: `${ONYXKEYS.COLLECTION.POLICY}${fakePolicy.id}`, - waitForCollectionCallback: false, callback: (policy) => { Onyx.disconnect(connection); const updatedTax = policy?.taxRates?.taxes?.[taxID]; @@ -537,7 +516,6 @@ describe('actions/PolicyTax', () => { new Promise((resolve) => { const connection = Onyx.connect({ key: `${ONYXKEYS.COLLECTION.POLICY}${fakePolicy.id}`, - waitForCollectionCallback: false, callback: (policy) => { Onyx.disconnect(connection); const updatedTax = policy?.taxRates?.taxes?.[taxID]; @@ -563,7 +541,6 @@ describe('actions/PolicyTax', () => { new Promise((resolve) => { const connection = Onyx.connect({ key: `${ONYXKEYS.COLLECTION.POLICY}${fakePolicy.id}`, - waitForCollectionCallback: false, callback: (policy) => { Onyx.disconnect(connection); const updatedTax = policy?.taxRates?.taxes?.[taxID]; @@ -586,7 +563,6 @@ describe('actions/PolicyTax', () => { new Promise((resolve) => { const connection = Onyx.connect({ key: `${ONYXKEYS.COLLECTION.POLICY}${fakePolicy.id}`, - waitForCollectionCallback: false, callback: (policy) => { Onyx.disconnect(connection); const updatedTax = policy?.taxRates?.taxes?.[taxID]; @@ -614,7 +590,6 @@ describe('actions/PolicyTax', () => { new Promise((resolve) => { const connection = Onyx.connect({ key: `${ONYXKEYS.COLLECTION.POLICY}${fakePolicy.id}`, - waitForCollectionCallback: false, callback: (policy) => { Onyx.disconnect(connection); const updatedTax = policy?.taxRates?.taxes?.[taxID]; @@ -634,7 +609,6 @@ describe('actions/PolicyTax', () => { new Promise((resolve) => { const connection = Onyx.connect({ key: `${ONYXKEYS.COLLECTION.POLICY}${fakePolicy.id}`, - waitForCollectionCallback: false, callback: (policy) => { Onyx.disconnect(connection); const updatedTax = policy?.taxRates?.taxes?.[taxID]; @@ -661,7 +635,6 @@ describe('actions/PolicyTax', () => { new Promise((resolve) => { const connection = Onyx.connect({ key: `${ONYXKEYS.COLLECTION.POLICY}${fakePolicy.id}`, - waitForCollectionCallback: false, callback: (policy) => { Onyx.disconnect(connection); const updatedTax = policy?.taxRates?.taxes?.[taxID]; @@ -684,7 +657,6 @@ describe('actions/PolicyTax', () => { new Promise((resolve) => { const connection = Onyx.connect({ key: `${ONYXKEYS.COLLECTION.POLICY}${fakePolicy.id}`, - waitForCollectionCallback: false, callback: (policy) => { Onyx.disconnect(connection); const updatedTax = policy?.taxRates?.taxes?.[taxID]; @@ -711,7 +683,6 @@ describe('actions/PolicyTax', () => { new Promise((resolve) => { const connection = Onyx.connect({ key: `${ONYXKEYS.COLLECTION.POLICY}${fakePolicy.id}`, - waitForCollectionCallback: false, callback: (policy) => { Onyx.disconnect(connection); const taxRates = policy?.taxRates; @@ -732,7 +703,6 @@ describe('actions/PolicyTax', () => { new Promise((resolve) => { const connection = Onyx.connect({ key: `${ONYXKEYS.COLLECTION.POLICY}${fakePolicy.id}`, - waitForCollectionCallback: false, callback: (policy) => { Onyx.disconnect(connection); const taxRates = policy?.taxRates; @@ -765,7 +735,6 @@ describe('actions/PolicyTax', () => { new Promise((resolve) => { const connection = Onyx.connect({ key: `${ONYXKEYS.COLLECTION.POLICY}${fakePolicyWithForeignTaxDefault.id}`, - waitForCollectionCallback: false, callback: (policy) => { Onyx.disconnect(connection); const taxRates = policy?.taxRates; @@ -786,7 +755,6 @@ describe('actions/PolicyTax', () => { new Promise((resolve) => { const connection = Onyx.connect({ key: `${ONYXKEYS.COLLECTION.POLICY}${fakePolicyWithForeignTaxDefault.id}`, - waitForCollectionCallback: false, callback: (policy) => { Onyx.disconnect(connection); const taxRates = policy?.taxRates; @@ -812,7 +780,6 @@ describe('actions/PolicyTax', () => { new Promise((resolve) => { const connection = Onyx.connect({ key: `${ONYXKEYS.COLLECTION.POLICY}${fakePolicy.id}`, - waitForCollectionCallback: false, callback: (policy) => { Onyx.disconnect(connection); const taxRates = policy?.taxRates; @@ -836,7 +803,6 @@ describe('actions/PolicyTax', () => { new Promise((resolve) => { const connection = Onyx.connect({ key: `${ONYXKEYS.COLLECTION.POLICY}${fakePolicy.id}`, - waitForCollectionCallback: false, callback: (policy) => { Onyx.disconnect(connection); const taxRates = policy?.taxRates; @@ -876,7 +842,6 @@ describe('actions/PolicyTax', () => { new Promise((resolve) => { const connection = Onyx.connect({ key: `${ONYXKEYS.COLLECTION.POLICY}${fakePolicy.id}`, - waitForCollectionCallback: false, callback: (policy) => { Onyx.disconnect(connection); const taxRates = policy?.taxRates; diff --git a/tests/actions/PolicyTest.ts b/tests/actions/PolicyTest.ts index b82ec304c557..5360d67eabe4 100644 --- a/tests/actions/PolicyTest.ts +++ b/tests/actions/PolicyTest.ts @@ -138,7 +138,6 @@ describe('actions/Policy', () => { let allReports: OnyxCollection = await new Promise((resolve) => { const connection = Onyx.connect({ key: ONYXKEYS.COLLECTION.REPORT, - waitForCollectionCallback: true, callback: (reports) => { Onyx.disconnect(connection); resolve(reports); @@ -172,7 +171,6 @@ describe('actions/Policy', () => { let reportActions: OnyxCollection = await new Promise((resolve) => { const connection = Onyx.connect({ key: ONYXKEYS.COLLECTION.REPORT_ACTIONS, - waitForCollectionCallback: true, callback: (actions) => { Onyx.disconnect(connection); resolve(actions); @@ -230,7 +228,6 @@ describe('actions/Policy', () => { policy = await new Promise((resolve) => { const connection = Onyx.connect({ key: ONYXKEYS.COLLECTION.POLICY, - waitForCollectionCallback: true, callback: (workspace) => { Onyx.disconnect(connection); resolve(workspace); @@ -244,7 +241,6 @@ describe('actions/Policy', () => { allReports = await new Promise((resolve) => { const connection = Onyx.connect({ key: ONYXKEYS.COLLECTION.REPORT, - waitForCollectionCallback: true, callback: (reports) => { Onyx.disconnect(connection); resolve(reports); @@ -261,7 +257,6 @@ describe('actions/Policy', () => { reportActions = await new Promise((resolve) => { const connection = Onyx.connect({ key: ONYXKEYS.COLLECTION.REPORT_ACTIONS, - waitForCollectionCallback: true, callback: (actions) => { Onyx.disconnect(connection); resolve(actions); @@ -355,7 +350,6 @@ describe('actions/Policy', () => { let allReports: OnyxCollection = await new Promise((resolve) => { const connection = Onyx.connect({ key: ONYXKEYS.COLLECTION.REPORT, - waitForCollectionCallback: true, callback: (reports) => { Onyx.disconnect(connection); resolve(reports); @@ -389,7 +383,6 @@ describe('actions/Policy', () => { let reportActions: OnyxCollection = await new Promise((resolve) => { const connection = Onyx.connect({ key: ONYXKEYS.COLLECTION.REPORT_ACTIONS, - waitForCollectionCallback: true, callback: (actions) => { Onyx.disconnect(connection); resolve(actions); @@ -433,7 +426,6 @@ describe('actions/Policy', () => { policy = await new Promise((resolve) => { const connection = Onyx.connect({ key: ONYXKEYS.COLLECTION.POLICY, - waitForCollectionCallback: true, callback: (workspace) => { Onyx.disconnect(connection); resolve(workspace); @@ -447,7 +439,6 @@ describe('actions/Policy', () => { allReports = await new Promise((resolve) => { const connection = Onyx.connect({ key: ONYXKEYS.COLLECTION.REPORT, - waitForCollectionCallback: true, callback: (reports) => { Onyx.disconnect(connection); resolve(reports); @@ -464,7 +455,6 @@ describe('actions/Policy', () => { reportActions = await new Promise((resolve) => { const connection = Onyx.connect({ key: ONYXKEYS.COLLECTION.REPORT_ACTIONS, - waitForCollectionCallback: true, callback: (actions) => { Onyx.disconnect(connection); resolve(actions); @@ -651,7 +641,6 @@ describe('actions/Policy', () => { const allReports: OnyxCollection = await new Promise((resolve) => { const connection = Onyx.connect({ key: ONYXKEYS.COLLECTION.REPORT, - waitForCollectionCallback: true, callback: (reports) => { Onyx.disconnect(connection); resolve(reports); @@ -754,7 +743,6 @@ describe('actions/Policy', () => { const allReports: OnyxCollection = await new Promise((resolve) => { const connection = Onyx.connect({ key: ONYXKEYS.COLLECTION.REPORT, - waitForCollectionCallback: true, callback: (reports) => { Onyx.disconnect(connection); resolve(reports); @@ -768,7 +756,6 @@ describe('actions/Policy', () => { const reportActions: OnyxCollection = await new Promise((resolve) => { const connection = Onyx.connect({ key: ONYXKEYS.COLLECTION.REPORT_ACTIONS, - waitForCollectionCallback: true, callback: (actions) => { Onyx.disconnect(connection); resolve(actions); @@ -1046,7 +1033,6 @@ describe('actions/Policy', () => { let onboarding: OnyxEntry; await TestHelper.getOnyxData({ key: ONYXKEYS.NVP_ONBOARDING, - waitForCollectionCallback: false, callback: (val) => { onboarding = val; }, @@ -1076,7 +1062,6 @@ describe('actions/Policy', () => { await TestHelper.getOnyxData({ key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`, - waitForCollectionCallback: false, callback: (policy) => { // Then the autoReportingFrequency should be set to manually expect(policy?.autoReportingFrequency).toBe(CONST.POLICY.AUTO_REPORTING_FREQUENCIES.IMMEDIATE); @@ -1107,7 +1092,6 @@ describe('actions/Policy', () => { await TestHelper.getOnyxData({ key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`, - waitForCollectionCallback: false, callback: (policy) => { // Then the autoReportingFrequency should be set to manually expect(policy?.autoReportingFrequency).toBe(CONST.POLICY.AUTO_REPORTING_FREQUENCIES.IMMEDIATE); @@ -1139,7 +1123,6 @@ describe('actions/Policy', () => { await TestHelper.getOnyxData({ key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`, - waitForCollectionCallback: false, callback: (policy) => { // Then the workflows feature is enabled expect(policy?.areWorkflowsEnabled).toBeTruthy(); @@ -1169,7 +1152,6 @@ describe('actions/Policy', () => { await TestHelper.getOnyxData({ key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`, - waitForCollectionCallback: false, callback: (policy) => { // Then the workflows feature is enabled expect(policy?.areWorkflowsEnabled).toBeTruthy(); @@ -1199,7 +1181,6 @@ describe('actions/Policy', () => { await TestHelper.getOnyxData({ key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`, - waitForCollectionCallback: false, callback: (policy) => { // Then workflows is enabled expect(policy?.areWorkflowsEnabled).toBeTruthy(); @@ -1229,7 +1210,6 @@ describe('actions/Policy', () => { await TestHelper.getOnyxData({ key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`, - waitForCollectionCallback: false, callback: (policy) => { // Then workflows are not enabled expect(policy?.areWorkflowsEnabled).toBeFalsy(); @@ -1259,7 +1239,6 @@ describe('actions/Policy', () => { await TestHelper.getOnyxData({ key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`, - waitForCollectionCallback: false, callback: (policy) => { // Then workflows are not enabled expect(policy?.areWorkflowsEnabled).toBeFalsy(); @@ -1289,7 +1268,6 @@ describe('actions/Policy', () => { await TestHelper.getOnyxData({ key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`, - waitForCollectionCallback: false, callback: (policy) => { expect(policy?.type).toBe(CONST.POLICY.TYPE.SUBMIT); expect(policy?.role).toBe(CONST.POLICY.ROLE.EDITOR); @@ -4651,7 +4629,6 @@ describe('actions/Policy', () => { await new Promise((resolve) => { const connection = Onyx.connect({ key: `${ONYXKEYS.COLLECTION.POLICY}${fakePolicy.id}`, - waitForCollectionCallback: false, callback: (policy) => { Onyx.disconnect(connection); expect(policy?.maxExpenseAmountNoItemizedReceipt).toBe(expectedBackendAmount); @@ -4668,7 +4645,6 @@ describe('actions/Policy', () => { await new Promise((resolve) => { const connection = Onyx.connect({ key: `${ONYXKEYS.COLLECTION.POLICY}${fakePolicy.id}`, - waitForCollectionCallback: false, callback: (policy) => { Onyx.disconnect(connection); expect(policy?.pendingFields?.maxExpenseAmountNoItemizedReceipt).toBeFalsy(); @@ -4692,7 +4668,6 @@ describe('actions/Policy', () => { await new Promise((resolve) => { const connection = Onyx.connect({ key: `${ONYXKEYS.COLLECTION.POLICY}${fakePolicy.id}`, - waitForCollectionCallback: false, callback: (policy) => { Onyx.disconnect(connection); expect(policy?.maxExpenseAmountNoItemizedReceipt).toBe(CONST.DISABLED_MAX_EXPENSE_VALUE); diff --git a/tests/actions/QueuedOnyxUpdatesTest.ts b/tests/actions/QueuedOnyxUpdatesTest.ts index 5a7190f42945..1db73decaa81 100644 --- a/tests/actions/QueuedOnyxUpdatesTest.ts +++ b/tests/actions/QueuedOnyxUpdatesTest.ts @@ -69,7 +69,6 @@ async function testOnyxKeyValue(key: OnyxKey): Promise { return new Promise((resolve) => { const connection = Onyx.connect({ key, - waitForCollectionCallback: false, callback: (value) => { Onyx.disconnect(connection); @@ -111,7 +110,6 @@ describe('actions/QueuedOnyxUpdates', () => { await new Promise((resolve) => { const connection = Onyx.connect({ key: `${ONYXKEYS.COLLECTION.REPORT}2175919089355165`, - waitForCollectionCallback: false, callback: (report) => { Onyx.disconnect(connection); expect(report).toBeUndefined(); @@ -124,7 +122,6 @@ describe('actions/QueuedOnyxUpdates', () => { await new Promise((resolve) => { const connection = Onyx.connect({ key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}2175919089355165`, - waitForCollectionCallback: false, callback: (report) => { Onyx.disconnect(connection); expect(report).toBeUndefined(); @@ -156,7 +153,6 @@ describe('actions/QueuedOnyxUpdates', () => { await new Promise((resolve) => { const connection = Onyx.connect({ key: `${ONYXKEYS.COLLECTION.REPORT}2175919089355165`, - waitForCollectionCallback: false, callback: (report) => { Onyx.disconnect(connection); expect(report).toEqual(getOnyxUpdateValue(`${ONYXKEYS.COLLECTION.REPORT}2175919089355165`)); @@ -169,7 +165,6 @@ describe('actions/QueuedOnyxUpdates', () => { await new Promise((resolve) => { const connection = Onyx.connect({ key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}2175919089355165`, - waitForCollectionCallback: false, callback: (reportActions) => { Onyx.disconnect(connection); expect(reportActions).toEqual(getOnyxUpdateValue(`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}2175919089355165`)); diff --git a/tests/actions/ReportTest.ts b/tests/actions/ReportTest.ts index 3eae033bbf22..8d83558e1929 100644 --- a/tests/actions/ReportTest.ts +++ b/tests/actions/ReportTest.ts @@ -945,7 +945,7 @@ describe('actions/Report', () => { key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${REPORT_ID}`, callback: (val) => (reportActions = val ?? {}), }); - let reportActionsReactions: OnyxCollection = {}; + let reportActionsReactions: NonNullable> = {}; Onyx.connect({ key: ONYXKEYS.COLLECTION.REPORT_ACTIONS_REACTIONS, callback: (snapshot) => { @@ -1083,7 +1083,7 @@ describe('actions/Report', () => { key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${REPORT_ID}`, callback: (val) => (reportActions = val ?? {}), }); - let reportActionsReactions: OnyxCollection = {}; + let reportActionsReactions: NonNullable> = {}; Onyx.connect({ key: ONYXKEYS.COLLECTION.REPORT_ACTIONS_REACTIONS, callback: (snapshot) => { @@ -2569,7 +2569,6 @@ describe('actions/Report', () => { await new Promise((resolve) => { const connection = Onyx.connect({ key: ONYXKEYS.COLLECTION.REPORT, - waitForCollectionCallback: true, callback: (reports) => { Onyx.disconnect(connection); const createdReport = reports?.[`${ONYXKEYS.COLLECTION.REPORT}${reportID}`]; @@ -2594,7 +2593,6 @@ describe('actions/Report', () => { await new Promise((resolve) => { const connection = Onyx.connect({ key: ONYXKEYS.COLLECTION.REPORT, - waitForCollectionCallback: true, callback: (reports) => { Onyx.disconnect(connection); const parentPolicyExpenseChat = reports?.[`${ONYXKEYS.COLLECTION.REPORT}${parentReport?.reportID}`]; @@ -2665,7 +2663,6 @@ describe('actions/Report', () => { await new Promise((resolve) => { const connection = Onyx.connect({ key: ONYXKEYS.COLLECTION.REPORT, - waitForCollectionCallback: true, callback: (reports) => { Onyx.disconnect(connection); const parentPolicyExpenseChat = reports?.[`${ONYXKEYS.COLLECTION.REPORT}${parentReport?.reportID}`]; diff --git a/tests/actions/TransactionTest.ts b/tests/actions/TransactionTest.ts index aa5696bf54e8..3b7744e61b85 100644 --- a/tests/actions/TransactionTest.ts +++ b/tests/actions/TransactionTest.ts @@ -223,7 +223,6 @@ describe('actions/Transaction', () => { }); await getOnyxData({ key: ONYXKEYS.COLLECTION.TRANSACTION, - waitForCollectionCallback: true, callback: (transactions) => { transaction = Object.values(transactions ?? {}).find((t) => !!t); allTransactions = transactions; @@ -232,7 +231,6 @@ describe('actions/Transaction', () => { await getOnyxData({ key: ONYXKEYS.COLLECTION.REPORT, - waitForCollectionCallback: true, callback: (allReports) => { expenseReport = Object.values(allReports ?? {}).find((r) => r?.type === CONST.REPORT.TYPE.EXPENSE); }, @@ -243,7 +241,6 @@ describe('actions/Transaction', () => { await getOnyxData({ key: ONYXKEYS.COLLECTION.REPORT_ACTIONS, - waitForCollectionCallback: true, callback: (allReportActions) => { iouReportActionOnSelfDMReport = Object.values(allReportActions?.[`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${selfDMReport.reportID}`] ?? {}).find( (r) => r?.actionName === CONST.REPORT.ACTIONS.TYPE.IOU, @@ -290,7 +287,6 @@ describe('actions/Transaction', () => { await getOnyxData({ key: ONYXKEYS.COLLECTION.TRANSACTION, - waitForCollectionCallback: true, callback: (transactions) => { updatedTransaction = Object.values(transactions ?? {}).find((t) => t?.transactionID === transaction?.transactionID); }, @@ -298,7 +294,6 @@ describe('actions/Transaction', () => { await getOnyxData({ key: ONYXKEYS.COLLECTION.REPORT_ACTIONS, - waitForCollectionCallback: true, callback: (allReportActions) => { updatedIOUReportActionOnSelfDMReport = Object.values(allReportActions?.[`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${selfDMReport.reportID}`] ?? {}).find( (r) => r?.actionName === CONST.REPORT.ACTIONS.TYPE.IOU, @@ -311,7 +306,6 @@ describe('actions/Transaction', () => { await getOnyxData({ key: ONYXKEYS.COLLECTION.REPORT, - waitForCollectionCallback: true, callback: (allReports) => { updatedExpenseReport = Object.values(allReports ?? {}).find((r) => r?.reportID === expenseReport?.reportID); }, @@ -354,7 +348,6 @@ describe('actions/Transaction', () => { await waitForBatchedUpdates(); await getOnyxData({ key: ONYXKEYS.COLLECTION.REPORT, - waitForCollectionCallback: true, callback: (allReports) => { chatReport = Object.values(allReports ?? {}).find((report) => report?.chatType === CONST.REPORT.CHAT_TYPE.POLICY_EXPENSE_CHAT); }, @@ -390,14 +383,12 @@ describe('actions/Transaction', () => { await waitForBatchedUpdates(); await getOnyxData({ key: ONYXKEYS.COLLECTION.REPORT, - waitForCollectionCallback: true, callback: (allReports) => { expenseReport = Object.values(allReports ?? {}).find((report) => report?.type === CONST.REPORT.TYPE.EXPENSE); }, }); await getOnyxData({ key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${expenseReport?.reportID}`, - waitForCollectionCallback: false, callback: (allReportsAction) => { const iouActions = Object.values(allReportsAction ?? {}).filter((reportAction): reportAction is ReportAction => isMoneyRequestAction(reportAction), @@ -442,21 +433,18 @@ describe('actions/Transaction', () => { let allReportNameValuePairs: OnyxCollection; await getOnyxData({ key: ONYXKEYS.COLLECTION.TRANSACTION, - waitForCollectionCallback: true, callback: (value) => { allTransactions = value; }, }); await getOnyxData({ key: ONYXKEYS.COLLECTION.REPORT, - waitForCollectionCallback: true, callback: (value) => { allReports = value; }, }); await getOnyxData({ key: ONYXKEYS.COLLECTION.REPORT_NAME_VALUE_PAIRS, - waitForCollectionCallback: true, callback: (value) => { allReportNameValuePairs = value; }, @@ -533,7 +521,6 @@ describe('actions/Transaction', () => { await waitForBatchedUpdates(); await getOnyxData({ key: ONYXKEYS.COLLECTION.REPORT, - waitForCollectionCallback: true, callback: (allReports) => { chatReport = Object.values(allReports ?? {}).find((report) => report?.chatType === CONST.REPORT.CHAT_TYPE.POLICY_EXPENSE_CHAT); }, @@ -569,14 +556,12 @@ describe('actions/Transaction', () => { await waitForBatchedUpdates(); await getOnyxData({ key: ONYXKEYS.COLLECTION.REPORT, - waitForCollectionCallback: true, callback: (allReports) => { expenseReport = Object.values(allReports ?? {}).find((report) => report?.type === CONST.REPORT.TYPE.EXPENSE); }, }); await getOnyxData({ key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${expenseReport?.reportID}`, - waitForCollectionCallback: false, callback: (allReportsAction) => { const iouActions = Object.values(allReportsAction ?? {}).filter((reportAction): reportAction is ReportAction => isMoneyRequestAction(reportAction), @@ -621,21 +606,18 @@ describe('actions/Transaction', () => { let allReportNameValuePairs: OnyxCollection; await getOnyxData({ key: ONYXKEYS.COLLECTION.TRANSACTION, - waitForCollectionCallback: true, callback: (value) => { allTransactions = value; }, }); await getOnyxData({ key: ONYXKEYS.COLLECTION.REPORT, - waitForCollectionCallback: true, callback: (value) => { allReports = value; }, }); await getOnyxData({ key: ONYXKEYS.COLLECTION.REPORT_NAME_VALUE_PAIRS, - waitForCollectionCallback: true, callback: (value) => { allReportNameValuePairs = value; }, @@ -716,7 +698,6 @@ describe('actions/Transaction', () => { await getOnyxData({ key: ONYXKEYS.COLLECTION.REPORT, - waitForCollectionCallback: true, callback: (allReports) => { chatReport = Object.values(allReports ?? {}).find((report) => report?.chatType === CONST.REPORT.CHAT_TYPE.POLICY_EXPENSE_CHAT); }, @@ -754,7 +735,6 @@ describe('actions/Transaction', () => { await getOnyxData({ key: ONYXKEYS.COLLECTION.REPORT, - waitForCollectionCallback: true, callback: (allReports) => { expenseReport = Object.values(allReports ?? {}).find((report) => report?.type === CONST.REPORT.TYPE.EXPENSE); }, @@ -762,7 +742,6 @@ describe('actions/Transaction', () => { await getOnyxData({ key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${expenseReport?.reportID}`, - waitForCollectionCallback: false, callback: (allReportsAction) => { const iouActions = Object.values(allReportsAction ?? {}).filter((reportAction): reportAction is ReportAction => isMoneyRequestAction(reportAction), @@ -813,21 +792,18 @@ describe('actions/Transaction', () => { await getOnyxData({ key: ONYXKEYS.COLLECTION.TRANSACTION, - waitForCollectionCallback: true, callback: (value) => { allTransactions = value; }, }); await getOnyxData({ key: ONYXKEYS.COLLECTION.REPORT, - waitForCollectionCallback: true, callback: (value) => { allReports = value; }, }); await getOnyxData({ key: ONYXKEYS.COLLECTION.REPORT_NAME_VALUE_PAIRS, - waitForCollectionCallback: true, callback: (value) => { allReportNameValuePairs = value; }, @@ -909,7 +885,6 @@ describe('actions/Transaction', () => { await getOnyxData({ key: ONYXKEYS.COLLECTION.REPORT, - waitForCollectionCallback: true, callback: (allReports) => { chatReport = Object.values(allReports ?? {}).find((report) => report?.chatType === CONST.REPORT.CHAT_TYPE.POLICY_EXPENSE_CHAT); }, @@ -948,7 +923,6 @@ describe('actions/Transaction', () => { await getOnyxData({ key: ONYXKEYS.COLLECTION.REPORT, - waitForCollectionCallback: true, callback: (allReports) => { expenseReport = Object.values(allReports ?? {}).find((report) => report?.type === CONST.REPORT.TYPE.EXPENSE); }, @@ -957,7 +931,6 @@ describe('actions/Transaction', () => { // Get the original transaction ID and transaction thread report ID await getOnyxData({ key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${expenseReport?.reportID}`, - waitForCollectionCallback: false, callback: (allReportsAction) => { const iouActions = Object.values(allReportsAction ?? {}).filter((reportAction): reportAction is ReportAction => isMoneyRequestAction(reportAction), @@ -983,7 +956,6 @@ describe('actions/Transaction', () => { let firstIOU: ReportAction | undefined; await getOnyxData({ key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${expenseReport?.reportID}`, - waitForCollectionCallback: false, callback: (allReportsAction) => { const iouActions = Object.values(allReportsAction ?? {}).filter((reportAction): reportAction is ReportAction => isMoneyRequestAction(reportAction), @@ -1029,21 +1001,18 @@ describe('actions/Transaction', () => { await getOnyxData({ key: ONYXKEYS.COLLECTION.TRANSACTION, - waitForCollectionCallback: true, callback: (value) => { allTransactions = value; }, }); await getOnyxData({ key: ONYXKEYS.COLLECTION.REPORT, - waitForCollectionCallback: true, callback: (value) => { allReports = value; }, }); await getOnyxData({ key: ONYXKEYS.COLLECTION.REPORT_NAME_VALUE_PAIRS, - waitForCollectionCallback: true, callback: (value) => { allReportNameValuePairs = value; }, @@ -1101,7 +1070,6 @@ describe('actions/Transaction', () => { await getOnyxData({ key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${expenseReport?.reportID}`, - waitForCollectionCallback: false, callback: (allReportsAction) => { const iouActions = Object.values(allReportsAction ?? {}).filter((reportAction): reportAction is ReportAction => isMoneyRequestAction(reportAction), diff --git a/tests/unit/DistanceRateTest.ts b/tests/unit/DistanceRateTest.ts index 13a549e20181..3dc4e9520f22 100644 --- a/tests/unit/DistanceRateTest.ts +++ b/tests/unit/DistanceRateTest.ts @@ -85,7 +85,6 @@ describe('DistanceRate', () => { Onyx.connect({ key: ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS, callback: resolve, - waitForCollectionCallback: true, }); }); diff --git a/tests/unit/OptionsListUtilsTest.tsx b/tests/unit/OptionsListUtilsTest.tsx index 02aaacaff4f4..e720f65645eb 100644 --- a/tests/unit/OptionsListUtilsTest.tsx +++ b/tests/unit/OptionsListUtilsTest.tsx @@ -6081,7 +6081,6 @@ describe('OptionsListUtils', () => { let reportNameValuePair: OnyxEntry; Onyx.connect({ key: `${ONYXKEYS.COLLECTION.REPORT_NAME_VALUE_PAIRS}${participant.reportID}`, - waitForCollectionCallback: false, callback: (value) => { reportNameValuePair = value; }, @@ -6121,7 +6120,6 @@ describe('OptionsListUtils', () => { let reportNameValuePair: OnyxEntry; Onyx.connect({ key: `${ONYXKEYS.COLLECTION.REPORT_NAME_VALUE_PAIRS}${participant.reportID}`, - waitForCollectionCallback: false, callback: (value) => { reportNameValuePair = value; }, diff --git a/tests/utils/getOnyxValue.ts b/tests/utils/getOnyxValue.ts index 59f5f22d627d..e653780b31db 100644 --- a/tests/utils/getOnyxValue.ts +++ b/tests/utils/getOnyxValue.ts @@ -5,7 +5,7 @@ export default function getOnyxValue(key: TKey): Promise { Onyx.connect({ key, - callback: (value) => resolve(value), + callback: (value) => resolve(value as OnyxEntry), }); }); } From 4b9ab270849024bae7b3f2fae1be9d9601da94c8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?F=C3=A1bio=20Henriques?= Date: Mon, 15 Jun 2026 11:25:08 +0100 Subject: [PATCH 06/10] Fix lint error --- tests/utils/getOnyxValue.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/utils/getOnyxValue.ts b/tests/utils/getOnyxValue.ts index e653780b31db..f852c2fe3171 100644 --- a/tests/utils/getOnyxValue.ts +++ b/tests/utils/getOnyxValue.ts @@ -1,11 +1,11 @@ import Onyx from 'react-native-onyx'; -import type {KeyValueMapping, OnyxEntry, OnyxKey} from 'react-native-onyx'; +import type {OnyxKey, OnyxValue} from 'react-native-onyx'; -export default function getOnyxValue(key: TKey): Promise> { +export default function getOnyxValue(key: TKey): Promise> { return new Promise((resolve) => { Onyx.connect({ key, - callback: (value) => resolve(value as OnyxEntry), + callback: (value) => resolve(value), }); }); } From d29d95a4b570701e293a7b5698030a08f43c5a24 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?F=C3=A1bio=20Henriques?= Date: Wed, 24 Jun 2026 14:34:19 +0100 Subject: [PATCH 07/10] Cleanup --- src/libs/actions/Report/index.ts | 30 ++++++------------- src/libs/actions/Transaction.ts | 19 ++++-------- ...replaceOptimisticReportWithActualReport.ts | 19 +++--------- 3 files changed, 18 insertions(+), 50 deletions(-) diff --git a/src/libs/actions/Report/index.ts b/src/libs/actions/Report/index.ts index 2e1692ae6238..eae569d2c547 100644 --- a/src/libs/actions/Report/index.ts +++ b/src/libs/actions/Report/index.ts @@ -402,7 +402,6 @@ type AddAttachmentWithCommentParams = { }; const addNewMessageWithText = new Set([WRITE_COMMANDS.ADD_COMMENT, WRITE_COMMANDS.ADD_TEXT_AND_ATTACHMENT]); -// map of reportID to all reportActions for that report let allReportActions: OnyxCollection = {}; const STALE_DM_RECOVERY_TARGET_TTL_MS = 30000; const staleDMRecoveryTargetBySourceReportID: Record = {}; @@ -454,19 +453,8 @@ function clearStaleDMRecoveryTargetByTargetReportID(targetReportID: string) { Onyx.connect({ key: ONYXKEYS.COLLECTION.REPORT_ACTIONS, - callback: (snapshot) => { - if (!snapshot) { - allReportActions = {}; - return; - } - // Rebuild the rawID-keyed view from the prefixed-key snapshot. Each value - // shares its reference with the snapshot, so downstream consumers still - // benefit from structural-sharing ref-stability for unchanged members. - const next: OnyxCollection = {}; - for (const [k, v] of Object.entries(snapshot)) { - next[k.replace(ONYXKEYS.COLLECTION.REPORT_ACTIONS, '')] = v; - } - allReportActions = next; + callback: (value) => { + allReportActions = value ?? {}; }, }); @@ -1178,7 +1166,7 @@ function addComment({ } function reportActionsExist(reportID: string): boolean { - return allReportActions?.[reportID] !== undefined; + return allReportActions?.[`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${reportID}`] !== undefined; } function updateChatName(reportID: string, oldReportName: string | undefined, reportName: string, type: typeof CONST.REPORT.CHAT_TYPE.GROUP | typeof CONST.REPORT.CHAT_TYPE.TRIP_ROOM) { @@ -2996,7 +2984,7 @@ function deleteReportComment( // We prefer the actions passed directly from the calling component (currentReportActionsParam) // since those come from useOnyx and are guaranteed to be up to date. We fall back to the // module-level allReportActions cache. - const reportActionsForReport = currentReportActionsParam ?? allReportActions?.[originalReportID] ?? {}; + const reportActionsForReport = currentReportActionsParam ?? allReportActions?.[`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${originalReportID}`] ?? {}; const unresolvedMentionWhisperIDs: string[] = []; const mentionWhisperID = String(BigInt(reportActionID) + 1n); @@ -3051,7 +3039,7 @@ function deleteReportComment( const didCommentMentionCurrentUser = ReportActionsUtils.didMessageMentionCurrentUser(reportAction, currentEmail); if (didCommentMentionCurrentUser && reportAction.created === report?.lastMentionedTime) { - const reportActionsForReportID = allReportActions?.[reportID]; + const reportActionsForReportID = allReportActions?.[`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${reportID}`]; const latestMentionedReportAction = Object.values(reportActionsForReportID ?? {}).find( (action) => action.reportActionID !== reportAction.reportActionID && @@ -4587,7 +4575,7 @@ function shouldShowReportActionNotification(reportID: string, currentUserAccount // If the report is a transaction thread and we are currently viewing the associated one-transaction report do no show a notification. const topmostReport = allReports?.[`${ONYXKEYS.COLLECTION.REPORT}${topmostReportID}`]; - const topmostReportActions = allReportActions?.[`${topmostReport?.reportID}`]; + const topmostReportActions = allReportActions?.[`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${topmostReport?.reportID}`]; const chatTopmostReport = allReports?.[`${ONYXKEYS.COLLECTION.REPORT}${topmostReport?.chatReportID}`]; if (reportID === ReportActionsUtils.getOneTransactionThreadReportID(topmostReport, chatTopmostReport, topmostReportActions) && Visibility.isVisible() && Visibility.hasFocus()) { Log.info(`${tag} No notification because the report is a transaction thread associated with the current one-transaction report`); @@ -6279,7 +6267,7 @@ function deleteAppReport({ } // 1. Get all report transactions - const reportActionsForReport = allReportActions?.[reportID]; + const reportActionsForReport = allReportActions?.[`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${reportID}`]; const transactionIDToReportActionAndThreadData: Record = {}; for (const reportAction of Object.values(reportActionsForReport ?? {})) { @@ -6489,7 +6477,7 @@ function deleteAppReport({ // 8. Mark chat report preview action as deleted const reportActionID = report?.parentReportActionID; const parentReportID = report?.parentReportID; - const parentReportAction = parentReportID && reportActionID ? allReportActions?.[parentReportID]?.[reportActionID] : undefined; + const parentReportAction = parentReportID && reportActionID ? allReportActions?.[`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${parentReportID}`]?.[reportActionID] : undefined; if (reportActionID) { optimisticData.push({ @@ -6850,7 +6838,7 @@ function convertIOUReportToExpenseReport(iouReport: Report, policy: Policy, poli // We need to move the report preview action from the DM to the expense chat. const oldChatReportID = iouReport.chatReportID; const reportPreviewActionID = iouReport.parentReportActionID; - const reportPreview = !!oldChatReportID && !!reportPreviewActionID ? allReportActions?.[oldChatReportID]?.[reportPreviewActionID] : undefined; + const reportPreview = !!oldChatReportID && !!reportPreviewActionID ? allReportActions?.[`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${oldChatReportID}`]?.[reportPreviewActionID] : undefined; if (reportPreview?.reportActionID) { optimisticData.push({ diff --git a/src/libs/actions/Transaction.ts b/src/libs/actions/Transaction.ts index ba24317b0f74..6d06a47a33b4 100644 --- a/src/libs/actions/Transaction.ts +++ b/src/libs/actions/Transaction.ts @@ -97,17 +97,8 @@ Onyx.connect({ let allTransactionViolations: OnyxCollection = {}; Onyx.connect({ key: ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS, - callback: (snapshot) => { - if (!snapshot) { - allTransactionViolations = {}; - return; - } - // Rebuild the transactionID-keyed view from the prefixed-key snapshot. - const next: OnyxCollection = {}; - for (const [k, v] of Object.entries(snapshot)) { - next[k.replace(ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS, '')] = v; - } - allTransactionViolations = next; + callback: (value) => { + allTransactionViolations = value ?? {}; }, }); @@ -1173,9 +1164,9 @@ function changeTransactionsReport({ onyxMethod: Onyx.METHOD.SET, key: `${ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS}${id}`, // For each duplicate, write its own violations minus the DUPLICATED_TRANSACTION marker. - // Previously this read a stale `allTransactionViolations` flat-array that held only - // the last-fired per-member value (latent bug, now removed alongside per-member dispatch). - value: (allTransactionViolations?.[id] ?? []).filter((violation: TransactionViolation) => violation.name !== CONST.VIOLATIONS.DUPLICATED_TRANSACTION), + value: (allTransactionViolations?.[`${ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS}${id}`] ?? []).filter( + (violation: TransactionViolation) => violation.name !== CONST.VIOLATIONS.DUPLICATED_TRANSACTION, + ), }); } } diff --git a/src/libs/actions/replaceOptimisticReportWithActualReport.ts b/src/libs/actions/replaceOptimisticReportWithActualReport.ts index e0f8d3a34f2f..1ae5735ad50d 100644 --- a/src/libs/actions/replaceOptimisticReportWithActualReport.ts +++ b/src/libs/actions/replaceOptimisticReportWithActualReport.ts @@ -46,19 +46,8 @@ let allReportActions: OnyxCollection = {}; // Report actions are cached only to resolve parent actions for IOU cleanup; no UI subscribes, so connectWithoutView() is used. Onyx.connectWithoutView({ key: ONYXKEYS.COLLECTION.REPORT_ACTIONS, - callback: (snapshot) => { - if (!snapshot) { - allReportActions = {}; - return; - } - // Rebuild the rawID-keyed view from the prefixed-key snapshot. Each value - // shares its reference with the snapshot, preserving structural-sharing - // ref-stability for unchanged members. - const next: OnyxCollection = {}; - for (const [k, v] of Object.entries(snapshot)) { - next[k.replace(ONYXKEYS.COLLECTION.REPORT_ACTIONS, '')] = v; - } - allReportActions = next; + callback: (value) => { + allReportActions = value ?? {}; }, }); @@ -81,7 +70,7 @@ function replaceOptimisticReportWithActualReport(report: Report, draftReportComm // If an optimistic IOU action was created before we knew a preexisting IOU action for the thread existed, // remove it to avoid duplicate IOU report actions if (isMoneyRequest(report) && parentReportID && parentReportActionID) { - const parentReportAction = allReportActions?.[parentReportID]?.[parentReportActionID]; + const parentReportAction = allReportActions?.[`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${parentReportID}`]?.[parentReportActionID]; if (parentReportAction?.isOptimisticAction) { Onyx.merge(`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${parentReportID}`, { [parentReportActionID]: null, @@ -119,7 +108,7 @@ function replaceOptimisticReportWithActualReport(report: Report, draftReportComm }); // Non-optimistic parent actions already exist, so we update their childReportID; // optimistic actions were already cleaned up above - const parentReportAction = parentReportID ? allReportActions?.[parentReportID]?.[parentReportActionID] : null; + const parentReportAction = parentReportID ? allReportActions?.[`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${parentReportID}`]?.[parentReportActionID] : null; if (parentReportAction && !parentReportAction.isOptimisticAction) { Onyx.merge(`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${parentReportID}`, { [parentReportActionID]: {childReportID: preexistingReportID}, From 946d782629fc17d8211a7b33ffdb849b5400cdb0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?F=C3=A1bio=20Henriques?= Date: Fri, 26 Jun 2026 11:13:37 +0100 Subject: [PATCH 08/10] Use newest Onyx changes --- 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 754464cff653..60a23e12551c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -121,7 +121,7 @@ "react-native-localize": "^3.5.4", "react-native-nitro-modules": "0.35.0", "react-native-nitro-sqlite": "9.6.0", - "react-native-onyx": "git+https://github.com/Expensify/react-native-onyx.git#01704211bf9363641843f2ecb826bc0633fdce07", + "react-native-onyx": "git+https://github.com/Expensify/react-native-onyx.git#9263ec964d232a37cf54801e1144545f75652279", "react-native-pager-view": "8.0.0", "react-native-pdf": "7.0.2", "react-native-permissions": "^5.4.0", @@ -36030,9 +36030,9 @@ } }, "node_modules/react-native-onyx": { - "version": "3.0.86", - "resolved": "git+ssh://git@github.com/Expensify/react-native-onyx.git#01704211bf9363641843f2ecb826bc0633fdce07", - "integrity": "sha512-OLmcVyXow+O6PbHZ0YvEisw/1cDSiJ9xuMbytQzVDF77cM03CN8p8cF+orRFT1MNSNZ6Jt50giQpFbJCW9XLvA==", + "version": "3.0.87", + "resolved": "git+ssh://git@github.com/Expensify/react-native-onyx.git#9263ec964d232a37cf54801e1144545f75652279", + "integrity": "sha512-jkdxRseDzwtK+QjTp0DmCsa8iz2li3fxQimqJvQoSrgbGBFi5aQSCzi+IejYX6qnwS8iwCMbOC+G1lHo/L0epg==", "license": "MIT", "dependencies": { "ascii-table": "0.0.9", diff --git a/package.json b/package.json index f9d9e37ac790..673876fe7d8f 100644 --- a/package.json +++ b/package.json @@ -195,7 +195,7 @@ "react-native-localize": "^3.5.4", "react-native-nitro-modules": "0.35.0", "react-native-nitro-sqlite": "9.6.0", - "react-native-onyx": "git+https://github.com/Expensify/react-native-onyx.git#01704211bf9363641843f2ecb826bc0633fdce07", + "react-native-onyx": "git+https://github.com/Expensify/react-native-onyx.git#9263ec964d232a37cf54801e1144545f75652279", "react-native-pager-view": "8.0.0", "react-native-pdf": "7.0.2", "react-native-permissions": "^5.4.0", From 18e015e0a5a12c1d26b219037d64e5187206cfd4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?F=C3=A1bio=20Henriques?= Date: Fri, 26 Jun 2026 11:28:39 +0100 Subject: [PATCH 09/10] Use newest Onyx changes --- package-lock.json | 6 +++--- package.json | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package-lock.json b/package-lock.json index 60a23e12551c..adba29e13fab 100644 --- a/package-lock.json +++ b/package-lock.json @@ -121,7 +121,7 @@ "react-native-localize": "^3.5.4", "react-native-nitro-modules": "0.35.0", "react-native-nitro-sqlite": "9.6.0", - "react-native-onyx": "git+https://github.com/Expensify/react-native-onyx.git#9263ec964d232a37cf54801e1144545f75652279", + "react-native-onyx": "git+https://github.com/Expensify/react-native-onyx.git#3da566e848c048935ce047b948e52f4dae29991e", "react-native-pager-view": "8.0.0", "react-native-pdf": "7.0.2", "react-native-permissions": "^5.4.0", @@ -36031,8 +36031,8 @@ }, "node_modules/react-native-onyx": { "version": "3.0.87", - "resolved": "git+ssh://git@github.com/Expensify/react-native-onyx.git#9263ec964d232a37cf54801e1144545f75652279", - "integrity": "sha512-jkdxRseDzwtK+QjTp0DmCsa8iz2li3fxQimqJvQoSrgbGBFi5aQSCzi+IejYX6qnwS8iwCMbOC+G1lHo/L0epg==", + "resolved": "git+ssh://git@github.com/Expensify/react-native-onyx.git#3da566e848c048935ce047b948e52f4dae29991e", + "integrity": "sha512-DqJWIUnzMS8ndjny6CdbB9ESp2HEt2vd/FBXVXipPXv+n4Uy087p54Vz4IrzLlQQEZTicCXvaqnsjt8fIL6uJQ==", "license": "MIT", "dependencies": { "ascii-table": "0.0.9", diff --git a/package.json b/package.json index 673876fe7d8f..3c04310545b4 100644 --- a/package.json +++ b/package.json @@ -195,7 +195,7 @@ "react-native-localize": "^3.5.4", "react-native-nitro-modules": "0.35.0", "react-native-nitro-sqlite": "9.6.0", - "react-native-onyx": "git+https://github.com/Expensify/react-native-onyx.git#9263ec964d232a37cf54801e1144545f75652279", + "react-native-onyx": "git+https://github.com/Expensify/react-native-onyx.git#3da566e848c048935ce047b948e52f4dae29991e", "react-native-pager-view": "8.0.0", "react-native-pdf": "7.0.2", "react-native-permissions": "^5.4.0", From 19dffd8c6b08aa348e22a1442598a3016b9148b8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?F=C3=A1bio=20Henriques?= Date: Mon, 29 Jun 2026 11:40:27 +0100 Subject: [PATCH 10/10] Use newest Onyx changes --- 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 43192d8ef42a..fe681007ceaa 100644 --- a/package-lock.json +++ b/package-lock.json @@ -121,7 +121,7 @@ "react-native-localize": "^3.5.4", "react-native-nitro-modules": "0.35.0", "react-native-nitro-sqlite": "9.6.0", - "react-native-onyx": "git+https://github.com/Expensify/react-native-onyx.git#3da566e848c048935ce047b948e52f4dae29991e", + "react-native-onyx": "git+https://github.com/Expensify/react-native-onyx.git#721d95bbd9547d35e651e3ba6f3fd596c4595733", "react-native-pager-view": "8.0.0", "react-native-pdf": "7.0.2", "react-native-permissions": "^5.4.0", @@ -36030,9 +36030,9 @@ } }, "node_modules/react-native-onyx": { - "version": "3.0.87", - "resolved": "git+ssh://git@github.com/Expensify/react-native-onyx.git#3da566e848c048935ce047b948e52f4dae29991e", - "integrity": "sha512-DqJWIUnzMS8ndjny6CdbB9ESp2HEt2vd/FBXVXipPXv+n4Uy087p54Vz4IrzLlQQEZTicCXvaqnsjt8fIL6uJQ==", + "version": "3.0.88", + "resolved": "git+ssh://git@github.com/Expensify/react-native-onyx.git#721d95bbd9547d35e651e3ba6f3fd596c4595733", + "integrity": "sha512-ee8tudCkN5lVE4akP3DSYTRS8I730tlt3xYH48Vrbu9v15TzTUYy3F85nzwLj0Ng3kHnx6zfpvNiXTmWbwHA5Q==", "license": "MIT", "dependencies": { "ascii-table": "0.0.9", diff --git a/package.json b/package.json index 5380b6c0e84b..df7518bfc769 100644 --- a/package.json +++ b/package.json @@ -195,7 +195,7 @@ "react-native-localize": "^3.5.4", "react-native-nitro-modules": "0.35.0", "react-native-nitro-sqlite": "9.6.0", - "react-native-onyx": "git+https://github.com/Expensify/react-native-onyx.git#3da566e848c048935ce047b948e52f4dae29991e", + "react-native-onyx": "git+https://github.com/Expensify/react-native-onyx.git#721d95bbd9547d35e651e3ba6f3fd596c4595733", "react-native-pager-view": "8.0.0", "react-native-pdf": "7.0.2", "react-native-permissions": "^5.4.0",