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

Rename Money Request/Split/Pay step header names #53004

Merged
merged 5 commits into from
Nov 25, 2024
Merged

Rename Money Request/Split/Pay step header names #53004

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
45dfede
rename IOU request step header names
c3024 Nov 23, 2024
3288634
fix lint
c3024 Nov 23, 2024
bb4ed92
remove redundant code
c3024 Nov 24, 2024
4895a2d
fix lint
c3024 Nov 24, 2024
7700226
remove unused variable
c3024 Nov 24, 2024
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
2 changes: 2 additions & 0 deletions src/languages/en.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -843,6 +843,8 @@ const translations = {
submitExpense: 'Submit expense',
createExpense: 'Create expense',
trackExpense: 'Track expense',
chooseRecipient: 'Choose recipient',
confirmDetails: 'Confirm details',
pay: 'Pay',
cancelPayment: 'Cancel payment',
cancelPaymentConfirmation: 'Are you sure that you want to cancel this payment?',
Expand Down
2 changes: 2 additions & 0 deletions src/languages/es.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -838,6 +838,8 @@ const translations = {
createExpense: 'Crear gasto',
paySomeone: ({name}: PaySomeoneParams = {}) => `Pagar a ${name ?? 'alguien'}`,
trackExpense: 'Seguimiento de gastos',
chooseRecipient: 'Elige destinatario',
confirmDetails: 'Confirma los detalles',
pay: 'Pagar',
cancelPayment: 'Cancelar el pago',
cancelPaymentConfirmation: '¿Estás seguro de que quieres cancelar este pago?',
Expand Down
4 changes: 2 additions & 2 deletions src/pages/iou/request/IOURequestStartPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,11 +50,11 @@ function IOURequestStartPage({
const {canUseCombinedTrackSubmit} = usePermissions();

const tabTitles = {
[CONST.IOU.TYPE.REQUEST]: translate('iou.submitExpense'),
[CONST.IOU.TYPE.REQUEST]: translate('iou.createExpense'),
[CONST.IOU.TYPE.SUBMIT]: canUseCombinedTrackSubmit ? translate('iou.createExpense') : translate('iou.submitExpense'),
[CONST.IOU.TYPE.SEND]: translate('iou.paySomeone', {name: ReportUtils.getPayeeName(report)}),
[CONST.IOU.TYPE.PAY]: translate('iou.paySomeone', {name: ReportUtils.getPayeeName(report)}),
[CONST.IOU.TYPE.SPLIT]: translate('iou.splitExpense'),
[CONST.IOU.TYPE.SPLIT]: translate('iou.createExpense'),
[CONST.IOU.TYPE.TRACK]: canUseCombinedTrackSubmit ? translate('iou.createExpense') : translate('iou.trackExpense'),
[CONST.IOU.TYPE.INVOICE]: translate('workspace.invoices.sendInvoice'),
[CONST.IOU.TYPE.CREATE]: translate('iou.createExpense'),
Expand Down
12 changes: 6 additions & 6 deletions src/pages/iou/request/step/IOURequestStepConfirmation.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,25 +113,25 @@ function IOURequestStepConfirmation({
return translate('iou.categorize');
}
if (isSubmittingFromTrackExpense) {
return translate('iou.submitExpense');
return translate('iou.confirmDetails');
}
if (isSharingTrackExpense) {
return translate('iou.share');
}
if (iouType === CONST.IOU.TYPE.SPLIT) {
return translate('iou.splitExpense');
return translate('iou.confirmDetails');
}
if (iouType === CONST.IOU.TYPE.TRACK) {
return translate('iou.trackExpense');
return translate('iou.confirmDetails');
}
if (iouType === CONST.IOU.TYPE.PAY) {
return translate('iou.paySomeone', {name: ReportUtils.getPayeeName(report)});
return translate('iou.confirmDetails');
}
if (iouType === CONST.IOU.TYPE.INVOICE) {
return translate('workspace.invoices.sendInvoice');
}
return translate('iou.submitExpense');
}, [iouType, report, translate, isSharingTrackExpense, isCategorizingTrackExpense, isSubmittingFromTrackExpense]);
return translate('iou.confirmDetails');
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We should remove isSubmittingFromTrackExpense, CONST.IOU.TYPE.SPLIT, CONST.IOU.TYPE.TRACK, PAY blocks

}, [iouType, translate, isSharingTrackExpense, isCategorizingTrackExpense, isSubmittingFromTrackExpense]);

const participants = useMemo(
() =>
Expand Down
4 changes: 2 additions & 2 deletions src/pages/iou/request/step/IOURequestStepParticipants.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ function IOURequestStepParticipants({
return translate('iou.categorize');
}
if (action === CONST.IOU.ACTION.SUBMIT) {
return translate('iou.submitExpense');
return translate('iou.chooseRecipient');
}
if (action === CONST.IOU.ACTION.SHARE) {
return translate('iou.share');
Expand All @@ -63,7 +63,7 @@ function IOURequestStepParticipants({
if (iouType === CONST.IOU.TYPE.INVOICE) {
return translate('workspace.invoices.sendInvoice');
}
return translate('iou.submitExpense');
return translate('iou.chooseRecipient');
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same as above

}, [iouType, translate, isSplitRequest, action]);

const selfDMReportID = useMemo(() => ReportUtils.findSelfDMReportID(), []);
Expand Down
Loading