Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix message in LHN when scanning #28244

Merged
merged 11 commits into from
Oct 4, 2023
Merged

fix message in LHN when scanning #28244

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
0f2a90b
fix message in LHN when scanning
DylanDylann Sep 26, 2023
70216cd
merge main
DylanDylann Sep 27, 2023
ee92b09
fix: add condition in get report preview message
DylanDylann Sep 27, 2023
241cd41
fix: lint
DylanDylann Sep 27, 2023
35a91da
fix lint
DylanDylann Sep 27, 2023
bf3eef6
fix case there are many request
DylanDylann Sep 27, 2023
1175311
fix: update last message translation key when call request money api
DylanDylann Sep 28, 2023
9163111
Merge branch 'main' into fix/27697
DylanDylann Sep 28, 2023
9e57296
pass iouReportAction if last message is REPORTPREVIEW
DylanDylann Sep 28, 2023
2e7bde2
pass MoneyReportAction if last message is REPORTPREVIEW
DylanDylann Sep 28, 2023
f1b58ee
fix line
DylanDylann Sep 28, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion src/libs/OptionsListUtils.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -393,7 +393,14 @@ function getLastMessageTextForReport(report) {
lastMessageTextFromReport = ReportUtils.getReportPreviewMessage(report, lastReportAction, true);
} else if (ReportActionUtils.isReportPreviewAction(lastReportAction)) {
const iouReport = ReportUtils.getReport(ReportActionUtils.getIOUReportIDFromReportActionPreview(lastReportAction));
lastMessageTextFromReport = ReportUtils.getReportPreviewMessage(iouReport, lastReportAction);
const lastIOUMoneyReport = _.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);
} else if (ReportActionUtils.isModifiedExpenseAction(lastReportAction)) {
const properSchemaForModifiedExpenseMessage = ReportUtils.getModifiedExpenseMessage(lastReportAction);
lastMessageTextFromReport = ReportUtils.formatReportLastMessageText(properSchemaForModifiedExpenseMessage, true);
Expand Down
1 change: 1 addition & 0 deletions src/libs/actions/IOU.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,6 +154,7 @@ function buildOnyxDataForMoneyRequest(
value: {
...chatReport,
lastReadTime: DateUtils.getDBTime(),
lastMessageTranslationKey: '',
DylanDylann marked this conversation as resolved.
Show resolved Hide resolved
hasOutstandingIOU: iouReport.total !== 0,
iouReportID: iouReport.reportID,
...(isNewChatReport ? {pendingFields: {createChat: CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD}} : {}),
Expand Down
Loading