fix: optimistic iou report date not matching

src/libs/ReportUtils.ts

@@ -3205,9 +3205,18 @@ function buildOptimisticTaskCommentReportAction(taskReportID: string, taskTitle:
  * @param chatReportID - Report ID of the chat where the IOU is.
  * @param currency - IOU currency.
  * @param isSendingMoney - If we send money the IOU should be created as settled
+ * @param created - The creation time for IOU action
  */
 
-function buildOptimisticIOUReport(payeeAccountID: number, payerAccountID: number, total: number, chatReportID: string, currency: string, isSendingMoney = false): OptimisticIOUReport {
+function buildOptimisticIOUReport(
+    payeeAccountID: number,
+    payerAccountID: number,
+    total: number,
+    chatReportID: string,
+    currency: string,
+    isSendingMoney = false,
+    created: string = DateUtils.getDBTime(),
+): OptimisticIOUReport {
     const formattedTotal = CurrencyUtils.convertToDisplayString(total, currency);
     const personalDetails = getPersonalDetailsForAccountID(payerAccountID);
     const payerEmail = 'login' in personalDetails ? personalDetails.login : '';
@@ -3233,7 +3242,7 @@ function buildOptimisticIOUReport(payeeAccountID: number, payerAccountID: number
         reportName: `${payerEmail} owes ${formattedTotal}`,
         notificationPreference: CONST.REPORT.NOTIFICATION_PREFERENCE.HIDDEN,
         parentReportID: chatReportID,
-        lastVisibleActionCreated: DateUtils.getDBTime(),
+        lastVisibleActionCreated: created,
     };
 }
 
@@ -3600,7 +3609,7 @@ function buildOptimisticReportPreview(chatReport: OnyxEntry<Report>, iouReport:
     const hasReceipt = TransactionUtils.hasReceipt(transaction);
     const isReceiptBeingScanned = hasReceipt && TransactionUtils.isReceiptBeingScanned(transaction);
     const message = getReportPreviewMessage(iouReport);
-    const created = DateUtils.getDBTime();
+    const created = iouReport.lastVisibleActionCreated ?? DateUtils.getDBTime();
     return {
         reportActionID: NumberUtils.rand64(),
         reportID: chatReport?.reportID,
@@ -4249,10 +4258,10 @@ function buildOptimisticMoneyRequestEntities(
     isOwnPolicyExpenseChat = false,
     isPersonalTrackingExpense = false,
 ): [OptimisticCreatedReportAction, OptimisticCreatedReportAction, OptimisticIOUReportAction, OptimisticChatReport, OptimisticCreatedReportAction] {
-    const createdActionForChat = buildOptimisticCreatedReportAction(payeeEmail);
+    const createdActionForChat = buildOptimisticCreatedReportAction(payeeEmail, iouReport.lastVisibleActionCreated);
 
     // The `CREATED` action must be optimistically generated before the IOU action so that it won't appear after the IOU action in the chat.
-    const iouActionCreationTime = DateUtils.getDBTime();
+    const iouActionCreationTime = iouReport.lastVisibleActionCreated ?? DateUtils.getDBTime();
     const createdActionForIOUReport = buildOptimisticCreatedReportAction(payeeEmail, DateUtils.subtractMillisecondsFromDateTime(iouActionCreationTime, 1));
     const iouAction = buildOptimisticIOUReportAction(
         type,

src/libs/actions/IOU.ts

@@ -490,6 +490,8 @@ function buildOnyxDataForMoneyRequest(
             key: `${ONYXKEYS.COLLECTION.REPORT}${chatReport.reportID}`,
             value: {
                 ...chatReport,
+                // if iouReport exist, the last visible action created time does not change.
+                lastVisibleActionCreated: isNewChatReport ? undefined : iouReport.lastVisibleActionCreated,
                 lastReadTime: DateUtils.getDBTime(),
                 lastMessageTranslationKey: '',
                 iouReportID: iouReport.reportID,
@@ -1166,7 +1168,7 @@ function getMoneyRequestInformation(
     if (!iouReport || shouldCreateNewMoneyRequestReport) {
         iouReport = isPolicyExpenseChat
             ? ReportUtils.buildOptimisticExpenseReport(chatReport.reportID, chatReport.policyID ?? '', payeeAccountID, amount, currency)
-            : ReportUtils.buildOptimisticIOUReport(payeeAccountID, payerAccountID, amount, chatReport.reportID, currency);
+            : ReportUtils.buildOptimisticIOUReport(payeeAccountID, payerAccountID, amount, chatReport.reportID, currency, false, created);
     } else if (isPolicyExpenseChat) {
         iouReport = {...iouReport};
         if (iouReport?.currency === currency && typeof iouReport.total === 'number') {

tests/actions/IOUTest.ts

@@ -246,6 +246,7 @@ describe('actions/IOU', () => {
         it('updates existing chat report if there is one', () => {
             const amount = 10000;
             const comment = 'Giv money plz';
+            const created = DateUtils.getDBTime();
             let chatReport: OnyxTypes.Report = {
                 reportID: '1234',
                 type: CONST.REPORT.TYPE.CHAT,
@@ -254,7 +255,7 @@ describe('actions/IOU', () => {
             const createdAction: OnyxTypes.ReportAction = {
                 reportActionID: NumberUtils.rand64(),
                 actionName: CONST.REPORT.ACTIONS.TYPE.CREATED,
-                created: DateUtils.getDBTime(),
+                created,
             };
             let iouReportID: string | undefined;
             let iouAction: OnyxEntry<OnyxTypes.ReportAction>;
@@ -270,7 +271,7 @@ describe('actions/IOU', () => {
                         }),
                     )
                     .then(() => {
-                        IOU.requestMoney(chatReport, amount, CONST.CURRENCY.USD, '', '', RORY_EMAIL, RORY_ACCOUNT_ID, {login: CARLOS_EMAIL, accountID: CARLOS_ACCOUNT_ID}, comment, {});
+                        IOU.requestMoney(chatReport, amount, CONST.CURRENCY.USD, created, '', RORY_EMAIL, RORY_ACCOUNT_ID, {login: CARLOS_EMAIL, accountID: CARLOS_ACCOUNT_ID}, comment, {});
                         return waitForBatchedUpdates();
                     })
                     .then(
@@ -318,6 +319,10 @@ describe('actions/IOU', () => {
                                         // The CREATED action should not be created after the IOU action
                                         expect(Date.parse(iouCreatedAction?.created ?? '')).toBeLessThan(Date.parse(iouAction?.created ?? ''));
 
+                                        // The iouAction created time should be same as lastVisibleActionCreated
+                                        // To prevent the "New message" from showing up in the report list
+                                        expect(iouAction?.created).toBe(chatReport.lastVisibleActionCreated);
+
                                         // The IOUReportID should be correct
                                         expect(iouAction?.originalMessage?.IOUReportID).toBe(iouReportID);