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

Update optimistic data to match IOU action notification templates, send back additional data needed by Settle Up templates #17090

Merged
merged 8 commits into from
May 2, 2023
Merged

Update optimistic data to match IOU action notification templates, send back additional data needed by Settle Up templates #17090

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
fb31ecd
send back amount and currency
jasperhuangg Apr 6, 2023
e8876c9
remove unused import
jasperhuangg Apr 6, 2023
f6ecb30
remove unused param
jasperhuangg Apr 12, 2023
15001c1
Merge branch 'main' of github.com:Expensify/App into jasper-notificat…
jasperhuangg Apr 12, 2023
248037e
merge main
jasperhuangg Apr 19, 2023
152c07b
fix merge
jasperhuangg Apr 19, 2023
a26734e
Merge branch 'main' of github.com:Expensify/App into jasper-notificat…
jasperhuangg Apr 21, 2023
febfc17
remove passing currency and amount through to Auth
jasperhuangg Apr 21, 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
10 changes: 3 additions & 7 deletions src/libs/ReportUtils.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1007,10 +1007,6 @@ function buildOptimisticIOUReport(ownerEmail, userEmail, total, chatReportID, cu
*/
function getIOUReportActionMessage(type, total, participants, comment, currency, paymentType = '', isSettlingUp = false) {
const amount = NumberFormatUtils.format(preferredLocale, total / 100, {style: 'currency', currency});
const displayNames = _.map(participants, participant => getDisplayNameForParticipant(participant.login, true));
const who = displayNames.length < 3
? displayNames.join(' and ')
: `${displayNames.slice(0, -1).join(', ')}, and ${_.last(displayNames)}`;
jasperhuangg marked this conversation as resolved.
Show resolved Hide resolved
let paymentMethodMessage;
switch (paymentType) {
case CONST.IOU.PAYMENT_TYPE.EXPENSIFY:
Expand All @@ -1029,10 +1025,10 @@ function getIOUReportActionMessage(type, total, participants, comment, currency,
let iouMessage;
switch (type) {
case CONST.IOU.REPORT_ACTION_TYPE.CREATE:
iouMessage = `Requested ${amount} from ${who}${comment && ` for ${comment}`}`;
iouMessage = `Requested ${amount}${comment && ` for ${comment}`}`;
break;
case CONST.IOU.REPORT_ACTION_TYPE.SPLIT:
iouMessage = `Split ${amount} with ${who}${comment && ` for ${comment}`}`;
iouMessage = `Split ${amount}${comment && ` for ${comment}`}`;
break;
case CONST.IOU.REPORT_ACTION_TYPE.CANCEL:
iouMessage = `Cancelled the ${amount} request${comment && ` for ${comment}`}`;
Expand All @@ -1042,7 +1038,7 @@ function getIOUReportActionMessage(type, total, participants, comment, currency,
break;
case CONST.IOU.REPORT_ACTION_TYPE.PAY:
iouMessage = isSettlingUp
? `Settled up${paymentMethodMessage}`
? `Settled up ${amount}${paymentMethodMessage}`
: `Sent ${amount}${comment && ` for ${comment}`}${paymentMethodMessage}`;
break;
default:
Expand Down
2 changes: 2 additions & 0 deletions src/libs/actions/IOU.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -875,6 +875,8 @@ function getPayMoneyRequestParams(chatReport, iouReport, recipient, paymentMetho
chatReportID: chatReport.reportID,
reportActionID: optimisticIOUReportAction.reportActionID,
paymentMethodType,
amount: iouReport.total,
currency: iouReport.currency,
},
optimisticData,
successData,
Expand Down