Skip to content

fix copy text for split action #30742

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

Merged
deetergp merged 3 commits into from
Nov 7, 2023
Merged

fix copy text for split action #30742

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
031dcf2
fix copy text for split action
hungvu193 Nov 2, 2023
f380917
Merge remote-tracking branch 'origin/main' into fix-30286
hungvu193 Nov 3, 2023
13d9d8a
cleanup a little bit
hungvu193 Nov 3, 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
37 changes: 18 additions & 19 deletions src/libs/ReportUtils.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4066,14 +4066,14 @@ function getParticipantsIDs(report) {
*/
function getIOUReportActionDisplayMessage(reportAction) {
const originalMessage = _.get(reportAction, 'originalMessage', {});
let displayMessage;
let translationKey;
if (originalMessage.type === CONST.IOU.REPORT_ACTION_TYPE.PAY) {
const {IOUReportID} = originalMessage;
const {amount, currency} = originalMessage.IOUDetails;
const formattedAmount = CurrencyUtils.convertToDisplayString(amount, currency);
const iouReport = getReport(IOUReportID);
const payerName = isExpenseReport(iouReport) ? getPolicyName(iouReport) : getDisplayNameForParticipant(iouReport.managerID, true);
let translationKey;

switch (originalMessage.paymentType) {
case CONST.IOU.PAYMENT_TYPE.ELSEWHERE:
translationKey = 'iou.paidElsewhereWithAmount';
Expand All @@ -4086,24 +4086,23 @@ function getIOUReportActionDisplayMessage(reportAction) {
translationKey = '';
break;
}
displayMessage = Localize.translateLocal(translationKey, {amount: formattedAmount, payer: payerName});
} else {
const transaction = TransactionUtils.getTransaction(originalMessage.IOUTransactionID);
const {amount, currency, comment} = getTransactionDetails(transaction);
const formattedAmount = CurrencyUtils.convertToDisplayString(amount, currency);
const isRequestSettled = isSettled(originalMessage.IOUReportID);
if (isRequestSettled) {
displayMessage = Localize.translateLocal('iou.payerSettled', {
amount: formattedAmount,
});
} else {
displayMessage = Localize.translateLocal('iou.requestedAmount', {
formattedAmount,
comment,
});
}
return Localize.translateLocal(translationKey, {amount: formattedAmount, payer: payerName});
}
return displayMessage;

const transaction = TransactionUtils.getTransaction(originalMessage.IOUTransactionID);
const {amount, currency, comment} = getTransactionDetails(transaction);
const formattedAmount = CurrencyUtils.convertToDisplayString(amount, currency);
const isRequestSettled = isSettled(originalMessage.IOUReportID);
if (isRequestSettled) {
return Localize.translateLocal('iou.payerSettled', {
amount: formattedAmount,
});
}
translationKey = ReportActionsUtils.isSplitBillAction(reportAction) ? 'iou.didSplitAmount' : 'iou.requestedAmount';
return Localize.translateLocal(translationKey, {
formattedAmount,
comment,
});
}

/**
Expand Down