Fix Required Receipt Translations #44220

abzokhattab · 2024-06-23T11:44:53Z

Details

Fixed Issues

$ #43939
PROPOSAL: #43939 (comment)

Tests

Verify that no errors appear in the JS console

Precondition : As a admin set up expense violation as " Receipt required amount" to "0" in OldDot control policy

Invite an employee to the above policy
As a employee submit a report without receipt
As an admin open the report submitted
Validate that the correct translation is shown ("receipt required").

Offline tests

Same as tests

QA Steps

Same as tests

PR Author Checklist

I linked the correct issue in the ### Fixed Issues section above
I wrote clear testing steps that cover the changes made in this PR
- I added steps for local testing in the Tests section
- I added steps for the expected offline behavior in the Offline steps section
- I added steps for Staging and/or Production testing in the QA steps section
- I added steps to cover 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 tested this PR with a High Traffic account against the staging or production API to ensure there are no regressions (e.g. long loading states that impact usability).
I included screenshots or videos for tests on all platforms
I ran the tests on all platforms & verified they passed on:
- Android: Native
- Android: mWeb Chrome
- iOS: Native
- iOS: mWeb Safari
- MacOS: Chrome / Safari
- MacOS: Desktop
I verified there are no console errors (if there's a console error not related to the PR, report it or open an issue for it to be fixed)
I followed proper code patterns (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. toggleReport and not onIconClick)
- 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
  - If any non-english text was added/modified, I verified the translation was requested/reviewed in #expensify-open-source and it was approved by an internal Expensify engineer. Link to Slack message:
- 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 either coming verbatim from figma or has been approved by marketing (in order to get marketing approval, ask the Bug Zero team member to add the Waiting for copy label to the issue)
- 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
If a new code pattern is added I verified it was agreed to be used by multiple Expensify engineers
I followed the guidelines as stated in the Review Guidelines
I tested other components that can be impacted by my changes (i.e. if the PR modifies a shared library or component like Avatar, I verified the components using Avatar are working as expected)
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
I verified that if a function's arguments changed that all usages have also been updated correctly
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 Avatar is modified, I verified that Avatar is 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 UI (e.g. new buttons, new UI components, changing the padding/spacing/sizing, moving components, etc) or modifies the form input styles:
- I verified that all the inputs inside a form are aligned with each other.
- I added Design label and/or tagged @Expensify/design so the design team can review the changes.
If a new page is added, I verified it's using the ScrollView component to make it scrollable when more elements are added to the page.
If the main branch was merged into this PR after a review, I tested again and verified the outcome was still expected according to the Test steps.

Screenshots/Videos

Android: Native

Android: mWeb Chrome

iOS: Native

iOS: mWeb Safari

MacOS: Chrome / Safari

MacOS: Desktop

melvin-bot · 2024-06-23T11:44:58Z

@ahmedGaber93 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]

abzokhattab · 2024-06-23T11:45:56Z

I also modified the spanish translations to match the table here #33969 (comment)

Output:

src/languages/en.ts

ahmedGaber93 · 2024-06-23T21:58:56Z

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 Issues section 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 Tests section
- I verified the steps for Staging and/or Production testing are in the QA steps section
- 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 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. toggleReport and not onIconClick).
- 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 either coming verbatim from figma or has been approved by marketing (in order to get marketing approval, ask the Bug Zero team member to add the Waiting for copy label to the issue)
- 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
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 using Avatar have 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 this properly so there are no scoping issues (i.e. for onClick={this.submit} the method this.submit should be bound to this in the constructor)
- Any internal methods bound to this are necessary to be bound (i.e. avoid this.submit = this.submit.bind(this); if this.submit is never passed to a component event handler like onClick)
- 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 Avatar is modified, I verified that Avatar is 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 UI (e.g. new buttons, new UI components, changing the padding/spacing/sizing, moving components, etc) or modifies the form input styles:
- I verified that all the inputs inside a form are aligned with each other.
- I added Design label and/or tagged @Expensify/design so the design team can review the changes.
If a new page is added, I verified it's using the ScrollView component to make it scrollable when more elements are added to the page.
If the main branch was merged into this PR after a review, I tested again and verified the outcome was still expected according to the Test steps.
I have checked off every checkbox in the PR reviewer checklist, including those that don't apply to this PR.

Screenshots/Videos

Android: Native

Android: mWeb Chrome

iOS: Native

iOS: mWeb Safari

MacOS: Chrome / Safari

MacOS: Desktop

ahmedGaber93 · 2024-06-25T16:30:34Z

@abzokhattab Do you have any idea why the expected behavior here not mention category name on the Spanish translation while mention it on English translation

ahmedGaber93 · 2024-06-25T16:36:11Z

Asking here #33969 (comment)

cead22 · 2024-06-25T17:41:50Z

src/languages/en.ts

