Bump Onyx

README.md

@@ -414,14 +414,14 @@ Different platforms come with varying storage capacities and Onyx has a way to g
 By default, Onyx will not evict anything from storage and will presume all keys are "unsafe" to remove unless explicitly told otherwise.
 
 **To flag a key as safe for removal:**
-- Add the key to the `safeEvictionKeys` option in `Onyx.init(options)`
+- Add the key to the `evictableKeys` option in `Onyx.init(options)`
 - Implement `canEvict` in the Onyx config for each component subscribing to a key
 - The key will only be deleted when all subscribers return `true` for `canEvict`
 
 e.g.
 ```js
 Onyx.init({
-    safeEvictionKeys: [ONYXKEYS.COLLECTION.REPORT_ACTIONS],
+    evictableKeys: [ONYXKEYS.COLLECTION.REPORT_ACTIONS],
 });
 ```
 

package.json

@@ -174,7 +174,7 @@
     "react-native-launch-arguments": "^4.0.2",
     "react-native-localize": "^2.2.6",
     "react-native-modal": "^13.0.0",
-    "react-native-onyx": "2.0.102",
+    "react-native-onyx": "^2.0.104",
     "react-native-pager-view": "6.5.2",
     "react-native-pdf": "6.7.3",
     "react-native-performance": "^5.1.0",

src/setup/index.ts

