Update system message CREATED_REPORT_FOR_UNAPPROVED_TRANSACTIONS when original report is deleted #81283
Merged
cristipaval merged 17 commits intoExpensify:mainfrom Mar 4, 2026
Conversation
…message When a report is deleted, reportName becomes empty causing an empty anchor link. This change displays the plain reportID (e.g., #123456) instead when reportName is not available, ensuring the message remains meaningful across all languages.
|
Hey, I noticed you changed If you want to automatically generate translations for other locales, an Expensify employee will have to:
Alternatively, if you are an external contributor, you can run the translation script locally with your own OpenAI API key. To learn more, try running: npx ts-node ./scripts/generateTranslations.ts --helpTypically, you'd want to translate only what you changed by running |
Contributor
Author
|
@cristipaval can you help to trigger translation workflow here? Thank you. |
This comment has been minimized.
This comment has been minimized.
- Add "deleted report" text when reportName is empty across all language files - Update test to verify "deleted report" text is included
Contributor
Author
|
@cristipaval |
Changed from embedded ternary to complete separate sentences for better translation quality. Translators now see full context for both cases: - When report exists: link with report name - When report deleted: text with reportID This improves translation accuracy across all 10 languages.
Contributor
Author
|
@cristipaval when you have a moment, can you help to trigger translation workflow here? I just updated the message again |
Contributor
🦜 Polyglot Parrot! 🦜Squawk! Looks like you added some shiny new English strings. Allow me to parrot them back to you in other tongues: View the translation diffdiff --git a/src/languages/de.ts b/src/languages/de.ts
index 422b5377..4e8ff424 100644
--- a/src/languages/de.ts
+++ b/src/languages/de.ts
@@ -927,8 +927,8 @@ const translations: TranslationDeepObject<typeof en> = {
`hat diesen Bericht erstellt, um alle Ausgaben aus <a href="${reportUrl}">${reportName}</a> aufzunehmen, die nicht mit der von dir gewählten Häufigkeit eingereicht werden konnten`,
createdReportForUnapprovedTransactions: ({reportUrl, reportName, reportID, isReportDeleted}: CreatedReportForUnapprovedTransactionsParams) =>
isReportDeleted
- ? `erstellte diesen Bericht für alle zurückgehaltenen Ausgaben aus gelöschtem Bericht #${reportID}`
- : `erstellte diesen Bericht für alle zurückgehaltenen Ausgaben aus <a href="${reportUrl}">${reportName}</a>`,
+ ? `hat diesen Bericht für alle zurückgehaltenen Ausgaben aus dem gelöschten Bericht #${reportID} erstellt`
+ : `hat diesen Bericht für alle zurückgehaltenen Ausgaben aus <a href="${reportUrl}">${reportName}</a> erstellt`,
},
mentionSuggestions: {
hereAlternateText: 'Alle in dieser Unterhaltung benachrichtigen',
diff --git a/src/languages/fr.ts b/src/languages/fr.ts
index 094e0cb8..2fb2b0d2 100644
--- a/src/languages/fr.ts
+++ b/src/languages/fr.ts
@@ -931,8 +931,8 @@ const translations: TranslationDeepObject<typeof en> = {
`a créé cette note de frais pour regrouper toutes les dépenses de <a href="${reportUrl}">${reportName}</a> qui n'ont pas pu être soumises à la fréquence que vous avez choisie`,
createdReportForUnapprovedTransactions: ({reportUrl, reportName, reportID, isReportDeleted}: CreatedReportForUnapprovedTransactionsParams) =>
isReportDeleted
- ? `a créé cette note de frais pour toutes les dépenses en attente de rapport supprimé #${reportID}`
- : `a créé cette note de frais pour toutes les dépenses en attente de <a href="${reportUrl}">${reportName}</a>`,
+ ? `a créé cette note de frais pour toutes les dépenses retenues de la note de frais supprimée n°${reportID}`
+ : `a créé cette note de frais pour toutes les dépenses retenues provenant de <a href="${reportUrl}">${reportName}</a>`,
},
mentionSuggestions: {
hereAlternateText: 'Notifier tout le monde dans cette conversation',
diff --git a/src/languages/it.ts b/src/languages/it.ts
index d9d84c7a..7f05698d 100644
--- a/src/languages/it.ts
+++ b/src/languages/it.ts
@@ -927,7 +927,7 @@ const translations: TranslationDeepObject<typeof en> = {
`ha creato questo report per raccogliere tutte le spese da <a href="${reportUrl}">${reportName}</a> che non potevano essere inviate con la frequenza scelta`,
createdReportForUnapprovedTransactions: ({reportUrl, reportName, reportID, isReportDeleted}: CreatedReportForUnapprovedTransactionsParams) =>
isReportDeleted
- ? `ha creato questo report per tutte le spese in sospeso da report eliminato #${reportID}`
+ ? `ha creato questo rendiconto per tutte le spese in sospeso dal rendiconto eliminato n. ${reportID}`
: `ha creato questo report per tutte le spese in sospeso da <a href="${reportUrl}">${reportName}</a>`,
},
mentionSuggestions: {
diff --git a/src/languages/ja.ts b/src/languages/ja.ts
index 09dcf0b3..94854bd1 100644
--- a/src/languages/ja.ts
+++ b/src/languages/ja.ts
@@ -923,8 +923,8 @@ const translations: TranslationDeepObject<typeof en> = {
`選択した頻度で提出できなかった、<a href="${reportUrl}">${reportName}</a> のすべての経費を保持するためにこのレポートを作成しました`,
createdReportForUnapprovedTransactions: ({reportUrl, reportName, reportID, isReportDeleted}: CreatedReportForUnapprovedTransactionsParams) =>
isReportDeleted
- ? `削除されたレポート #${reportID} から保留中の経費を対象としてこのレポートを作成しました`
- : `<a href="${reportUrl}">${reportName}</a> から保留中の経費を対象としてこのレポートを作成しました`,
+ ? `削除されたレポート #${reportID} に保留されていた経費のためにこのレポートを作成しました`
+ : `<a href="${reportUrl}">${reportName}</a> の保留中経費すべてに対してこのレポートを作成しました`,
},
mentionSuggestions: {
hereAlternateText: 'この会話の全員に通知',
diff --git a/src/languages/nl.ts b/src/languages/nl.ts
index 1ba072ef..466d374b 100644
--- a/src/languages/nl.ts
+++ b/src/languages/nl.ts
@@ -926,8 +926,8 @@ const translations: TranslationDeepObject<typeof en> = {
`heeft dit rapport gemaakt om alle uitgaven van <a href="${reportUrl}">${reportName}</a> te bewaren die niet konden worden ingediend op de door jou gekozen frequentie`,
createdReportForUnapprovedTransactions: ({reportUrl, reportName, reportID, isReportDeleted}: CreatedReportForUnapprovedTransactionsParams) =>
isReportDeleted
- ? `heeft dit rapport gemaakt voor uitgestelde uitgaven van verwijderd rapport #${reportID}`
- : `heeft dit rapport gemaakt voor uitgestelde uitgaven van <a href="${reportUrl}">${reportName}</a>`,
+ ? `heeft dit rapport gemaakt voor alle vastgehouden uitgaven uit verwijderd rapport nr. ${reportID}`
+ : `heeft dit rapport gemaakt voor alle vastgehouden uitgaven van <a href="${reportUrl}">${reportName}</a>`,
},
mentionSuggestions: {
hereAlternateText: 'Laat iedereen in dit gesprek een melding krijgen',
diff --git a/src/languages/pl.ts b/src/languages/pl.ts
index f4d85a7f..257b492e 100644
--- a/src/languages/pl.ts
+++ b/src/languages/pl.ts
@@ -927,8 +927,8 @@ const translations: TranslationDeepObject<typeof en> = {
`utworzył(-a) ten raport, aby zawierał wszystkie wydatki z <a href="${reportUrl}">${reportName}</a>, których nie można było złożyć z wybraną przez Ciebie częstotliwością`,
createdReportForUnapprovedTransactions: ({reportUrl, reportName, reportID, isReportDeleted}: CreatedReportForUnapprovedTransactionsParams) =>
isReportDeleted
- ? `utworzył/-a ten raport dla wszystkich wstrzymanych wydatków z usuniętego raportu #${reportID}`
- : `utworzył/-a ten raport dla wszystkich wstrzymanych wydatków z <a href="${reportUrl}">${reportName}</a>`,
+ ? `utworzono ten raport dla wszystkich wstrzymanych wydatków z usuniętego raportu nr ${reportID}`
+ : `utworzył(-a) ten raport dla wszystkich wstrzymanych wydatków z <a href="${reportUrl}">${reportName}</a>`,
},
mentionSuggestions: {
hereAlternateText: 'Powiadom wszystkich w tej konwersacji',
diff --git a/src/languages/pt-BR.ts b/src/languages/pt-BR.ts
index e0133cde..5066195b 100644
--- a/src/languages/pt-BR.ts
+++ b/src/languages/pt-BR.ts
@@ -926,8 +926,8 @@ const translations: TranslationDeepObject<typeof en> = {
`criou este relatório para manter todas as despesas de <a href="${reportUrl}">${reportName}</a> que não puderam ser enviadas na frequência escolhida por você`,
createdReportForUnapprovedTransactions: ({reportUrl, reportName, reportID, isReportDeleted}: CreatedReportForUnapprovedTransactionsParams) =>
isReportDeleted
- ? `criou este relatório para quaisquer despesas em espera de relatório excluído #${reportID}`
- : `criou este relatório para quaisquer despesas em espera de <a href="${reportUrl}">${reportName}</a>`,
+ ? `criou este relatório para quaisquer despesas retidas do relatório excluído nº ${reportID}`
+ : `criou este relatório para quaisquer despesas retidas de <a href="${reportUrl}">${reportName}</a>`,
},
mentionSuggestions: {
hereAlternateText: 'Notificar todas as pessoas nesta conversa',
diff --git a/src/languages/zh-hans.ts b/src/languages/zh-hans.ts
index de32afcd..0488cc58 100644
--- a/src/languages/zh-hans.ts
+++ b/src/languages/zh-hans.ts
@@ -914,9 +914,7 @@ const translations: TranslationDeepObject<typeof en> = {
asCopilot: '作为副驾驶，用于',
harvestCreatedExpenseReport: (reportUrl: string, reportName: string) => `创建了此报销单，用于保存所有来自 <a href="${reportUrl}">${reportName}</a> 且无法按照你选择的频率提交的费用`,
createdReportForUnapprovedTransactions: ({reportUrl, reportName, reportID, isReportDeleted}: CreatedReportForUnapprovedTransactionsParams) =>
- isReportDeleted
- ? `从已删除的报告 #${reportID}创建了此报表，用于查看任何被暂扣的报销费用`
- : `从<a href="${reportUrl}">${reportName}</a>创建了此报表，用于查看任何被暂扣的报销费用`,
+ isReportDeleted ? `为已删除报销单 #${reportID} 中的所有暂挂报销创建了此报销单` : `为从<a href="${reportUrl}">${reportName}</a>中被暂挂的任何报销创建了此报表`,
},
mentionSuggestions: {
hereAlternateText: '通知此会话中的所有人',
Note You can apply these changes to your branch by copying the patch to your clipboard, then running |
Codecov Report❌ Looks like you've decreased code coverage for some files. Please write tests to increase, or at least maintain, the existing level of code coverage. See our documentation here for how to interpret this table.
|
|
@parasharrajat Please copy/paste the Reviewer Checklist from here into a new comment on this PR and complete it. If you have the K2 extension, you can simply click: [this button] |
![github-actions[bot]](https://avatars.githubusercontent.com/in/15368?s=60&v=4){kind=small}
Contributor
Author
|
@cristipaval, just wanna confirm, are you working on BE PR for this? #81283 (comment) |
Contributor
|
@hoangzinh yes, I'm opening a PR asap. |
Member
|
@hoangzinh Can you please update the title to have HOLD so that we are clear that we are waiting on changes here? |
Contributor
|
The backend fix was merged earlier today. It is awaiting deployment. |
Member
|
No Hold needed. 😄 |
Contributor
|
The backend PRs that add the @hoangzinh @parasharrajat, the flag is on the report action object, not on the |
The lightweight action mapper in ReportActionsListItemRenderer was filtering out the isOriginalReportDeleted field, preventing it from reaching components that need it. Added the field to both the action construction object and useMemo dependency array. Also updated ReportNameUtils getReportName to pass the isOriginalReportDeleted flag to getCreatedReportForUnapprovedTransactionsMessage.
Updated both ReportAction validation schemas in DebugUtils to include the isOriginalReportDeleted field, fixing TypeScript compilation errors.
Added the missing isOriginalReportDeleted case in validateReportActionDraftProperty switch statement to fix ESLint exhaustiveness check error.
… deletion states - Created isOriginalReportDeleted() utility function in ReportActionsUtils - Function checks both backend flag (action.isOriginalReportDeleted) and optimistic offline state (originalReport.pendingFields.preview === DELETE) - Updated 3 usage sites to use the new utility: * CreatedReportForUnapprovedTransactionsAction component * ReportNameUtils.getReportName() * ContextMenuActions copy message handler - Added comprehensive unit tests covering all edge cases
Contributor
Author
|
@parasharrajat @cristipaval PR is ready for review |
Member
|
Thanks, I will check soon. |
Member
Screenshots🔲 iOS / native04.03.2026_21.28.30_REC.mp4🔲 MacOS / Chrome
|
Member
parasharrajat
left a comment
parasharrajat
left a comment
There was a problem hiding this comment.
Reviewer Checklist
- I have verified the author checklist is complete (all boxes are checked off).
- I verified the correct issue is linked in the
### Fixed Issuessection above - I verified testing steps are clear and they cover the changes made in this PR
- I verified the steps for local testing are in the
Testssection - I verified the steps for Staging and/or Production testing are in the
QA stepssection - I verified the steps cover any possible failure scenarios (i.e. verify an input displays the correct error message if the entered data is not correct)
- I turned off my network connection and tested it while offline to ensure it matches the expected behavior (i.e. verify the default avatar icon is displayed if app is offline)
- I verified the steps for local testing are in the
- I checked that screenshots or videos are included for tests on all platforms
- I included screenshots or videos for tests on all platforms
- I verified tests pass on all platforms & I tested again on:
- Android: Native
- Android: mWeb Chrome
- iOS: Native
- iOS: mWeb Safari
- MacOS: Chrome / Safari
- MacOS: Desktop
- If there are any errors in the console that are unrelated to this PR, I either fixed them (preferred) or linked to where I reported them in Slack
- I verified proper code patterns were followed (see Reviewing the code)
- I verified that any callback methods that were added or modified are named for what the method does and never what callback they handle (i.e.
toggleReportand notonIconClick). - I verified that the left part of a conditional rendering a React component is a boolean and NOT a string, e.g.
myBool && <MyComponent />. - I verified that comments were added to code that is not self explanatory
- I verified that any new or modified comments were clear, correct English, and explained "why" the code was doing something instead of only explaining "what" the code was doing.
- I verified any copy / text shown in the product is localized by adding it to
src/languages/*files and using the translation method - I verified all numbers, amounts, dates and phone numbers shown in the product are using the localization methods
- I verified any copy / text that was added to the app is grammatically correct in English. It adheres to proper capitalization guidelines (note: only the first word of header/labels should be capitalized), and is approved by marketing by adding the
Waiting for Copylabel for a copy review on the original GH to get the correct copy. - I verified proper file naming conventions were followed for any new files or renamed files. All non-platform specific files are named after what they export and are not named "index.js". All platform-specific files are named for the platform the code supports as outlined in the README.
- I verified the JSDocs style guidelines (in
STYLE.md) were followed
- I verified that any callback methods that were added or modified are named for what the method does and never what callback they handle (i.e.
- If a new code pattern is added I verified it was agreed to be used by multiple Expensify engineers
- I verified that this PR follows the guidelines as stated in the Review Guidelines
- I verified other components that can be impacted by these changes have been tested, and I retested again (i.e. if the PR modifies a shared library or component like
Avatar, I verified the components usingAvatarhave been tested & I retested again) - I verified all code is DRY (the PR doesn't include any logic written more than once, with the exception of tests)
- I verified any variables that can be defined as constants (ie. in CONST.js or at the top of the file that uses the constant) are defined as such
- If a new component is created I verified that:
- A similar component doesn't exist in the codebase
- All props are defined accurately and each prop has a
/** comment above it */ - The file is named correctly
- The component has a clear name that is non-ambiguous and the purpose of the component can be inferred from the name alone
- The only data being stored in the state is data necessary for rendering and nothing else
- For Class Components, any internal methods passed to components event handlers are bound to
thisproperly so there are no scoping issues (i.e. foronClick={this.submit}the methodthis.submitshould be bound tothisin the constructor) - Any internal methods bound to
thisare necessary to be bound (i.e. avoidthis.submit = this.submit.bind(this);ifthis.submitis never passed to a component event handler likeonClick) - All JSX used for rendering exists in the render method
- The component has the minimum amount of code necessary for its purpose, and it is broken down into smaller components in order to separate concerns and functions
- If any new file was added I verified that:
- The file has a description of what it does and/or why is needed at the top of the file if the code is not self explanatory
- If a new CSS style is added I verified that:
- A similar style doesn't already exist
- The style can't be created with an existing StyleUtils function (i.e.
StyleUtils.getBackgroundAndBorderStyle(theme.componentBG)
- If the PR modifies code that runs when editing or sending messages, I tested and verified there is no unexpected behavior for all supported markdown - URLs, single line code, code blocks, quotes, headings, bold, strikethrough, and italic.
- If the PR modifies a generic component, I tested and verified that those changes do not break usages of that component in the rest of the App (i.e. if a shared library or component like
Avataris modified, I verified thatAvataris working as expected in all cases) - If the PR modifies a component related to any of the existing Storybook stories, I tested and verified all stories for that component are still working as expected.
- If the PR modifies a component or page that can be accessed by a direct deeplink, I verified that the code functions as expected when the deeplink is used - from a logged in and logged out account.
- If the PR modifies the form input styles:
- I verified that all the inputs inside a form are aligned with each other.
- I added
Designlabel so the design team can review the changes.
- If a new page is added, I verified it's using the
ScrollViewcomponent to make it scrollable when more elements are added to the page. - If the
mainbranch was merged into this PR after a review, I tested again and verified the outcome was still expected according to theTeststeps. - I have checked off every checkbox in the PR reviewer checklist, including those that don't apply to this PR.
🎀 👀 🎀 C+ reviewed
parasharrajat
approved these changes
Mar 4, 2026
Contributor
|
@hoangzinh, could you please resolve conflicts? 🙏 |
Contributor
Author
|
@cristipaval I resolved conflicts |
cristipaval
approved these changes
Mar 4, 2026
Contributor
cristipaval
left a comment
cristipaval
left a comment
There was a problem hiding this comment.
Thank you both for working on this! 🙏
Contributor
|
🚧 @cristipaval has triggered a test Expensify/App build. You can view the workflow run here. |
Contributor
|
🧪🧪 Use the links below to test this adhoc build on Android, iOS, and Web. Happy testing! 🧪🧪
|
Contributor
|
✋ This PR was not deployed to staging yet because QA is ongoing. It will be automatically deployed to staging after the next production release. |
92 tasks
Contributor
|
🚀 Deployed to staging by https://github.com/cristipaval in version: 9.3.32-0 🚀
|
Contributor
|
🚀 Deployed to production by https://github.com/blimpich in version: 9.3.32-3 🚀
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Explanation of Change
Based on this discussion #79411 (comment), we need to update the current system message to include a plain text report ID when the original report is deleted, instead of an anchor link to the original report.
When the original report still exists
created this report for any held expenses from <a href="${reportUrl}">${reportName}</a>When the original report is deleted
created this report for any held expenses from deleted report #${reportID}Fixed Issues
$ #79411
PROPOSAL:
Tests
Same as QA
Offline tests
Same as QA
QA Steps
// TODO: These must be filled out, or the issue title must include "[No QA]."
created this report for any held expenses from deleted report #{reportID}PR Author Checklist
### Fixed Issuessection aboveTestssectionOffline stepssectionQA stepssectioncanBeMissingparam foruseOnyxtoggleReportand notonIconClick)src/languages/*files and using the translation methodSTYLE.md) were followedAvatar, I verified the components usingAvatarare working as expected)StyleUtils.getBackgroundAndBorderStyle(theme.componentBG))npm run compress-svg)Avataris modified, I verified thatAvataris working as expected in all cases)Designlabel and/or tagged@Expensify/designso the design team can review the changes.ScrollViewcomponent to make it scrollable when more elements are added to the page.mainbranch was merged into this PR after a review, I tested again and verified the outcome was still expected according to theTeststeps.Screenshots/Videos
Android: Native
Screen.Recording.2026-02-03.at.17.27.02.android.mov
Android: mWeb Chrome
Screen.Recording.2026-02-03.at.17.34.15.android.c.mov
iOS: Native
Screen.Recording.2026-02-04.at.11.37.50.mov
iOS: mWeb Safari
Screen.Recording.2026-02-04.at.09.06.45.ios.s.mov