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.

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

Tweaks to the expense flow #53760

Open
wants to merge 36 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 27 commits
Commits
Show all changes
36 commits
Select commit Hold shift + click to select a range
49269d0
remove the Just track it button
JKobrynski Dec 9, 2024
7a2556d
add the create $amount expense label
JKobrynski Dec 9, 2024
103bf6c
add Workspace and Personal sections to recipients list
JKobrynski Dec 10, 2024
50bbaaa
Merge branch 'main' into JKobrynski/feat/tweaks-to-create-expense-flow
JKobrynski Dec 11, 2024
3464608
Merge remote-tracking branch 'upstream/main' into JKobrynski/feat/twe…
JKobrynski Dec 11, 2024
052b1ff
update translation, add return type
JKobrynski Dec 11, 2024
520ec32
Merge remote-tracking branch 'upstream/main' into JKobrynski/feat/twe…
JKobrynski Dec 12, 2024
676a76d
put default workspace on top of the list
JKobrynski Dec 13, 2024
ff2fcc4
Merge remote-tracking branch 'upstream/main' into JKobrynski/feat/twe…
JKobrynski Dec 13, 2024
3bdf6d2
Merge remote-tracking branch 'upstream/main' into JKobrynski/feat/twe…
JKobrynski Dec 16, 2024
b1e5d19
Merge remote-tracking branch 'upstream/main' into JKobrynski/feat/twe…
JKobrynski Dec 17, 2024
c4fb54a
replace id fallbacks with CONST.DEFAULT_NUMBER_ID
JKobrynski Dec 17, 2024
50ebfa5
rename recentWorkspaceChats to workspaceChats
JKobrynski Dec 17, 2024
9e9e428
separate all workspace chats, not just recents
JKobrynski Dec 17, 2024
9848008
filter selfDMChat option
JKobrynski Dec 17, 2024
efe51d4
replace id fallbacks with CONST.DEFAULT_NUMBER_ID
JKobrynski Dec 17, 2024
398feac
fix ids rule
JKobrynski Dec 17, 2024
927ee63
Merge remote-tracking branch 'upstream/main' into JKobrynski/feat/twe…
JKobrynski Dec 18, 2024
9b2c48d
Merge remote-tracking branch 'upstream/main' into JKobrynski/feat/twe…
JKobrynski Dec 19, 2024
0bf0562
export getReport from ReportUtils
JKobrynski Dec 19, 2024
53adb31
simplify workspace filtering, fix no results found condition
JKobrynski Dec 19, 2024
2764399
Merge remote-tracking branch 'upstream/main' into JKobrynski/feat/twe…
JKobrynski Dec 19, 2024
e1447e9
replace isPolicyExpenseChat with isOwnPolicyExpenseChat
JKobrynski Dec 20, 2024
8aa913d
Merge remote-tracking branch 'upstream/main' into JKobrynski/feat/twe…
JKobrynski Dec 20, 2024
dd65178
Merge remote-tracking branch 'upstream/main' into JKobrynski/feat/twe…
JKobrynski Dec 20, 2024
d56d865
remove ReportUtils.getReport references
JKobrynski Dec 20, 2024
5f6ffce
filter out archived workspaces
JKobrynski Dec 20, 2024
70ca10d
Merge remote-tracking branch 'upstream/main' into JKobrynski/feat/twe…
JKobrynski Dec 20, 2024
f246b59
remove limit of displayed workspaces
JKobrynski Dec 20, 2024
a652bd5
Merge remote-tracking branch 'upstream/main' into JKobrynski/feat/twe…
JKobrynski Dec 27, 2024
6a6207d
fix id fallbacks
JKobrynski Dec 27, 2024
9f49eed
fix id fallback in MoneyRequestParticipantsSelector
JKobrynski Dec 27, 2024
28d4fef
Merge remote-tracking branch 'upstream/main' into JKobrynski/feat/twe…
JKobrynski Dec 30, 2024
eee9a5b
revert ID fallback changes in OptionsListUtils.ts
JKobrynski Dec 30, 2024
ad595ec
remove unnecessary empty line
JKobrynski Dec 30, 2024
3c27b60
fix optional parameters
JKobrynski Dec 31, 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
4 changes: 2 additions & 2 deletions src/components/MoneyRequestConfirmationList.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -425,7 +425,7 @@ function MoneyRequestConfirmationList({
text = translate('common.next');
}
} else if (isTypeTrackExpense) {
text = translate('iou.trackExpense');
text = translate('iou.createExpenseWithAmount', {amount: formattedAmount});
} else if (isTypeSplit && iouAmount === 0) {
text = translate('iou.splitExpense');
} else if ((receiptPath && isTypeRequest) || isDistanceRequestWithPendingRoute) {
Expand All @@ -434,7 +434,7 @@ function MoneyRequestConfirmationList({
text = translate('iou.submitAmount', {amount: formattedAmount});
}
} else {
const translationKey = isTypeSplit ? 'iou.splitAmount' : 'iou.submitAmount';
const translationKey = isTypeSplit ? 'iou.splitAmount' : 'iou.createExpenseWithAmount';
text = translate(translationKey, {amount: formattedAmount});
}
return [
Expand Down
1 change: 1 addition & 0 deletions src/languages/en.ts
Original file line number Diff line number Diff line change
Expand Up @@ -878,6 +878,7 @@ const translations = {
createExpense: 'Create expense',
trackExpense: 'Track expense',
chooseRecipient: 'Choose recipient',
createExpenseWithAmount: ({amount}: {amount: string}) => `Create ${amount} expense`,
confirmDetails: 'Confirm details',
pay: 'Pay',
cancelPayment: 'Cancel payment',
Expand Down
1 change: 1 addition & 0 deletions src/languages/es.ts
Original file line number Diff line number Diff line change
Expand Up @@ -874,6 +874,7 @@ const translations = {
trackExpense: 'Seguimiento de gastos',
chooseRecipient: 'Elige destinatario',
confirmDetails: 'Confirma los detalles',
createExpenseWithAmount: ({amount}: {amount: string}) => `Crear un gasto de ${amount}`,
pay: 'Pagar',
cancelPayment: 'Cancelar el pago',
cancelPaymentConfirmation: '¿Estás seguro de que quieres cancelar este pago?',
Expand Down
Loading
Loading