Revert "perf: make switch between chat list and workspaces smoother"

src/App.tsx

@@ -32,7 +32,6 @@ import {KeyboardStateProvider} from './components/withKeyboardState';
 import {WindowDimensionsProvider} from './components/withWindowDimensions';
 import Expensify from './Expensify';
 import useDefaultDragAndDrop from './hooks/useDefaultDragAndDrop';
-import {ReportIDsContextProvider} from './hooks/useReportIDs';
 import OnyxUpdateManager from './libs/actions/OnyxUpdateManager';
 import {ReportAttachmentsProvider} from './pages/home/report/ReportAttachmentsContext';
 import type {Route} from './ROUTES';
@@ -79,7 +78,6 @@ function App({url}: AppProps) {
                         CustomStatusBarAndBackgroundContextProvider,
                         ActiveElementRoleProvider,
                         ActiveWorkspaceContextProvider,
-                        ReportIDsContextProvider,
                         PlaybackContextProvider,
                         FullScreenContextProvider,
                         VolumeContextProvider,

src/components/withCurrentReportID.tsx

@@ -39,17 +39,7 @@ function CurrentReportIDContextProvider(props: CurrentReportIDContextProviderPro
      */
     const updateCurrentReportID = useCallback(
         (state: NavigationState) => {
-            const reportID = Navigation.getTopmostReportId(state) ?? '';
-
-            /*
-             * Make sure we don't make the reportID undefined when switching between the chat list and settings tab.
-             * This helps prevent unnecessary re-renders.
-             */
-            const params = state?.routes?.[state.index]?.params;
-            if (params && 'screen' in params && typeof params.screen === 'string' && params.screen.indexOf('Settings_') !== -1) {
-                return;
-            }
-            setCurrentReportID(reportID);
+            setCurrentReportID(Navigation.getTopmostReportId(state) ?? '');
         },
         [setCurrentReportID],
     );

src/libs/SidebarUtils.ts

@@ -1,14 +1,14 @@
 import Str from 'expensify-common/lib/str';
 import type {OnyxCollection, OnyxEntry} from 'react-native-onyx';
 import Onyx from 'react-native-onyx';
-import type {ChatReportSelector, PolicySelector, ReportActionsSelector} from '@hooks/useReportIDs';
+import type {ValueOf} from 'type-fest';
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
-import type {PersonalDetails, PersonalDetailsList, ReportActions, TransactionViolation} from '@src/types/onyx';
+import type {PersonalDetails, PersonalDetailsList, TransactionViolation} from '@src/types/onyx';
 import type Beta from '@src/types/onyx/Beta';
 import type Policy from '@src/types/onyx/Policy';
-import type PriorityMode from '@src/types/onyx/PriorityMode';
 import type Report from '@src/types/onyx/Report';
+import type {ReportActions} from '@src/types/onyx/ReportAction';
 import type ReportAction from '@src/types/onyx/ReportAction';
 import type DeepValueOf from '@src/types/utils/DeepValueOf';
 import * as CollectionUtils from './CollectionUtils';
@@ -62,11 +62,11 @@ function compareStringDates(a: string, b: string): 0 | 1 | -1 {
  */
 function getOrderedReportIDs(
     currentReportId: string | null,
-    allReports: OnyxCollection<ChatReportSelector>,
+    allReports: OnyxCollection<Report>,
     betas: OnyxEntry<Beta[]>,
-    policies: OnyxCollection<PolicySelector>,
-    priorityMode: OnyxEntry<PriorityMode>,
-    allReportActions: OnyxCollection<ReportActionsSelector>,
+    policies: OnyxCollection<Policy>,
+    priorityMode: OnyxEntry<ValueOf<typeof CONST.PRIORITY_MODE>>,
+    allReportActions: OnyxCollection<ReportAction[]>,
     transactionViolations: OnyxCollection<TransactionViolation[]>,
     currentPolicyID = '',
     policyMemberAccountIDs: number[] = [],
@@ -88,7 +88,7 @@ function getOrderedReportIDs(
         const doesReportHaveViolations = !!(
             betas?.includes(CONST.BETAS.VIOLATIONS) &&
             !!parentReportAction &&
-            ReportUtils.doesTransactionThreadHaveViolations(report, transactionViolations, parentReportAction as OnyxEntry<ReportAction>)
+            ReportUtils.doesTransactionThreadHaveViolations(report, transactionViolations, parentReportAction)
         );
         const isHidden = report.notificationPreference === CONST.REPORT.NOTIFICATION_PREFERENCE.HIDDEN;
         const isFocused = report.reportID === currentReportId;
@@ -104,7 +104,7 @@ function getOrderedReportIDs(
             currentReportId: currentReportId ?? '',
             isInGSDMode,
             betas,
-            policies: policies as OnyxCollection<Policy>,
+            policies,
             excludeEmptyChats: true,
             doesReportHaveViolations,
             includeSelfDM: true,
@@ -131,13 +131,13 @@ function getOrderedReportIDs(
         );
     }
     // There are a few properties that need to be calculated for the report which are used when sorting reports.
-    reportsToDisplay.forEach((reportToDisplay) => {
-        let report = reportToDisplay as OnyxEntry<Report>;
+    reportsToDisplay.forEach((report) => {
+        // Normally, the spread operator would be used here to clone the report and prevent the need to reassign the params.
+        // However, this code needs to be very performant to handle thousands of reports, so in the interest of speed, we're just going to disable this lint rule and add
+        // the reportDisplayName property to the report object directly.
         if (report) {
-            report = {
-                ...report,
-                displayName: ReportUtils.getReportName(report),
-            };
+            // eslint-disable-next-line no-param-reassign
+            report.displayName = ReportUtils.getReportName(report);
         }
 
         const isPinned = report?.isPinned ?? false;