From 103c7cc397401f420e56f0ef919d4366fbbf318f Mon Sep 17 00:00:00 2001 From: Vit Horacek Date: Wed, 13 Dec 2023 22:42:52 +0100 Subject: [PATCH 1/2] Use plural to match OldDot --- src/libs/NextStepUtils.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/libs/NextStepUtils.ts b/src/libs/NextStepUtils.ts index ac5c999d5388..b58f2af1eeac 100644 --- a/src/libs/NextStepUtils.ts +++ b/src/libs/NextStepUtils.ts @@ -15,9 +15,9 @@ function parseMessage(messages: Message[] | undefined) { }); const formattedHtml = nextStepHTML - .replace(/%expenses/g, 'this expense') - .replace(/%Expenses/g, 'This expense') - .replace(/%tobe/g, 'is'); + .replace(/%expenses/g, 'these expenses') + .replace(/%Expenses/g, 'These expenses') + .replace(/%tobe/g, 'are'); return `${formattedHtml}`; } From a24f77b27fce2d79302e2076a32461e595684183 Mon Sep 17 00:00:00 2001 From: Vit Horacek Date: Wed, 13 Dec 2023 23:16:27 +0100 Subject: [PATCH 2/2] Update variable name --- src/libs/OptionsListUtils.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/libs/OptionsListUtils.js b/src/libs/OptionsListUtils.js index 95a8c52649d3..4da344c3608b 100644 --- a/src/libs/OptionsListUtils.js +++ b/src/libs/OptionsListUtils.js @@ -390,14 +390,14 @@ function getLastMessageTextForReport(report) { lastMessageTextFromReport = ReportUtils.formatReportLastMessageText(properSchemaForMoneyRequestMessage); } else if (ReportActionUtils.isReportPreviewAction(lastReportAction)) { const iouReport = ReportUtils.getReport(ReportActionUtils.getIOUReportIDFromReportActionPreview(lastReportAction)); - const lastIOUMoneyReport = _.find( + const lastIOUMoneyReportAction = _.find( allSortedReportActions[iouReport.reportID], (reportAction, key) => ReportActionUtils.shouldReportActionBeVisible(reportAction, key) && reportAction.pendingAction !== CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE && ReportActionUtils.isMoneyRequestAction(reportAction), ); - lastMessageTextFromReport = ReportUtils.getReportPreviewMessage(iouReport, lastIOUMoneyReport, true, ReportUtils.isChatReport(report)); + lastMessageTextFromReport = ReportUtils.getReportPreviewMessage(iouReport, lastIOUMoneyReportAction, true, ReportUtils.isChatReport(report)); } else if (ReportActionUtils.isReimbursementQueuedAction(lastReportAction)) { lastMessageTextFromReport = ReportUtils.getReimbursementQueuedActionMessage(lastReportAction, report); } else if (ReportActionUtils.isReimbursementDeQueuedAction(lastReportAction)) {