refactor pushModifiedExpenseNotification to use conciergeReportID from useOnyx

src/libs/ModifiedExpenseMessage.ts

@@ -165,14 +165,16 @@ function getMovedFromOrToReportMessage(
     movedFromReport: OnyxEntry<Report> | undefined,
     movedToReport: OnyxEntry<Report> | undefined,
     currentUserLogin: string,
+    // TODO: This will be required eventually. Refactor issue: https://github.com/Expensify/App/issues/66411
+    conciergeReportID?: string,
 ): string | undefined {
     if (movedToReport) {
         return getForExpenseMovedFromSelfDM(translate, movedToReport, currentUserLogin);
     }
 
     if (movedFromReport) {
         // eslint-disable-next-line @typescript-eslint/no-deprecated
-        const originReportName = getReportName({report: movedFromReport});
+        const originReportName = getReportName({report: movedFromReport, conciergeReportID});
         return translate('iou.movedFromReport', originReportName ?? '');
     }
 }
@@ -251,6 +253,7 @@ function getForReportAction({
     movedToReport,
     policyTags,
     currentUserLogin,
+    conciergeReportID,
 }: {
     translate: LocalizedTranslate;
     reportAction: OnyxEntry<ReportAction>;
@@ -262,12 +265,14 @@ function getForReportAction({
     // See https://github.com/Expensify/App/pull/75562
     policyTags?: OnyxEntry<PolicyTagLists>;
     currentUserLogin: string;
+    // TODO: This will be required eventually. Refactor issue: https://github.com/Expensify/App/issues/66411
+    conciergeReportID?: string;
 }): string {
     if (!isModifiedExpenseAction(reportAction)) {
         return '';
     }
 
-    const movedFromOrToReportMessage = getMovedFromOrToReportMessage(translate, movedFromReport, movedToReport, currentUserLogin);
+    const movedFromOrToReportMessage = getMovedFromOrToReportMessage(translate, movedFromReport, movedToReport, currentUserLogin, conciergeReportID);
     if (movedFromOrToReportMessage) {
         return movedFromOrToReportMessage;
     }

src/libs/Notification/LocalNotification/BrowserNotifications.ts

@@ -142,6 +142,7 @@ export default {
         policyTags,
         policy,
         currentUserLogin,
+        conciergeReportID,
     }: LocalNotificationModifiedExpensePushParams) {
         const title = reportAction.person?.map((f) => f.text).join(', ') ?? '';
         const bodyWithHTML = getForReportAction({
@@ -153,6 +154,7 @@ export default {
             movedToReport,
             policyTags,
             currentUserLogin,
+            conciergeReportID,
         });
         // Strip HTML tags for plain text notification body
         const body = getTextFromHtml(bodyWithHTML);

src/libs/Notification/LocalNotification/index.ts

@@ -35,11 +35,22 @@ function showUpdateAvailableNotification() {
     BrowserNotifications.pushUpdateAvailableNotification();
 }
 
-function showModifiedExpenseNotification({report, reportAction, movedFromReport, movedToReport, onClick, currentUserLogin}: LocalNotificationModifiedExpenseParams) {
+function showModifiedExpenseNotification({report, reportAction, movedFromReport, movedToReport, onClick, currentUserLogin, conciergeReportID}: LocalNotificationModifiedExpenseParams) {
     const policyID = report.policyID;
     const policyTags = policyID ? allPolicyTags?.[`${ONYXKEYS.COLLECTION.POLICY_TAGS}${policyID}`] : undefined;
     const policy = policyID ? allPolicies?.[`${ONYXKEYS.COLLECTION.POLICY}${policyID}`] : undefined;
-    BrowserNotifications.pushModifiedExpenseNotification({report, reportAction, movedFromReport, movedToReport, onClick, usesIcon: true, policyTags, policy, currentUserLogin});
+    BrowserNotifications.pushModifiedExpenseNotification({
+        report,
+        reportAction,
+        movedFromReport,
+        movedToReport,
+        onClick,
+        usesIcon: true,
+        policyTags,
+        policy,
+        currentUserLogin,
+        conciergeReportID,
+    });
 }
 
 function clearReportNotifications(reportID: string | undefined) {

src/libs/Notification/LocalNotification/types.ts

@@ -22,6 +22,7 @@ type LocalNotificationModifiedExpenseParams = {
     movedFromReport?: OnyxEntry<Report>;
     movedToReport?: OnyxEntry<Report>;
     currentUserLogin: string;
+    conciergeReportID: string | undefined;
 };
 
 type LocalNotificationModifiedExpensePushParams = LocalNotificationModifiedExpenseParams & {

src/libs/actions/Report/index.ts

@@ -373,7 +373,7 @@
 // map of reportID to all reportActions for that report
 const allReportActions: OnyxCollection<ReportActions> = {};
 
 Onyx.connect({
     key: ONYXKEYS.COLLECTION.REPORT_ACTIONS,
     callback: (actions, key) => {
         if (!key || !actions) {
@@ -385,7 +385,7 @@
 });
 
 let allReports: OnyxCollection<Report>;
 Onyx.connect({
     key: ONYXKEYS.COLLECTION.REPORT,
     waitForCollectionCallback: true,
     callback: (value) => {
@@ -394,7 +394,7 @@
 });
 
 let allPersonalDetails: OnyxEntry<PersonalDetailsList> = {};
 Onyx.connect({
     key: ONYXKEYS.PERSONAL_DETAILS_LIST,
     callback: (value) => {
         allPersonalDetails = value ?? {};
@@ -412,7 +412,7 @@
 });
 
 let onboarding: OnyxEntry<Onboarding>;
 Onyx.connect({
     key: ONYXKEYS.NVP_ONBOARDING,
     callback: (val) => {
         if (Array.isArray(val)) {
@@ -4095,7 +4095,7 @@
     if (reportAction.actionName === CONST.REPORT.ACTIONS.TYPE.MODIFIED_EXPENSE) {
         const movedFromReport = allReports?.[`${ONYXKEYS.COLLECTION.REPORT}${getMovedReportID(reportAction, CONST.REPORT.MOVE_TYPE.FROM)}`];
         const movedToReport = allReports?.[`${ONYXKEYS.COLLECTION.REPORT}${getMovedReportID(reportAction, CONST.REPORT.MOVE_TYPE.TO)}`];
-        LocalNotification.showModifiedExpenseNotification({report, reportAction, onClick, movedFromReport, movedToReport, currentUserLogin});
+        LocalNotification.showModifiedExpenseNotification({report, reportAction, onClick, movedFromReport, movedToReport, currentUserLogin, conciergeReportID});
     } else {
         LocalNotification.showCommentNotification(report, reportAction, onClick, conciergeReportID);
     }

tests/unit/showReportActionNotificationTest.ts

@@ -0,0 +1,151 @@
+import {afterEach, beforeAll, beforeEach, describe, expect, it, jest} from '@jest/globals';
+import Onyx from 'react-native-onyx';
+import CONST from '@src/CONST';
+import * as Report from '@src/libs/actions/Report';
+import ONYXKEYS from '@src/ONYXKEYS';
+import waitForBatchedUpdates from '../utils/waitForBatchedUpdates';
+
+jest.mock('@libs/ActiveClientManager', () => ({
+    isClientTheLeader: jest.fn(() => true),
+    isReady: jest.fn(() => Promise.resolve()),
+    init: jest.fn(),
+}));
+
+const mockShowModifiedExpenseNotification = jest.fn();
+const mockShowCommentNotification = jest.fn();
+jest.mock('@libs/Notification/LocalNotification', () => ({
+    // eslint-disable-next-line @typescript-eslint/naming-convention
+    __esModule: true,
+    default: {
+        showModifiedExpenseNotification: (...args: unknown[]) => mockShowModifiedExpenseNotification(...args),
+        showCommentNotification: (...args: unknown[]) => mockShowCommentNotification(...args),
+        showUpdateAvailableNotification: jest.fn(),
+        clearReportNotifications: jest.fn(),
+    },
+}));
+
+jest.mock('@libs/Navigation/Navigation', () => ({
+    // eslint-disable-next-line @typescript-eslint/naming-convention
+    __esModule: true,
+    default: {
+        getTopmostReportId: jest.fn(() => 'other-report-id'),
+        navigate: jest.fn(),
+    },
+}));
+
+jest.mock('@libs/Visibility', () => ({
+    // eslint-disable-next-line @typescript-eslint/naming-convention
+    __esModule: true,
+    default: {
+        isVisible: jest.fn(() => false),
+        hasFocus: jest.fn(() => false),
+    },
+}));
+
+const CURRENT_USER_ACCOUNT_ID = 1;
+const CURRENT_USER_LOGIN = 'test@user.com';
+const REPORT_ID = '100';
+const OTHER_USER_ACCOUNT_ID = 2;
+const CONCIERGE_REPORT_ID = '42';
+
+describe('showReportActionNotification', () => {
+    beforeAll(() => {
+        Onyx.init({keys: ONYXKEYS});
+    });
+
+    beforeEach(() => {
+        mockShowModifiedExpenseNotification.mockClear();
+        mockShowCommentNotification.mockClear();
+        return Onyx.clear().then(waitForBatchedUpdates);
+    });
+
+    afterEach(() => {
+        return Onyx.clear();
+    });
+
+    async function setupReport() {
+        await Onyx.set(ONYXKEYS.SESSION, {accountID: CURRENT_USER_ACCOUNT_ID, email: CURRENT_USER_LOGIN});
+        await Onyx.merge(`${ONYXKEYS.COLLECTION.REPORT}${REPORT_ID}`, {
+            reportID: REPORT_ID,
+            participants: {
+                [CURRENT_USER_ACCOUNT_ID]: {
+                    notificationPreference: CONST.REPORT.NOTIFICATION_PREFERENCE.ALWAYS,
+                },
+            },
+        });
+        await waitForBatchedUpdates();
+    }
+
+    it('passes conciergeReportID to showModifiedExpenseNotification for MODIFIED_EXPENSE actions', async () => {
+        await setupReport();
+
+        const reportAction = {
+            reportActionID: 'action1',
+            actionName: CONST.REPORT.ACTIONS.TYPE.MODIFIED_EXPENSE,
+            actorAccountID: OTHER_USER_ACCOUNT_ID,
+            created: '2026-01-01 00:00:00.000',
+            message: [{type: 'COMMENT', html: 'expense modified', text: 'expense modified'}],
+            person: [{type: 'TEXT', style: 'strong', text: 'Other User'}],
+        };
+
+        Report.showReportActionNotification(
+            REPORT_ID,
+            reportAction as Parameters<typeof Report.showReportActionNotification>[1],
+            CURRENT_USER_ACCOUNT_ID,
+            CURRENT_USER_LOGIN,
+            CONCIERGE_REPORT_ID,
+        );
+        await waitForBatchedUpdates();
+
+        expect(mockShowModifiedExpenseNotification).toHaveBeenCalledTimes(1);
+        const callArgs = mockShowModifiedExpenseNotification.mock.calls.at(0)?.at(0) as Record<string, unknown>;
+        expect(callArgs.conciergeReportID).toBe(CONCIERGE_REPORT_ID);
+        expect(mockShowCommentNotification).not.toHaveBeenCalled();
+    });
+
+    it('passes undefined conciergeReportID to showModifiedExpenseNotification when not provided', async () => {
+        await setupReport();
+
+        const reportAction = {
+            reportActionID: 'action2',
+            actionName: CONST.REPORT.ACTIONS.TYPE.MODIFIED_EXPENSE,
+            actorAccountID: OTHER_USER_ACCOUNT_ID,
+            created: '2026-01-01 00:00:00.000',
+            message: [{type: 'COMMENT', html: 'expense modified', text: 'expense modified'}],
+            person: [{type: 'TEXT', style: 'strong', text: 'Other User'}],
+        };
+
+        Report.showReportActionNotification(REPORT_ID, reportAction as Parameters<typeof Report.showReportActionNotification>[1], CURRENT_USER_ACCOUNT_ID, CURRENT_USER_LOGIN, undefined);
+        await waitForBatchedUpdates();
+
+        expect(mockShowModifiedExpenseNotification).toHaveBeenCalledTimes(1);
+        const callArgs = mockShowModifiedExpenseNotification.mock.calls.at(0)?.at(0) as Record<string, unknown>;
+        expect(callArgs.conciergeReportID).toBeUndefined();
+        expect(mockShowCommentNotification).not.toHaveBeenCalled();
+    });
+
+    it('routes non-MODIFIED_EXPENSE actions to showCommentNotification', async () => {
+        await setupReport();
+
+        const reportAction = {
+            reportActionID: 'action3',
+            actionName: CONST.REPORT.ACTIONS.TYPE.ADD_COMMENT,
+            actorAccountID: OTHER_USER_ACCOUNT_ID,
+            created: '2026-01-01 00:00:00.000',
+            message: [{type: 'COMMENT', html: 'hello', text: 'hello'}],
+            person: [{type: 'TEXT', style: 'strong', text: 'Other User'}],
+        };
+
+        Report.showReportActionNotification(
+            REPORT_ID,
+            reportAction as Parameters<typeof Report.showReportActionNotification>[1],
+            CURRENT_USER_ACCOUNT_ID,
+            CURRENT_USER_LOGIN,
+            CONCIERGE_REPORT_ID,
+        );
+        await waitForBatchedUpdates();
+
+        expect(mockShowCommentNotification).toHaveBeenCalledTimes(1);
+        expect(mockShowModifiedExpenseNotification).not.toHaveBeenCalled();
+    });
+});