Merge pull request Expensify#67132 from nkdengineer/fix/67091

fix: remove call to getReportNameValuePairs() in method findLastAccessedReport

Author: luacmartins

src/hooks/useLastAccessedReport.ts

@@ -0,0 +1,84 @@
+import {useMemo} from 'react';
+import type {OnyxCollection, OnyxEntry} from 'react-native-onyx';
+import {findLastAccessedReport} from '@src/libs/ReportUtils';
+import ONYXKEYS from '@src/ONYXKEYS';
+import type {Policy, Report, ReportMetadata, ReportNameValuePairs} from '@src/types/onyx';
+import mapOnyxCollectionItems from '@src/utils/mapOnyxCollectionItems';
+import useOnyx from './useOnyx';
+
+// Optimized selectors based on complete field usage analysis in findLastAccessedReport
+type ReportSelector = Pick<Report, 'reportID' | 'lastReadTime' | 'chatType' | 'type' | 'participants' | 'invoiceReceiver' | 'ownerAccountID' | 'parentReportActionID' | 'policyID'>;
+
+type PolicySelector = Pick<Policy, 'id' | 'employeeList'>;
+
+type ReportMetadataSelector = Pick<ReportMetadata, 'lastVisitTime'>;
+
+type ReportNameValuePairsSelector = Pick<ReportNameValuePairs, 'private_isArchived'>;
+
+const reportSelector = (report: OnyxEntry<Report>): ReportSelector =>
+    (report && {
+        reportID: report.reportID,
+        lastReadTime: report.lastReadTime,
+        chatType: report.chatType,
+        type: report.type,
+        participants: report.participants,
+        invoiceReceiver: report.invoiceReceiver,
+        ownerAccountID: report.ownerAccountID,
+        parentReportActionID: report.parentReportActionID,
+        policyID: report.policyID,
+    }) as ReportSelector;
+
+const policySelector = (policy: OnyxEntry<Policy>): PolicySelector =>
+    (policy && {
+        id: policy.id,
+        employeeList: policy.employeeList,
+    }) as PolicySelector;
+
+const reportNameValuePairsSelector = (reportNameValuePairs: OnyxEntry<ReportNameValuePairs>): ReportNameValuePairsSelector =>
+    (reportNameValuePairs && {
+        private_isArchived: reportNameValuePairs.private_isArchived,
+    }) as ReportNameValuePairsSelector;
+
+const reportMetadataSelector = (reportMetadata: OnyxEntry<ReportMetadata>): ReportMetadataSelector =>
+    (reportMetadata && {
+        lastVisitTime: reportMetadata.lastVisitTime,
+    }) as ReportMetadataSelector;
+
+function useLastAccessedReport(ignoreDomainRooms: boolean, openOnAdminRoom = false, policyID?: string, excludeReportID?: string) {
+    const [allReports] = useOnyx(ONYXKEYS.COLLECTION.REPORT, {
+        canBeMissing: true,
+        selector: (c) => mapOnyxCollectionItems(c, reportSelector),
+    });
+
+    const [allPolicies] = useOnyx(ONYXKEYS.COLLECTION.POLICY, {
+        canBeMissing: true,
+        selector: (c) => mapOnyxCollectionItems(c, policySelector),
+    });
+
+    const [allReportNameValuePairs] = useOnyx(ONYXKEYS.COLLECTION.REPORT_NAME_VALUE_PAIRS, {
+        canBeMissing: true,
+        selector: (c) => mapOnyxCollectionItems(c, reportNameValuePairsSelector),
+    });
+
+    const [allReportMetadata] = useOnyx(ONYXKEYS.COLLECTION.REPORT_METADATA, {
+        canBeMissing: true,
+        selector: (c) => mapOnyxCollectionItems(c, reportMetadataSelector),
+    });
+
+    const lastAccessReport = useMemo(() => {
+        return findLastAccessedReport(
+            allReports,
+            allPolicies as OnyxCollection<OnyxEntry<Policy>>,
+            allReportMetadata,
+            allReportNameValuePairs,
+            ignoreDomainRooms,
+            openOnAdminRoom,
+            policyID,
+            excludeReportID,
+        );
+    }, [allReports, allPolicies, allReportMetadata, allReportNameValuePairs, ignoreDomainRooms, openOnAdminRoom, policyID, excludeReportID]);
+
+    return {lastAccessReport, lastAccessReportID: lastAccessReport?.reportID};
+}
+
+export default useLastAccessedReport;