@@ -28,7 +28,13 @@ export default function () {
 
         // Increase the cached key count so that the app works more consistently for accounts with large numbers of reports
         maxCachedKeysCount: 50000,
-        safeEvictionKeys: [ONYXKEYS.COLLECTION.REPORT_ACTIONS, ONYXKEYS.COLLECTION.SNAPSHOT],
+        evictableKeys: [
+            ONYXKEYS.COLLECTION.REPORT_ACTIONS,
+            ONYXKEYS.COLLECTION.SNAPSHOT,
+            ONYXKEYS.COLLECTION.REPORT_ACTIONS_DRAFTS,
+            ONYXKEYS.COLLECTION.REPORT_ACTIONS_PAGES,
+            ONYXKEYS.COLLECTION.REPORT_ACTIONS_REACTIONS,
+        ],
         initialKeyStates: {
             // Clear any loading and error messages so they do not appear on app startup
             [ONYXKEYS.SESSION]: {loading: false},

tests/perf-test/ModifiedExpenseMessage.perf-test.ts

@@ -14,7 +14,7 @@ import waitForBatchedUpdates from '../utils/waitForBatchedUpdates';
 beforeAll(() =>
     Onyx.init({
         keys: ONYXKEYS,
-        safeEvictionKeys: [ONYXKEYS.COLLECTION.REPORT_ACTIONS],
+        evictableKeys: [ONYXKEYS.COLLECTION.REPORT_ACTIONS],
     }),
 );
 

tests/perf-test/ReportActionCompose.perf-test.tsx

@@ -61,7 +61,7 @@ jest.mock('@components/ConfirmedRoute.tsx');
 beforeAll(() =>
     Onyx.init({
         keys: ONYXKEYS,
-        safeEvictionKeys: [ONYXKEYS.COLLECTION.REPORT_ACTIONS],
+        evictableKeys: [ONYXKEYS.COLLECTION.REPORT_ACTIONS],
     }),
 );
 

tests/perf-test/ReportActionsList.perf-test.tsx

@@ -73,7 +73,7 @@ jest.mock('@src/components/ConfirmedRoute.tsx');
 beforeAll(() =>
     Onyx.init({
         keys: ONYXKEYS,
-        safeEvictionKeys: [ONYXKEYS.COLLECTION.REPORT_ACTIONS],
+        evictableKeys: [ONYXKEYS.COLLECTION.REPORT_ACTIONS],
     }),
 );
 

tests/perf-test/ReportActionsUtils.perf-test.ts

@@ -39,7 +39,7 @@ describe('ReportActionsUtils', () => {
     beforeAll(() => {
         Onyx.init({
             keys: ONYXKEYS,
-            safeEvictionKeys: [ONYXKEYS.COLLECTION.REPORT_ACTIONS],
+            evictableKeys: [ONYXKEYS.COLLECTION.REPORT_ACTIONS],
         });
 
         Onyx.multiSet({

tests/perf-test/ReportUtils.perf-test.ts

@@ -1,6 +1,22 @@
 import Onyx from 'react-native-onyx';
 import {measureFunction} from 'reassure';
-import * as ReportUtils from '@libs/ReportUtils';
+import {
+    canDeleteReportAction,
+    canShowReportRecipientLocalTime,
+    findLastAccessedReport,
+    getDisplayNamesWithTooltips,
+    getIcons,
+    getIconsForParticipants,
+    getIOUReportActionDisplayMessage,
+    getReportName,
+    getReportPreviewMessage,
+    getReportRecipientAccountIDs,
+    getTransactionDetails,
+    getWorkspaceChats,
+    getWorkspaceIcon,
+    shouldReportBeInOptionList,
+    temporary_getMoneyRequestOptions,
+} from '@libs/ReportUtils';
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
 import type {PersonalDetails, Policy, Report, ReportAction} from '@src/types/onyx';
@@ -40,7 +56,7 @@ describe('ReportUtils', () => {
     beforeAll(() => {
         Onyx.init({
             keys: ONYXKEYS,
-            safeEvictionKeys: [ONYXKEYS.COLLECTION.REPORT_ACTIONS],
+            evictableKeys: [ONYXKEYS.COLLECTION.REPORT_ACTIONS],
         });
     });
 
@@ -67,30 +83,30 @@ describe('ReportUtils', () => {
         });
 
         await waitForBatchedUpdates();
-        await measureFunction(() => ReportUtils.findLastAccessedReport(ignoreDomainRooms, openOnAdminRoom));
+        await measureFunction(() => findLastAccessedReport(ignoreDomainRooms, openOnAdminRoom));
     });
 
     test('[ReportUtils] canDeleteReportAction on 1k reports and policies', async () => {
         const reportID = '1';
         const reportAction = {...createRandomReportAction(1), actionName: CONST.REPORT.ACTIONS.TYPE.ADD_COMMENT} as unknown as ReportAction;
 
         await waitForBatchedUpdates();
-        await measureFunction(() => ReportUtils.canDeleteReportAction(reportAction, reportID));
+        await measureFunction(() => canDeleteReportAction(reportAction, reportID));
     });
 
     test('[ReportUtils] getReportRecipientAccountID on 1k participants', async () => {
         const report = {...createRandomReport(1), participantAccountIDs};
         const currentLoginAccountID = 1;
 
         await waitForBatchedUpdates();
-        await measureFunction(() => ReportUtils.getReportRecipientAccountIDs(report, currentLoginAccountID));
+        await measureFunction(() => getReportRecipientAccountIDs(report, currentLoginAccountID));
     });
 
     test('[ReportUtils] getIconsForParticipants on 1k participants', async () => {
         const participants = Array.from({length: 1000}, (v, i) => i + 1);
 
         await waitForBatchedUpdates();
-        await measureFunction(() => ReportUtils.getIconsForParticipants(participants, personalDetails));
+        await measureFunction(() => getIconsForParticipants(participants, personalDetails));
     });
 
     test('[ReportUtils] getIcons on 1k participants', async () => {
@@ -101,15 +117,15 @@ describe('ReportUtils', () => {
         const defaultIconId = -1;
 
         await waitForBatchedUpdates();
-        await measureFunction(() => ReportUtils.getIcons(report, personalDetails, defaultIcon, defaultName, defaultIconId, policy));
+        await measureFunction(() => getIcons(report, personalDetails, defaultIcon, defaultName, defaultIconId, policy));
     });
 
     test('[ReportUtils] getDisplayNamesWithTooltips 1k participants', async () => {
         const isMultipleParticipantReport = true;
         const shouldFallbackToHidden = true;
 
         await waitForBatchedUpdates();
-        await measureFunction(() => ReportUtils.getDisplayNamesWithTooltips(personalDetails, isMultipleParticipantReport, shouldFallbackToHidden));
+        await measureFunction(() => getDisplayNamesWithTooltips(personalDetails, isMultipleParticipantReport, shouldFallbackToHidden));
     });
 
     test('[ReportUtils] getReportPreviewMessage on 1k policies', async () => {
@@ -120,23 +136,23 @@ describe('ReportUtils', () => {
         const isPreviewMessageForParentChatReport = true;
 
         await waitForBatchedUpdates();
-        await measureFunction(() => ReportUtils.getReportPreviewMessage(report, reportAction, shouldConsiderReceiptBeingScanned, isPreviewMessageForParentChatReport, policy));
+        await measureFunction(() => getReportPreviewMessage(report, reportAction, shouldConsiderReceiptBeingScanned, isPreviewMessageForParentChatReport, policy));
     });
 
     test('[ReportUtils] getReportName on 1k participants', async () => {
         const report = {...createRandomReport(1), chatType: undefined, participantAccountIDs};
         const policy = createRandomPolicy(1);
 
         await waitForBatchedUpdates();
-        await measureFunction(() => ReportUtils.getReportName(report, policy));
+        await measureFunction(() => getReportName(report, policy));
     });
 
     test('[ReportUtils] canShowReportRecipientLocalTime on 1k participants', async () => {
         const report = {...createRandomReport(1), participantAccountIDs};
         const accountID = 1;
 
         await waitForBatchedUpdates();
-        await measureFunction(() => ReportUtils.canShowReportRecipientLocalTime(personalDetails, report, accountID));
+        await measureFunction(() => canShowReportRecipientLocalTime(personalDetails, report, accountID));
     });
 
     test('[ReportUtils] shouldReportBeInOptionList on 1k participant', async () => {
@@ -147,17 +163,15 @@ describe('ReportUtils', () => {
         const policies = getMockedPolicies();
 
         await waitForBatchedUpdates();
-        await measureFunction(() =>
-            ReportUtils.shouldReportBeInOptionList({report, currentReportId, isInFocusMode, betas, policies, doesReportHaveViolations: false, excludeEmptyChats: false}),
-        );
+        await measureFunction(() => shouldReportBeInOptionList({report, currentReportId, isInFocusMode, betas, policies, doesReportHaveViolations: false, excludeEmptyChats: false}));
     });
 
     test('[ReportUtils] getWorkspaceIcon on 1k policies', async () => {
         const report = createRandomReport(1);
         const policy = createRandomPolicy(1);
 
         await waitForBatchedUpdates();
-        await measureFunction(() => ReportUtils.getWorkspaceIcon(report, policy));
+        await measureFunction(() => getWorkspaceIcon(report, policy));
     });
 
     test('[ReportUtils] getMoneyRequestOptions on 1k participants', async () => {
@@ -166,22 +180,22 @@ describe('ReportUtils', () => {
         const reportParticipants = Array.from({length: 1000}, (v, i) => i + 1);
 
         await waitForBatchedUpdates();
-        await measureFunction(() => ReportUtils.temporary_getMoneyRequestOptions(report, policy, reportParticipants));
+        await measureFunction(() => temporary_getMoneyRequestOptions(report, policy, reportParticipants));
     });
 
     test('[ReportUtils] getWorkspaceChat on 1k policies', async () => {
         const policyID = '1';
         const accountsID = Array.from({length: 20}, (v, i) => i + 1);
 
         await waitForBatchedUpdates();
-        await measureFunction(() => ReportUtils.getWorkspaceChats(policyID, accountsID));
+        await measureFunction(() => getWorkspaceChats(policyID, accountsID));
     });
 
     test('[ReportUtils] getTransactionDetails on 1k reports', async () => {
         const transaction = createRandomTransaction(1);
 
         await waitForBatchedUpdates();
-        await measureFunction(() => ReportUtils.getTransactionDetails(transaction, 'yyyy-MM-dd'));
+        await measureFunction(() => getTransactionDetails(transaction, 'yyyy-MM-dd'));
     });
 
     test('[ReportUtils] getIOUReportActionDisplayMessage on 1k policies', async () => {
@@ -200,6 +214,6 @@ describe('ReportUtils', () => {
         };
 
         await waitForBatchedUpdates();
-        await measureFunction(() => ReportUtils.getIOUReportActionDisplayMessage(reportAction));
+        await measureFunction(() => getIOUReportActionDisplayMessage(reportAction));
     });
 });

tests/perf-test/SearchRouter.perf-test.tsx

@@ -93,7 +93,7 @@ const mockedOptions = createOptionList(mockedPersonalDetails, mockedReports);
 beforeAll(() =>
     Onyx.init({
         keys: ONYXKEYS,
-        safeEvictionKeys: [ONYXKEYS.COLLECTION.REPORT],
+        evictableKeys: [ONYXKEYS.COLLECTION.REPORT],
     }),
 );
 

tests/perf-test/SidebarLinks.perf-test.tsx

@@ -56,7 +56,7 @@ describe('SidebarLinks', () => {
     beforeAll(() => {
         Onyx.init({
             keys: ONYXKEYS,
-            safeEvictionKeys: [ONYXKEYS.COLLECTION.REPORT_ACTIONS],
+            evictableKeys: [ONYXKEYS.COLLECTION.REPORT_ACTIONS],
         });
     });
 

tests/perf-test/SidebarUtils.perf-test.ts

@@ -59,7 +59,7 @@ describe('SidebarUtils', () => {
     beforeAll(() => {
         Onyx.init({
             keys: ONYXKEYS,
-            safeEvictionKeys: [ONYXKEYS.COLLECTION.REPORT_ACTIONS],
+            evictableKeys: [ONYXKEYS.COLLECTION.REPORT_ACTIONS],
         });
 
         Onyx.multiSet({

tests/ui/DebugReportActionsTest.tsx

@@ -31,7 +31,7 @@ describe('DebugReportActions', () => {
     beforeAll(() => {
         Onyx.init({
             keys: ONYXKEYS,
-            safeEvictionKeys: [ONYXKEYS.COLLECTION.REPORT_ACTIONS],
+            evictableKeys: [ONYXKEYS.COLLECTION.REPORT_ACTIONS],
         });
     });
 

tests/ui/LHNItemsPresence.tsx

@@ -105,7 +105,7 @@ describe('SidebarLinksData', () => {
     beforeAll(() => {
         Onyx.init({
             keys: ONYXKEYS,
-            safeEvictionKeys: [ONYXKEYS.COLLECTION.REPORT_ACTIONS],
+            evictableKeys: [ONYXKEYS.COLLECTION.REPORT_ACTIONS],
         });
     });
 

tests/ui/ReportDetailsPageTest.tsx

@@ -33,7 +33,7 @@ describe('ReportDetailsPage', () => {
     beforeAll(() => {
         Onyx.init({
             keys: ONYXKEYS,
-            safeEvictionKeys: [ONYXKEYS.COLLECTION.REPORT_ACTIONS],
+            evictableKeys: [ONYXKEYS.COLLECTION.REPORT_ACTIONS],
         });
     });
 

tests/unit/PersistedRequests.ts

@@ -15,7 +15,7 @@ const request: Request = {
 beforeAll(() =>
     Onyx.init({
         keys: ONYXKEYS,
-        safeEvictionKeys: [ONYXKEYS.COLLECTION.REPORT_ACTIONS],
+        evictableKeys: [ONYXKEYS.COLLECTION.REPORT_ACTIONS],
     }),
 );
 

tests/unit/ReportActionItemSingleTest.ts

@@ -1,5 +1,6 @@
 import {screen, waitFor} from '@testing-library/react-native';
 import Onyx from 'react-native-onyx';
+import CONST from '@src/CONST';
 import type {PersonalDetailsList} from '@src/types/onyx';
 import {toCollectionDataSet} from '@src/types/utils/CollectionDataSet';
 import * as LHNTestUtils from '../utils/LHNTestUtils';
@@ -22,7 +23,7 @@ describe('ReportActionItemSingle', () => {
     beforeAll(() =>
         Onyx.init({
             keys: ONYXKEYS,
-            safeEvictionKeys: [ONYXKEYS.COLLECTION.REPORT_ACTIONS],
+            evictableKeys: [ONYXKEYS.COLLECTION.REPORT_ACTIONS],
         }),
     );
 
@@ -44,7 +45,7 @@ describe('ReportActionItemSingle', () => {
             const fakeReport = LHNTestUtils.getFakeReportWithPolicy([1, 2]);
             const fakeReportAction = LHNTestUtils.getFakeAdvancedReportAction();
             const fakePolicy = LHNTestUtils.getFakePolicy(fakeReport.policyID);
-            const faceAccountId = fakeReportAction.actorAccountID ?? -1;
+            const faceAccountId = fakeReportAction.actorAccountID ?? CONST.DEFAULT_NUMBER_ID;
             const fakePersonalDetails: PersonalDetailsList = {
                 [faceAccountId]: {
                     accountID: faceAccountId,

tests/unit/ReportActionsUtilsTest.ts

@@ -14,7 +14,7 @@ describe('ReportActionsUtils', () => {
     beforeAll(() =>
         Onyx.init({
             keys: ONYXKEYS,
-            safeEvictionKeys: [ONYXKEYS.COLLECTION.REPORT_ACTIONS],
+            evictableKeys: [ONYXKEYS.COLLECTION.REPORT_ACTIONS],
         }),
     );
 

tests/unit/SidebarFilterTest.ts

@@ -35,7 +35,7 @@ xdescribe('Sidebar', () => {
     beforeAll(() =>
         Onyx.init({
             keys: ONYXKEYS,
-            safeEvictionKeys: [ONYXKEYS.COLLECTION.REPORT_ACTIONS],
+            evictableKeys: [ONYXKEYS.COLLECTION.REPORT_ACTIONS],
         }),
     );
 

tests/unit/SidebarOrderTest.ts

@@ -32,7 +32,7 @@ describe('Sidebar', () => {
     beforeAll(() =>
         Onyx.init({
             keys: ONYXKEYS,
-            safeEvictionKeys: [ONYXKEYS.COLLECTION.REPORT_ACTIONS],
+            evictableKeys: [ONYXKEYS.COLLECTION.REPORT_ACTIONS],
         }),
     );
 

tests/unit/SidebarTest.ts

@@ -25,7 +25,7 @@ describe('Sidebar', () => {
     beforeAll(() =>
         Onyx.init({
             keys: ONYXKEYS,
-            safeEvictionKeys: [ONYXKEYS.COLLECTION.REPORT_ACTIONS],
+            evictableKeys: [ONYXKEYS.COLLECTION.REPORT_ACTIONS],
         }),
     );
 

tests/unit/SidebarUtilsTest.ts

@@ -21,7 +21,7 @@ describe('SidebarUtils', () => {
     beforeAll(() =>
         Onyx.init({
             keys: ONYXKEYS,
-            safeEvictionKeys: [ONYXKEYS.COLLECTION.REPORT_ACTIONS],
+            evictableKeys: [ONYXKEYS.COLLECTION.REPORT_ACTIONS],
         }),
     );