@@ -3181,7 +3181,9 @@ export default {
        overLimitAttendee: ({formattedLimit}: ViolationsOverLimitParams) => `Amount over ${formattedLimit}/person limit`,
        perDayLimit: ({formattedLimit}: ViolationsPerDayLimitParams) => `Amount over daily ${formattedLimit}/person category limit`,
        receiptNotSmartScanned: 'Receipt not verified. Please confirm accuracy.',
-        receiptRequired: (params: ViolationsReceiptRequiredParams) => `Receipt required${params ? ` over ${params.formattedLimit}${params.category ? ' category limit' : ''}` : ''}`,
+        receiptRequired: ({formattedLimit, category}: ViolationsReceiptRequiredParams) =>
+            // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing


Can we write this as a function with if/elses to make it more readable and not need to suppress this?

I see this was resolved, but the lint suppression is still there.

This point was resolved .. I refactored the receiptRequired to be more readable instead of the one line function. let me know if there is another issue.

Yes we should remove // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing

Oh i see .. but typescript still complains if i remove the suppression line:

FYI here is the discussion where we decided to use || instead of ??

please let me know what you think and how we should proceed.

cc @ahmedGaber93

Perhaps you can explicitly check if they are undefined? Since it seems like they can either be strings or undefined.

Since it seems like they can either be strings or undefined.

If that, ?? will be good enough to check undefined values, we can use it and remove lint suppression. @abzokhattab

Reverted to ??

ahmedGaber93 · 2024-06-25T19:15:58Z

@abzokhattab We need to remove the category name from translations based on this #33969 (comment). We exactly need to remove it from English translation, Spanish translation already don't have category name.

abzokhattab · 2024-06-26T08:13:10Z

Okay i refactored the receiptRequired function to be more readable and i made the english translation follow the same structure as in the Spanish translation.

ahmedGaber93

We just need to remove the empty lines here

src/languages/es.ts

src/languages/en.ts

Co-authored-by: ahmedGaber93 <[email protected]>

src/languages/en.ts

Co-authored-by: ahmedGaber93 <[email protected]>

ahmedGaber93

LGTM!

ahmedGaber93 · 2024-06-26T11:46:56Z

@puneetlath
FYI, we do two changes here

fix [HOLD for payment 2024-07-17] [$250] Receipt required over undefined is shown in the violation message #43939
remove the category name from the English translation to be the same as in Spanish translation based on here Add violation message to MoneyRequestPreview #33969 (comment).

puneetlath · 2024-06-27T16:13:34Z

src/languages/en.ts

@@ -3181,7 +3181,9 @@ export default {
        overLimitAttendee: ({formattedLimit}: ViolationsOverLimitParams) => `Amount over ${formattedLimit}/person limit`,
        perDayLimit: ({formattedLimit}: ViolationsPerDayLimitParams) => `Amount over daily ${formattedLimit}/person category limit`,
        receiptNotSmartScanned: 'Receipt not verified. Please confirm accuracy.',
-        receiptRequired: (params: ViolationsReceiptRequiredParams) => `Receipt required${params ? ` over ${params.formattedLimit}${params.category ? ' category limit' : ''}` : ''}`,
+        receiptRequired: ({formattedLimit, category}: ViolationsReceiptRequiredParams) =>
+            // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing


I see this was resolved, but the lint suppression is still there.

puneetlath

Good with me. @cead22 you?

OSBotify · 2024-07-03T01:06:55Z

✋ This PR was not deployed to staging yet because QA is ongoing. It will be automatically deployed to staging after the next production release.

OSBotify · 2024-07-03T20:01:12Z

🚀 Deployed to staging by https://github.com/cead22 in version: 9.0.4-0 🚀

platform	result
🤖 android 🤖	success ✅
🖥 desktop 🖥	success ✅
🍎 iOS 🍎	success ✅
🕸 web 🕸	success ✅

OSBotify · 2024-07-04T22:13:39Z

🚀 Cherry-picked to staging by https://github.com/tgolen in version: 9.0.4-5 🚀

platform	result
🤖 android 🤖	success ✅
🖥 desktop 🖥	success ✅
🍎 iOS 🍎	success ✅
🕸 web 🕸	success ✅

@Expensify/applauseleads please QA this PR and check it off on the deploy checklist if it passes.

OSBotify · 2024-07-10T10:59:29Z

🚀 Deployed to production by https://github.com/Julesssss in version: 9.0.5-13 🚀

platform	result
🤖 android 🤖	success ✅
🖥 desktop 🖥	success ✅
🍎 iOS 🍎	success ✅
🕸 web 🕸	success ✅

OSBotify · 2024-07-15T20:19:59Z

🚀 Deployed to production by https://github.com/thienlnam in version: 9.0.6-8 🚀

platform	result
🤖 android 🤖	success ✅
🖥 desktop 🖥	success ✅
🍎 iOS 🍎	success ✅
🕸 web 🕸	success ✅

Fix Receipt required translations

564f9b7

abzokhattab requested a review from a team as a code owner June 23, 2024 11:44

melvin-bot bot requested review from ahmedGaber93 and removed request for a team June 23, 2024 11:44

ahmedGaber93 reviewed Jun 23, 2024

View reviewed changes

src/languages/en.ts Outdated Show resolved Hide resolved

Using OR operator instead of the nullish check

74c4700

ahmedGaber93 mentioned this pull request Jun 25, 2024

Add violation message to MoneyRequestPreview #33969

Merged

50 tasks

cead22 requested changes Jun 25, 2024

View reviewed changes

Making the receiptRequired method more readable

5e223b5

abzokhattab requested a review from ahmedGaber93 June 26, 2024 08:13

ahmedGaber93 reviewed Jun 26, 2024

View reviewed changes

src/languages/es.ts Outdated Show resolved Hide resolved

src/languages/es.ts Outdated Show resolved Hide resolved

src/languages/es.ts Outdated Show resolved Hide resolved

src/languages/en.ts Outdated Show resolved Hide resolved

src/languages/en.ts Outdated Show resolved Hide resolved

abzokhattab and others added 5 commits June 26, 2024 13:31

Minor edit

52489ce

Co-authored-by: ahmedGaber93 <[email protected]>

Minor edit

affa626

Co-authored-by: ahmedGaber93 <[email protected]>

Minor edit

40da946

Co-authored-by: ahmedGaber93 <[email protected]>

Minor edit

9844a1d

Co-authored-by: ahmedGaber93 <[email protected]>

Minor edit

8e8a763

Co-authored-by: ahmedGaber93 <[email protected]>

abzokhattab requested a review from ahmedGaber93 June 26, 2024 11:33

ahmedGaber93 reviewed Jun 26, 2024

View reviewed changes

src/languages/en.ts Outdated Show resolved Hide resolved

Minor edit

04efac7

Co-authored-by: ahmedGaber93 <[email protected]>

abzokhattab requested a review from ahmedGaber93 June 26, 2024 11:42

ahmedGaber93 approved these changes Jun 26, 2024

View reviewed changes

melvin-bot bot requested a review from puneetlath June 26, 2024 11:43

puneetlath requested changes Jun 27, 2024

View reviewed changes

removing eslint suppression line

a41d3b0

abzokhattab requested a review from puneetlath July 2, 2024 09:02

puneetlath approved these changes Jul 2, 2024

View reviewed changes

cead22 approved these changes Jul 3, 2024

View reviewed changes

cead22 merged commit 5ab6be6 into Expensify:main Jul 3, 2024
16 checks passed

github-actions bot mentioned this pull request Jul 3, 2024

Deploy Checklist: New Expensify 2024-07-03 #44782

Closed

melvin-bot bot mentioned this pull request Jul 10, 2024

[HOLD for payment 2024-07-17] [$250] Receipt required over undefined is shown in the violation message #43939

Closed

6 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fix Required Receipt Translations #44220

Fix Required Receipt Translations #44220

abzokhattab commented Jun 23, 2024

melvin-bot bot commented Jun 23, 2024

abzokhattab commented Jun 23, 2024

ahmedGaber93 commented Jun 23, 2024 •

edited

Loading

ahmedGaber93 commented Jun 25, 2024 •

edited

Loading

ahmedGaber93 commented Jun 25, 2024

cead22 Jun 25, 2024

puneetlath Jun 27, 2024

abzokhattab Jun 27, 2024

cead22 Jun 27, 2024 •

edited

Loading

abzokhattab Jun 28, 2024

puneetlath Jun 28, 2024

ahmedGaber93 Jul 2, 2024

abzokhattab Jul 2, 2024

ahmedGaber93 commented Jun 25, 2024

abzokhattab commented Jun 26, 2024 •

edited

Loading

ahmedGaber93 left a comment

ahmedGaber93 left a comment

ahmedGaber93 commented Jun 26, 2024

puneetlath Jun 27, 2024

puneetlath left a comment

OSBotify commented Jul 3, 2024

OSBotify commented Jul 3, 2024

OSBotify commented Jul 4, 2024

OSBotify commented Jul 10, 2024

OSBotify commented Jul 15, 2024

Fix Required Receipt Translations #44220

Fix Required Receipt Translations #44220

Conversation

abzokhattab commented Jun 23, 2024

Details

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

melvin-bot bot commented Jun 23, 2024

abzokhattab commented Jun 23, 2024

ahmedGaber93 commented Jun 23, 2024 • edited Loading

Reviewer Checklist

Screenshots/Videos

ahmedGaber93 commented Jun 25, 2024 • edited Loading

ahmedGaber93 commented Jun 25, 2024

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

cead22 Jun 27, 2024 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

ahmedGaber93 commented Jun 25, 2024

abzokhattab commented Jun 26, 2024 • edited Loading

ahmedGaber93 left a comment

Choose a reason for hiding this comment

ahmedGaber93 left a comment

Choose a reason for hiding this comment

ahmedGaber93 commented Jun 26, 2024

Choose a reason for hiding this comment

puneetlath left a comment

Choose a reason for hiding this comment

OSBotify commented Jul 3, 2024

OSBotify commented Jul 3, 2024

OSBotify commented Jul 4, 2024

OSBotify commented Jul 10, 2024

OSBotify commented Jul 15, 2024

ahmedGaber93 commented Jun 23, 2024 •

edited

Loading

ahmedGaber93 commented Jun 25, 2024 •

edited

Loading

cead22 Jun 27, 2024 •

edited

Loading

abzokhattab commented Jun 26, 2024 •

edited

Loading