src/libs/Navigation/AppNavigator/Navigators/ReportsSplitNavigator.tsx

@@ -1,4 +1,5 @@
 import React, {useState} from 'react';
+import useLastAccessedReport from '@hooks/useLastAccessedReport';
 import usePermissions from '@hooks/usePermissions';
 import createSplitNavigator from '@libs/Navigation/AppNavigator/createSplitNavigator';
 import FreezeWrapper from '@libs/Navigation/AppNavigator/FreezeWrapper';
@@ -7,7 +8,6 @@ import getCurrentUrl from '@libs/Navigation/currentUrl';
 import shouldOpenOnAdminRoom from '@libs/Navigation/helpers/shouldOpenOnAdminRoom';
 import type {PlatformStackScreenProps} from '@libs/Navigation/PlatformStackNavigation/types';
 import type {AuthScreensParamList, ReportsSplitNavigatorParamList} from '@libs/Navigation/types';
-import * as ReportUtils from '@libs/ReportUtils';
 import CONST from '@src/CONST';
 import type NAVIGATORS from '@src/NAVIGATORS';
 import SCREENS from '@src/SCREENS';
@@ -24,6 +24,7 @@ const Split = createSplitNavigator<ReportsSplitNavigatorParamList>();
 function ReportsSplitNavigator({route}: PlatformStackScreenProps<AuthScreensParamList, typeof NAVIGATORS.REPORTS_SPLIT_NAVIGATOR>) {
     const {isBetaEnabled} = usePermissions();
     const splitNavigatorScreenOptions = useSplitNavigatorScreenOptions();
+    const {lastAccessReportID} = useLastAccessedReport(!isBetaEnabled(CONST.BETAS.DEFAULT_ROOMS), shouldOpenOnAdminRoom());
 
     const [initialReportID] = useState(() => {
         const currentURL = getCurrentUrl();
@@ -32,9 +33,8 @@ function ReportsSplitNavigator({route}: PlatformStackScreenProps<AuthScreensPara
             return reportIdFromPath;
         }
 
-        const initialReport = ReportUtils.findLastAccessedReport(!isBetaEnabled(CONST.BETAS.DEFAULT_ROOMS), shouldOpenOnAdminRoom());
         // eslint-disable-next-line rulesdir/no-default-id-values
-        return initialReport?.reportID ?? '';
+        return lastAccessReportID ?? '';
     });
 
     return (

src/libs/ReportUtils.ts

@@ -1969,16 +1969,25 @@ function getMostRecentlyVisitedReport(reports: Array<OnyxEntry<Report>>, reportM
     return lodashMaxBy(filteredReports, (a) => [reportMetadata?.[`${ONYXKEYS.COLLECTION.REPORT_METADATA}${a?.reportID}`]?.lastVisitTime ?? '', a?.lastReadTime ?? '']);
 }
 
-function findLastAccessedReport(ignoreDomainRooms: boolean, openOnAdminRoom = false, policyID?: string, excludeReportID?: string): OnyxEntry<Report> {
+function findLastAccessedReport(
+    reports: OnyxCollection<OnyxEntry<Report>>,
+    policies: OnyxCollection<OnyxEntry<Policy>>,
+    reportMetadata: OnyxCollection<ReportMetadata>,
+    reportNameValuePairs: OnyxCollection<ReportNameValuePairs>,
+    ignoreDomainRooms: boolean,
+    openOnAdminRoom = false,
+    policyID?: string,
+    excludeReportID?: string,
+): OnyxEntry<Report> {
     // If it's the user's first time using New Expensify, then they could either have:
     //   - just a Concierge report, if so we'll return that
     //   - their Concierge report, and a separate report that must have deeplinked them to the app before they created their account.
     // If it's the latter, we'll use the deeplinked report over the Concierge report,
     // since the Concierge report would be incorrectly selected over the deep-linked report in the logic below.
 
-    const policyMemberAccountIDs = getPolicyEmployeeListByIdWithoutCurrentUser(allPolicies, policyID, currentUserAccountID);
+    const policyMemberAccountIDs = getPolicyEmployeeListByIdWithoutCurrentUser(policies, policyID, currentUserAccountID);
 
-    let reportsValues = Object.values(allReports ?? {});
+    let reportsValues = Object.values(reports ?? {});
 
     if (!!policyID || policyMemberAccountIDs.length > 0) {
         reportsValues = filterReportsByPolicyIDAndMemberAccountIDs(reportsValues, policyMemberAccountIDs, policyID);
@@ -2018,24 +2027,29 @@ function findLastAccessedReport(ignoreDomainRooms: boolean, openOnAdminRoom = fa
     // and it prompts the user to use the Concierge chat instead.
     reportsValues =
         reportsValues.filter((report) => {
-            // This will get removed as part of https://github.com/Expensify/App/issues/59961
-            // eslint-disable-next-line deprecation/deprecation
-            const reportNameValuePairs = getReportNameValuePairs(report?.reportID);
-
-            return !isSystemChat(report) && !isArchivedReport(reportNameValuePairs);
+            return !isSystemChat(report) && !isArchivedReport(reportNameValuePairs?.[`${ONYXKEYS.COLLECTION.REPORT_NAME_VALUE_PAIRS}${report?.reportID}`]);
         }) ?? [];
 
     // At least two reports remain: self DM and Concierge chat.
     // Return the most recently visited report. Get the last read report from the report metadata.
     // If allReportMetadata is empty we'll return most recent report owned by user
-    if (isEmptyObject(allReportMetadata)) {
+    if (isEmptyObject(reportMetadata)) {
         const ownedReports = reportsValues.filter((report) => report?.ownerAccountID === currentUserAccountID);
         if (ownedReports.length > 0) {
             return lodashMaxBy(ownedReports, (a) => a?.lastReadTime ?? '');
         }
         return lodashMaxBy(reportsValues, (a) => a?.lastReadTime ?? '');
     }
-    return getMostRecentlyVisitedReport(reportsValues, allReportMetadata);
+    return getMostRecentlyVisitedReport(reportsValues, reportMetadata);
+}
+
+/**
+ * This function is used to retrieve the last accessed report in background
+ * It's used in the case we need to get the last accessed report in a listener like openReportFromDeepLink
+ * Please use useLastAccessedReport hook instead if we need to get the last accessed report from the UI
+ */
+function findLastAccessedReportWithoutView(ignoreDomainRooms: boolean, openOnAdminRoom = false, policyID?: string, excludeReportID?: string): OnyxEntry<Report> {
+    return findLastAccessedReport(allReports, allPolicies, allReportMetadata, allReportNameValuePair, ignoreDomainRooms, openOnAdminRoom, policyID, excludeReportID);
 }
 
 /**
@@ -11671,6 +11685,7 @@ export {
     isWorkspaceTaskReport,
     isWorkspaceThread,
     getReportStatusTranslation,
+    findLastAccessedReportWithoutView,
 };
 
 export type {

src/libs/actions/Report.ts

@@ -114,7 +114,7 @@ import {
     buildOptimisticSelfDMReport,
     buildOptimisticUnreportedTransactionAction,
     canUserPerformWriteAction as canUserPerformWriteActionReportUtils,
-    findLastAccessedReport,
+    findLastAccessedReportWithoutView,
     findSelfDMReportID,
     formatReportLastMessageText,
     generateReportID,
@@ -3412,7 +3412,7 @@ function openReportFromDeepLink(
     // Navigate to the report after sign-in/sign-up.
     InteractionManager.runAfterInteractions(() => {
         waitForUserSignIn().then(() => {
-            const connection = Onyx.connect({
+            const connection = Onyx.connectWithoutView({
                 key: ONYXKEYS.NVP_ONBOARDING,
                 callback: (val) => {
                     if (!val && !isAnonymousUser()) {
@@ -3458,7 +3458,7 @@ function openReportFromDeepLink(
                             const report = allReports?.[`${ONYXKEYS.COLLECTION.REPORT}${reportID}`];
                             // If the report does not exist, navigate to the last accessed report or Concierge chat
                             if (reportID && !report) {
-                                const lastAccessedReportID = findLastAccessedReport(false, shouldOpenOnAdminRoom(), undefined, reportID)?.reportID;
+                                const lastAccessedReportID = findLastAccessedReportWithoutView(false, shouldOpenOnAdminRoom(), undefined, reportID)?.reportID;
                                 if (lastAccessedReportID) {
                                     const lastAccessedReportRoute = ROUTES.REPORT_WITH_ID.getRoute(lastAccessedReportID);
                                     Navigation.navigate(lastAccessedReportRoute);
@@ -3504,9 +3504,7 @@ function getCurrentUserEmail(): string | undefined {
     return currentUserEmail;
 }
 
-function navigateToMostRecentReport(currentReport: OnyxEntry<Report>) {
-    const lastAccessedReportID = findLastAccessedReport(false, false, undefined, currentReport?.reportID)?.reportID;
-
+function navigateToMostRecentReport(currentReport: OnyxEntry<Report>, lastAccessedReportID: string | undefined) {
     if (lastAccessedReportID) {
         const lastAccessedReportRoute = ROUTES.REPORT_WITH_ID.getRoute(lastAccessedReportID);
         Navigation.goBack(lastAccessedReportRoute);
@@ -3522,8 +3520,7 @@ function navigateToMostRecentReport(currentReport: OnyxEntry<Report>) {
     }
 }
 
-function getMostRecentReportID(currentReport: OnyxEntry<Report>) {
-    const lastAccessedReportID = findLastAccessedReport(false, false, undefined, currentReport?.reportID)?.reportID;
+function getMostRecentReportID(lastAccessedReportID: string | undefined) {
     return lastAccessedReportID ?? conciergeReportID;
 }
 
@@ -3540,7 +3537,7 @@ function joinRoom(report: OnyxEntry<Report>) {
     );
 }
 
-function leaveGroupChat(reportID: string) {
+function leaveGroupChat(reportID: string, lastAccessedReportID: string | undefined) {
     const report = allReports?.[`${ONYXKEYS.COLLECTION.REPORT}${reportID}`];
     if (!report) {
         Log.warn('Attempting to leave Group Chat that does not existing locally');
@@ -3592,12 +3589,12 @@ function leaveGroupChat(reportID: string) {
         },
     ];
 
-    navigateToMostRecentReport(report);
+    navigateToMostRecentReport(report, lastAccessedReportID);
     API.write(WRITE_COMMANDS.LEAVE_GROUP_CHAT, {reportID}, {optimisticData, successData, failureData});
 }
 
 /** Leave a report by setting the state to submitted and closed */
-function leaveRoom(reportID: string, isWorkspaceMemberLeavingWorkspaceRoom = false) {
+function leaveRoom(reportID: string, lastAccessedReportID: string | undefined, isWorkspaceMemberLeavingWorkspaceRoom = false) {
     const report = allReports?.[`${ONYXKEYS.COLLECTION.REPORT}${reportID}`];
 
     if (!report) {
@@ -3704,7 +3701,7 @@ function leaveRoom(reportID: string, isWorkspaceMemberLeavingWorkspaceRoom = fal
         return;
     }
     // In other cases, the report is deleted and we should move the user to another report.
-    navigateToMostRecentReport(report);
+    navigateToMostRecentReport(report, lastAccessedReportID);
 }
 
 function buildInviteToRoomOnyxData(reportID: string, inviteeEmailsToAccountIDs: InvitedEmailsToAccountIDs, formatPhoneNumber: LocaleContextProps['formatPhoneNumber']) {

src/libs/actions/Task.ts

@@ -1045,7 +1045,7 @@ function getParentReport(report: OnyxEntry<OnyxTypes.Report>): OnyxEntry<OnyxTyp
  * @param report - The task report being deleted
  * @returns The URL to navigate to
  */
-function getNavigationUrlOnTaskDelete(report: OnyxEntry<OnyxTypes.Report>): string | undefined {
+function getNavigationUrlOnTaskDelete(report: OnyxEntry<OnyxTypes.Report>, lastAccessedReportID: string | undefined): string | undefined {
     if (!report) {
         return undefined;
     }
@@ -1062,7 +1062,7 @@ function getNavigationUrlOnTaskDelete(report: OnyxEntry<OnyxTypes.Report>): stri
     }
 
     // If no parent report, try to navigate to most recent report
-    const mostRecentReportID = getMostRecentReportID(report);
+    const mostRecentReportID = getMostRecentReportID(lastAccessedReportID);
     if (mostRecentReportID) {
         return ROUTES.REPORT_WITH_ID.getRoute(mostRecentReportID);
     }
@@ -1073,7 +1073,7 @@ function getNavigationUrlOnTaskDelete(report: OnyxEntry<OnyxTypes.Report>): stri
 /**
  * Cancels a task by setting the report state to SUBMITTED and status to CLOSED
  */
-function deleteTask(report: OnyxEntry<OnyxTypes.Report>) {
+function deleteTask(report: OnyxEntry<OnyxTypes.Report>, lastAccessedReportID: string | undefined) {
     if (!report) {
         return;
     }
@@ -1212,7 +1212,7 @@ function deleteTask(report: OnyxEntry<OnyxTypes.Report>) {
     API.write(WRITE_COMMANDS.CANCEL_TASK, parameters, {optimisticData, successData, failureData});
     notifyNewAction(report.reportID, currentUserAccountID);
 
-    const urlToNavigateBack = getNavigationUrlOnTaskDelete(report);
+    const urlToNavigateBack = getNavigationUrlOnTaskDelete(report, lastAccessedReportID);
     if (urlToNavigateBack) {
         Navigation.goBack();
         return urlToNavigateBack;

src/libs/navigateAfterOnboarding.ts

@@ -1,12 +1,13 @@
+import type {OnyxEntry} from 'react-native-onyx';
 import ROUTES from '@src/ROUTES';
+import type {Report} from '@src/types/onyx';
 import {setDisableDismissOnEscape} from './actions/Modal';
-import shouldOpenOnAdminRoom from './Navigation/helpers/shouldOpenOnAdminRoom';
 import Navigation from './Navigation/Navigation';
-import {findLastAccessedReport, isConciergeChatReport} from './ReportUtils';
+import {isConciergeChatReport} from './ReportUtils';
 
 const navigateAfterOnboarding = (
     isSmallScreenWidth: boolean,
-    canUseDefaultRooms: boolean | undefined,
+    lastAccessedReport: OnyxEntry<Report>,
     onboardingPolicyID?: string,
     onboardingAdminsChatReportID?: string,
     shouldPreventOpenAdminRoom = false,
@@ -24,7 +25,6 @@ const navigateAfterOnboarding = (
             reportID = onboardingAdminsChatReportID;
         }
     } else {
-        const lastAccessedReport = findLastAccessedReport(!canUseDefaultRooms, shouldOpenOnAdminRoom() && !shouldPreventOpenAdminRoom);
         const lastAccessedReportID = lastAccessedReport?.reportID;
         // we don't want to navigate to newly created workspaces after onboarding is completed.
         if (lastAccessedReportID && lastAccessedReport.policyID !== onboardingPolicyID && !isConciergeChatReport(lastAccessedReport)) {
@@ -52,13 +52,13 @@ const navigateAfterOnboarding = (
 
 const navigateAfterOnboardingWithMicrotaskQueue = (
     isSmallScreenWidth: boolean,
-    canUseDefaultRooms: boolean | undefined,
+    lastAccessedReport: OnyxEntry<Report>,
     onboardingPolicyID?: string,
     onboardingAdminsChatReportID?: string,
     shouldPreventOpenAdminRoom = false,
 ) => {
     Navigation.setNavigationActionToMicrotaskQueue(() => {
-        navigateAfterOnboarding(isSmallScreenWidth, canUseDefaultRooms, onboardingPolicyID, onboardingAdminsChatReportID, shouldPreventOpenAdminRoom);
+        navigateAfterOnboarding(isSmallScreenWidth, lastAccessedReport, onboardingPolicyID, onboardingAdminsChatReportID, shouldPreventOpenAdminRoom);
     });
 };