Merge pull request Expensify#86672 from dukenv0307/fix/66412-part-5

mollfpr · web-flow · commit 988ae037a072 · 2026-04-06T09:43:07.000+07:00
Refactor buildOptimisticChatReport to use currentUserAccountID from useOnyx
diff --git a/src/libs/ReportUtils.ts b/src/libs/ReportUtils.ts
@@ -7945,6 +7945,8 @@ type BuildOptimisticChatReportParams = {
     optimisticReportID?: string;
     isPinned?: boolean;
     chatReportID?: string;
+    // TODO: This'll be required eventually. Refactor issue: https://github.com/Expensify/App/issues/66412
+    currentUserAccountID?: number;
 };
 
 function buildOptimisticChatReport({
@@ -7965,12 +7967,13 @@ function buildOptimisticChatReport({
     optimisticReportID = '',
     isPinned = false,
     chatReportID = undefined,
+    currentUserAccountID = deprecatedCurrentUserAccountID,
 }: BuildOptimisticChatReportParams): OptimisticChatReport {
     const isWorkspaceChatType = chatType && isWorkspaceChat(chatType);
     const participants = participantList.reduce((reportParticipants: Participants, accountID: number) => {
         const participant: ReportParticipant = {
             notificationPreference,
-            ...(!isWorkspaceChatType && {role: accountID === deprecatedCurrentUserAccountID ? CONST.REPORT.ROLE.ADMIN : CONST.REPORT.ROLE.MEMBER}),
+            ...(!isWorkspaceChatType && {role: accountID === currentUserAccountID ? CONST.REPORT.ROLE.ADMIN : CONST.REPORT.ROLE.MEMBER}),
         };
         // eslint-disable-next-line no-param-reassign
         reportParticipants[accountID] = participant;
diff --git a/src/libs/actions/IOU/PerDiem.ts b/src/libs/actions/IOU/PerDiem.ts
@@ -340,6 +340,7 @@ function getPerDiemExpenseInformation(perDiemExpenseInformation: PerDiemExpenseI
         isNewChatReport = true;
         chatReport = buildOptimisticChatReport({
             participantList: [payerAccountID, payeeAccountID],
+            currentUserAccountID: currentUserAccountIDParam,
         });
     }
 
diff --git a/src/libs/actions/IOU/SendInvoice.ts b/src/libs/actions/IOU/SendInvoice.ts
@@ -620,6 +620,7 @@ function getSendInvoiceInformation({
             participantList: [receiverAccountID, currentUserAccountID],
             chatType: CONST.REPORT.CHAT_TYPE.INVOICE,
             policyID: senderWorkspaceID,
+            currentUserAccountID,
         });
     }
 
diff --git a/src/libs/actions/IOU/SendMoney.ts b/src/libs/actions/IOU/SendMoney.ts
@@ -72,6 +72,7 @@ function getSendMoneyParams({
     created,
     merchant,
     receipt,
+    currentUserAccountID,
 }: {
     report: OnyxEntry<OnyxTypes.Report>;
     quickAction: OnyxEntry<OnyxTypes.QuickAction>;
@@ -84,6 +85,7 @@ function getSendMoneyParams({
     created?: string;
     merchant?: string;
     receipt?: Receipt;
+    currentUserAccountID: number;
 }): SendMoneyParamsData {
     const recipientEmail = addSMSDomainIfPhoneNumber(recipient.login ?? '');
     const recipientAccountID = Number(recipient.accountID);
@@ -104,6 +106,7 @@ function getSendMoneyParams({
     if (!chatReport) {
         chatReport = buildOptimisticChatReport({
             participantList: [recipientAccountID, managerID],
+            currentUserAccountID,
         });
         isNewChat = true;
     }
@@ -503,6 +506,7 @@ function sendMoneyElsewhere(
         created,
         merchant,
         receipt,
+        currentUserAccountID,
     });
     startSpan(CONST.TELEMETRY.SPAN_SUBMIT_TO_DESTINATION_VISIBLE, {
         name: 'submit-to-destination-visible',
@@ -550,6 +554,7 @@ function sendMoneyWithWallet(
         created,
         merchant,
         receipt,
+        currentUserAccountID,
     });
     startSpan(CONST.TELEMETRY.SPAN_SUBMIT_TO_DESTINATION_VISIBLE, {
         name: 'submit-to-destination-visible',
diff --git a/src/libs/actions/IOU/Split.ts b/src/libs/actions/IOU/Split.ts
@@ -878,6 +878,7 @@ function completeSplitBill(
                 existingChatReport ??
                 buildOptimisticChatReport({
                     participantList: participant.accountID ? [participant.accountID, sessionAccountID] : [],
+                    currentUserAccountID: sessionAccountID,
                 });
         }
 
diff --git a/src/libs/actions/IOU/index.ts b/src/libs/actions/IOU/index.ts
@@ -2502,6 +2502,7 @@ function getMoneyRequestInformation(moneyRequestInformation: MoneyRequestInforma
         chatReport = buildOptimisticChatReport({
             participantList: [payerAccountID, payeeAccountID],
             optimisticReportID: optimisticChatReportID,
+            currentUserAccountID: currentUserAccountIDParam,
         });
     }
 
@@ -4416,6 +4417,7 @@ function getOrCreateOptimisticSplitChatReport(existingSplitChatReportID: string
             reportName: '',
             chatType: CONST.REPORT.CHAT_TYPE.GROUP,
             notificationPreference: CONST.REPORT.NOTIFICATION_PREFERENCE.ALWAYS,
+            currentUserAccountID,
         });
 
         return {existingSplitChatReport: null, splitChatReport};
@@ -4424,6 +4426,7 @@ function getOrCreateOptimisticSplitChatReport(existingSplitChatReportID: string
     // Otherwise, create a new 1:1 chat report
     const splitChatReport = buildOptimisticChatReport({
         participantList: participantAccountIDs,
+        currentUserAccountID,
     });
     return {existingSplitChatReport: null, splitChatReport};
 }
@@ -4743,6 +4746,7 @@ function createSplitsAndOnyxData({
                 existingChatReport ??
                 buildOptimisticChatReport({
                     participantList: [accountID, currentUserAccountID],
+                    currentUserAccountID,
                 });
         }
 
diff --git a/src/libs/actions/Policy/Policy.ts b/src/libs/actions/Policy/Policy.ts
@@ -1605,6 +1605,7 @@ function createPolicyExpenseChats(
             policyID,
             ownerAccountID: cleanAccountID,
             notificationPreference,
+            currentUserAccountID: deprecatedSessionAccountID,
         });
 
         // Set correct notification preferences: visible for the submitter, hidden for others until there's activity
diff --git a/src/libs/actions/Report/index.ts b/src/libs/actions/Report/index.ts
@@ -1873,6 +1873,7 @@ function getOptimisticChatReport(accountID: number, currentUserAccountID: number
     return buildOptimisticChatReport({
         participantList: [accountID, currentUserAccountID],
         notificationPreference: CONST.REPORT.NOTIFICATION_PREFERENCE.ALWAYS,
+        currentUserAccountID,
     });
 }
 
@@ -1986,6 +1987,7 @@ function navigateToAndOpenReport(
         newChat = buildOptimisticChatReport({
             participantList: [...participantAccountIDs, currentUserAccountID],
             notificationPreference: CONST.REPORT.NOTIFICATION_PREFERENCE.HIDDEN,
+            currentUserAccountID,
         });
         // We want to pass newChat here because if anything is passed in that param (even an existing chat), we will try to create a chat on the server
         openReport({reportID: newChat?.reportID, introSelected, reportActionID: '', participantLoginList: userLogins, newReportObject: newChat, isSelfTourViewed, betas});
@@ -2026,6 +2028,7 @@ function navigateToAndOpenReportWithAccountIDs(participantAccountIDs: number[],
     if (!chat) {
         newChat = buildOptimisticChatReport({
             participantList: [...participantAccountIDs, currentUserAccountID],
+            currentUserAccountID,
         });
         // We want to pass newChat here because if anything is passed in that param (even an existing chat), we will try to create a chat on the server
         openReport({
@@ -2091,6 +2094,7 @@ function createChildReport(
         parentReportActionID: parentReportAction.reportActionID,
         parentReportID: parentReport?.reportID,
         optimisticReportID: parentReportAction.childReportID,
+        currentUserAccountID,
     });
 
     const childReportID = childReport?.reportID ?? parentReportAction.childReportID;
@@ -3001,6 +3005,7 @@ function toggleSubscribeToChildReport(
             notificationPreference: CONST.REPORT.NOTIFICATION_PREFERENCE.ALWAYS,
             parentReportActionID: parentReportAction.reportActionID,
             parentReportID: parentReport?.reportID,
+            currentUserAccountID,
         });
 
         const participantLogins = PersonalDetailsUtils.getLoginsByAccountIDs(participantAccountIDs);
diff --git a/src/libs/actions/Task.ts b/src/libs/actions/Task.ts
@@ -935,6 +935,7 @@ function setNewOptimisticAssignee(currentUserAccountID: number, assigneePersonal
         policyID: CONST.POLICY.OWNER_EMAIL_FAKE,
         ownerAccountID: CONST.POLICY.OWNER_ACCOUNT_ID_FAKE,
         notificationPreference: CONST.REPORT.NOTIFICATION_PREFERENCE.HIDDEN,
+        currentUserAccountID,
     });
 
     Onyx.set(`${ONYXKEYS.COLLECTION.REPORT}${report.reportID}`, report);
diff --git a/src/libs/actions/TeachersUnite.ts b/src/libs/actions/TeachersUnite.ts
@@ -23,12 +23,13 @@ type ExpenseReportActionData = Record<string, OptimisticCreatedReportAction>;
 /**
  * @param publicRoomReportID - This is the global reportID for the public room, we'll ignore the optimistic one
  */
-function referTeachersUniteVolunteer(partnerUserID: string, firstName: string, lastName: string, policyID: string, publicRoomReportID: string) {
+function referTeachersUniteVolunteer(partnerUserID: string, firstName: string, lastName: string, policyID: string, publicRoomReportID: string, currentUserAccountID: number) {
     const optimisticPublicRoom = buildOptimisticChatReport({
         participantList: [],
         reportName: CONST.TEACHERS_UNITE.PUBLIC_ROOM_NAME,
         chatType: CONST.REPORT.CHAT_TYPE.POLICY_ROOM,
         policyID,
+        currentUserAccountID,
     });
     const optimisticData: Array<OnyxUpdate<typeof ONYXKEYS.COLLECTION.REPORT | typeof ONYXKEYS.COLLECTION.REPORT_METADATA>> = [
         {
@@ -86,6 +87,7 @@ function addSchoolPrincipal(
         isOwnPolicyExpenseChat: true,
         oldPolicyName: policyName,
         optimisticReportID,
+        currentUserAccountID: sessionAccountID,
     });
     const expenseChatReportID = expenseChatData.reportID;
     const expenseReportCreatedAction = buildOptimisticCreatedReportAction(sessionEmail);
diff --git a/src/pages/TeachersUnite/KnowATeacherPage.tsx b/src/pages/TeachersUnite/KnowATeacherPage.tsx
@@ -8,6 +8,7 @@ import HeaderWithBackButton from '@components/HeaderWithBackButton';
 import ScreenWrapper from '@components/ScreenWrapper';
 import Text from '@components/Text';
 import TextInput from '@components/TextInput';
+import useCurrentUserPersonalDetails from '@hooks/useCurrentUserPersonalDetails';
 import useEnvironment from '@hooks/useEnvironment';
 import useLocalize from '@hooks/useLocalize';
 import useOnyx from '@hooks/useOnyx';
@@ -27,6 +28,7 @@ function KnowATeacherPage() {
     const {isProduction} = useEnvironment();
     const [loginList] = useOnyx(ONYXKEYS.LOGIN_LIST);
     const [countryCode = CONST.DEFAULT_COUNTRY_CODE] = useOnyx(ONYXKEYS.COUNTRY_CODE);
+    const {accountID: currentUserAccountID} = useCurrentUserPersonalDetails();
     /**
      * Submit form to pass firstName, partnerUserID and lastName
      */
@@ -39,7 +41,7 @@ function KnowATeacherPage() {
 
         const policyID = isProduction ? CONST.TEACHERS_UNITE.PROD_POLICY_ID : CONST.TEACHERS_UNITE.TEST_POLICY_ID;
         const publicRoomReportID = isProduction ? CONST.TEACHERS_UNITE.PROD_PUBLIC_ROOM_ID : CONST.TEACHERS_UNITE.TEST_PUBLIC_ROOM_ID;
-        TeachersUnite.referTeachersUniteVolunteer(contactMethod, firstName, lastName, policyID, publicRoomReportID);
+        TeachersUnite.referTeachersUniteVolunteer(contactMethod, firstName, lastName, policyID, publicRoomReportID, currentUserAccountID);
     };
 
     /**
diff --git a/src/pages/workspace/WorkspaceNewRoomPage.tsx b/src/pages/workspace/WorkspaceNewRoomPage.tsx
@@ -118,7 +118,8 @@ function WorkspaceNewRoomPage({ref}: WorkspaceNewRoomPageProps) {
      */
     const submit = (values: FormOnyxValues<typeof ONYXKEYS.FORMS.NEW_ROOM_FORM>) => {
         setNewRoomFormLoading();
-        const participants = [session?.accountID ?? CONST.DEFAULT_NUMBER_ID];
+        const currentUserAccountID = session?.accountID ?? CONST.DEFAULT_NUMBER_ID;
+        const participants = [currentUserAccountID];
         const parsedDescription = getParsedComment(values.reportDescription ?? '', {policyID});
         const policyReport = buildOptimisticChatReport({
             participantList: participants,
@@ -130,6 +131,7 @@ function WorkspaceNewRoomPage({ref}: WorkspaceNewRoomPageProps) {
             writeCapability: writeCapability || CONST.REPORT.WRITE_CAPABILITIES.ALL,
             notificationPreference: CONST.REPORT.NOTIFICATION_PREFERENCE.DAILY,
             description: parsedDescription,
+            currentUserAccountID,
         });
 
         // eslint-disable-next-line @typescript-eslint/no-deprecated
diff --git a/tests/actions/IOUTest.ts b/tests/actions/IOUTest.ts
@@ -37,9 +37,16 @@ import {
     replaceReceipt,
     resetDraftTransactionsCustomUnit,
     retractReport,
+    setMoneyRequestAmount,
+    setMoneyRequestBillable,
     setMoneyRequestCategory,
+    setMoneyRequestCreated,
+    setMoneyRequestDateAttribute,
+    setMoneyRequestDescription,
     setMoneyRequestDistanceRate,
+    setMoneyRequestMerchant,
     setMoneyRequestOdometerImage,
+    setMoneyRequestTag,
     shouldOptimisticallyUpdateSearch,
     submitReport,
     updateBulkEditDraftTransaction,
@@ -713,8 +720,8 @@ describe('actions/IOU', () => {
                 shouldGenerateTransactionThreadReport: true,
                 isASAPSubmitBetaEnabled: false,
                 transactionViolations: {},
-                currentUserAccountIDParam: 123,
-                currentUserEmailParam: 'existing@example.com',
+                currentUserAccountIDParam: RORY_ACCOUNT_ID,
+                currentUserEmailParam: RORY_EMAIL,
                 policyRecentlyUsedCurrencies: [],
                 existingTransactionDraft: undefined,
                 draftTransactionIDs: [],
@@ -1375,8 +1382,8 @@ describe('actions/IOU', () => {
                 shouldGenerateTransactionThreadReport: true,
                 isASAPSubmitBetaEnabled: false,
                 transactionViolations: {},
-                currentUserAccountIDParam: 123,
-                currentUserEmailParam: 'existing@example.com',
+                currentUserAccountIDParam: RORY_ACCOUNT_ID,
+                currentUserEmailParam: RORY_EMAIL,
                 policyRecentlyUsedCurrencies: [],
                 existingTransactionDraft: undefined,
                 draftTransactionIDs: [],
@@ -2547,8 +2554,8 @@ describe('actions/IOU', () => {
                         shouldGenerateTransactionThreadReport: true,
                         isASAPSubmitBetaEnabled: false,
                         transactionViolations: {},
-                        currentUserAccountIDParam: 123,
-                        currentUserEmailParam: 'existing@example.com',
+                        currentUserAccountIDParam: RORY_ACCOUNT_ID,
+                        currentUserEmailParam: RORY_EMAIL,
                         policyRecentlyUsedCurrencies: [],
                         quickAction: undefined,
                         isSelfTourViewed: false,
@@ -2634,8 +2641,8 @@ describe('actions/IOU', () => {
                         shouldGenerateTransactionThreadReport: true,
                         isASAPSubmitBetaEnabled: false,
                         transactionViolations: {},
-                        currentUserAccountIDParam: 123,
-                        currentUserEmailParam: 'existing@example.com',
+                        currentUserAccountIDParam: RORY_ACCOUNT_ID,
+                        currentUserEmailParam: RORY_EMAIL,
                         policyRecentlyUsedCurrencies: [],
                         quickAction: undefined,
                         isSelfTourViewed: false,
@@ -15692,6 +15699,66 @@ describe('actions/IOU', () => {
         });
     });
 
+    describe('setMoneyRequest helpers', () => {
+        const transactionID = 'testTransaction123';
+
+        afterEach(async () => {
+            await Onyx.clear();
+            await waitForBatchedUpdates();
+        });
+
+        it('setMoneyRequestAmount should set amount, currency, and shouldShowOriginalAmount on transaction draft', async () => {
+            setMoneyRequestAmount(transactionID, 500, 'EUR', true);
+            await waitForBatchedUpdates();
+            const draft = await getOnyxValue(`${ONYXKEYS.COLLECTION.TRANSACTION_DRAFT}${transactionID}`);
+            expect(draft?.amount).toBe(500);
+            expect(draft?.currency).toBe('EUR');
+            expect(draft?.shouldShowOriginalAmount).toBe(true);
+        });
+
+        it('setMoneyRequestCreated should set created on transaction draft', async () => {
+            setMoneyRequestCreated(transactionID, '2024-01-15', true);
+            await waitForBatchedUpdates();
+            const draft = await getOnyxValue(`${ONYXKEYS.COLLECTION.TRANSACTION_DRAFT}${transactionID}`);
+            expect(draft?.created).toBe('2024-01-15');
+        });
+
+        it('setMoneyRequestDateAttribute should set date attributes on transaction draft', async () => {
+            setMoneyRequestDateAttribute(transactionID, '2024-01-01', '2024-01-31');
+            await waitForBatchedUpdates();
+            const draft = await getOnyxValue(`${ONYXKEYS.COLLECTION.TRANSACTION_DRAFT}${transactionID}`);
+            expect(draft?.comment?.customUnit?.attributes?.dates?.start).toBe('2024-01-01');
+            expect(draft?.comment?.customUnit?.attributes?.dates?.end).toBe('2024-01-31');
+        });
+
+        it('setMoneyRequestDescription should set comment on transaction draft', async () => {
+            setMoneyRequestDescription(transactionID, '  Lunch with team  ', true);
+            await waitForBatchedUpdates();
+            const draft = await getOnyxValue(`${ONYXKEYS.COLLECTION.TRANSACTION_DRAFT}${transactionID}`);
+            expect(draft?.comment?.comment).toBe('Lunch with team');
+        });
+
+        it('setMoneyRequestMerchant should set merchant on transaction draft', async () => {
+            setMoneyRequestMerchant(transactionID, 'Coffee Shop', true);
+            await waitForBatchedUpdates();
+            const draft = await getOnyxValue(`${ONYXKEYS.COLLECTION.TRANSACTION_DRAFT}${transactionID}`);
+            expect(draft?.merchant).toBe('Coffee Shop');
+        });
+
+        it('setMoneyRequestTag should set tag on transaction draft', async () => {
+            setMoneyRequestTag(transactionID, 'Engineering');
+            await waitForBatchedUpdates();
+            const draft = await getOnyxValue(`${ONYXKEYS.COLLECTION.TRANSACTION_DRAFT}${transactionID}`);
+            expect(draft?.tag).toBe('Engineering');
+        });
+
+        it('setMoneyRequestBillable should set billable on transaction draft', async () => {
+            setMoneyRequestBillable(transactionID, true);
+            await waitForBatchedUpdates();
+            const draft = await getOnyxValue(`${ONYXKEYS.COLLECTION.TRANSACTION_DRAFT}${transactionID}`);
+            expect(draft?.billable).toBe(true);
+        });
+    });
     describe('setMoneyRequestOdometerImage and removeMoneyRequestOdometerImage', () => {
         beforeEach(() => {
             jest.mock('@libs/OdometerImageUtils', () => ({
diff --git a/tests/actions/PolicyTest.ts b/tests/actions/PolicyTest.ts
diff --git a/tests/actions/ReportTest.ts b/tests/actions/ReportTest.ts
diff --git a/tests/unit/ReportUtilsTest.ts b/tests/unit/ReportUtilsTest.ts

Original file line number	Diff line number	Diff line change
`@@ -340,6 +340,7 @@ function getPerDiemExpenseInformation(perDiemExpenseInformation: PerDiemExpenseI`
`340`	`340`	`isNewChatReport = true;`
`341`	`341`	`chatReport = buildOptimisticChatReport({`
`342`	`342`	`participantList: [payerAccountID, payeeAccountID],`
	`343`	`+ currentUserAccountID: currentUserAccountIDParam,`
`343`	`344`	`});`
`344`	`345`	`}`
`345`	`346`
Original file line number	Diff line number	Diff line change
`@@ -620,6 +620,7 @@ function getSendInvoiceInformation({`
`620`	`620`	`participantList: [receiverAccountID, currentUserAccountID],`
`621`	`621`	`chatType: CONST.REPORT.CHAT_TYPE.INVOICE,`
`622`	`622`	`policyID: senderWorkspaceID,`
	`623`	`+ currentUserAccountID,`
`623`	`624`	`});`
`624`	`625`	`}`
`625`	`626`
Original file line number	Diff line number	Diff line change
`@@ -878,6 +878,7 @@ function completeSplitBill(`
`878`	`878`	`existingChatReport ??`
`879`	`879`	`buildOptimisticChatReport({`
`880`	`880`	`participantList: participant.accountID ? [participant.accountID, sessionAccountID] : [],`
	`881`	`+ currentUserAccountID: sessionAccountID,`
`881`	`882`	`});`
`882`	`883`	`}`
`883`	`884`