fix: Square bracket displayed in system message for unapproved expense report #49831

nkdengineer · 2024-09-27T04:01:00Z

Details

Fixed Issues

$ #49160
PROPOSAL: #49160 (comment)

Tests

Log in as an admin in OldDot.
Create a Collect workspace.
Add user B as an employee.
As the employee, log in to NewDot and submit an expense in the workspace chat.
As the employee, go to the expense details page.
As the admin, go to the expense report in OldDot.
Approve the expense and then unapprove it.
As the employee in NewDot, check the system message when the expense is unapproved.
Verify that: The system message should correctly specify that the admin has unapproved the report.

Verify that no errors appear in the JS console

Offline tests

QA Steps

Log in as an admin in OldDot.
Create a Collect workspace.
Add user B as an employee.
As the employee, log in to NewDot and submit an expense in the workspace chat.
As the employee, go to the expense details page.
As the admin, go to the expense report in OldDot.
Approve the expense and then unapprove it.
As the employee in NewDot, check the system message when the expense is unapproved.
Verify that: The system message should correctly specify that the admin has unapproved the report.

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Android: Native

android.mov

Android: mWeb Chrome

android-mweb.mov

iOS: Native

ios.mov

iOS: mWeb Safari

ios-mweb.mov

MacOS: Chrome / Safari

web.mov

MacOS: Desktop

desktop.mov

…e report

melvin-bot · 2024-09-27T07:23:26Z

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

DylanDylann · 2024-09-30T05:39:45Z

@nkdengineer Your step is incorrect

src/libs/ReportUtils.ts

DylanDylann · 2024-10-07T07:57:49Z

src/libs/ReportUtils.ts

+    if (ReportActionsUtils.isApprovedAction(reportAction)) {
+        translationKey = 'iou.approvedAmount';
+    } else {
+        translationKey = 'report.actions.type.unapproved';


Hmm, Should we add a new translation key 'iou.unapprovedAmount' with the correct translation (need to confirm again). I am not sure if we also want to use 'report.actions.type.unapproved' translation key here

because I see in the report detail we use another translation for unapproved action

App/src/languages/es.ts

Line 1009 in 6d8e739

unapprove: 'Desaprobar',

@iwiznia Could you please help to confirm which translation we should use here?

Can you give me a bit more context on what exactly is this showing?

@iwiznia When the admin unapproves a request, a system message will display "unapproved X", I am asking the Spanish translation for this system message.

Hmm, Should we add a new translation key 'iou.unapprovedAmount' with the correct translation (need to confirm again). I am not sure if we also want to use 'report.actions.type.unapproved' translation key here because I see in the report detail we use another translation for unapproved action "unapprove: 'Desaprobar'"

Ah ok thanks! the translation would be desaprobó

@nkdengineer Please help to update this

@DylanDylann updated

@nkdengineer I think we should create a new translation key iou.approvedAmount

DylanDylann · 2024-10-07T08:02:02Z

@nkdengineer Some left comments

DylanDylann · 2024-10-07T08:02:07Z

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

Screen.Recording.2024-10-11.at.20.58.01.mov

MacOS: Desktop

Screen.Recording.2024-10-11.at.20.53.52.mov

src/languages/params.ts

src/pages/home/report/ReportActionItem.tsx

…sage

nkdengineer · 2024-10-11T07:36:57Z

@DylanDylann i updated, please check again

iwiznia · 2024-10-11T13:24:55Z

Are these supposed to be equivalent? Because the spanish one does not make much sense, should be desaprobó.

DylanDylann · 2024-10-11T13:48:27Z

@iwiznia Ops, It seems both me and @nkdengineer forgot to update videos again. I will do it soon

iwiznia · 2024-10-11T13:50:22Z

Ah ok, can you make sure to include one where this is used please?

DylanDylann · 2024-10-11T14:00:07Z

@iwiznia I updated all videos on my checklist.

This is a sample on the web:

Screen.Recording.2024-10-11.at.20.58.01.mov

iwiznia · 2024-10-11T14:07:17Z

@DylanDylann I think you missed this comment?

DylanDylann · 2024-10-11T14:11:56Z

@iwiznia

Ah ok, can you make sure to include one where this is used please?

No, this translation is created in this PR, but now we don't use it in any places. Should we remove it?

src/languages/en.ts

src/languages/es.ts

iwiznia · 2024-10-11T14:19:51Z

No, this translation is created in this PR, but now we don't use it in any places. Should we remove it?

Yes

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

DylanDylann · 2024-10-11T14:41:40Z

@iwiznia All yours

OSBotify · 2024-10-11T15:47:48Z

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

github-actions · 2024-10-15T03:29:59Z

🚀 Deployed to staging by https://github.com/iwiznia in version: 9.0.49-0 🚀

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

github-actions · 2024-10-17T01:44:55Z

🚀 Deployed to production by https://github.com/marcaaron in version: 9.0.49-2 🚀

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

nkdengineer added 2 commits September 27, 2024 11:00

fix: Square bracket displayed in system message for unapproved expens…

d172810

…e report

fix: add space in translation

c9b0f3f

nkdengineer marked this pull request as ready for review September 27, 2024 07:23

nkdengineer requested a review from a team as a code owner September 27, 2024 07:23

melvin-bot bot requested a review from DylanDylann September 27, 2024 07:23

melvin-bot bot removed the request for review from a team September 27, 2024 07:23

nkdengineer mentioned this pull request Sep 27, 2024

[HOLD for payment 2024-10-24] [$250] Expense Details - Square bracket displayed in system message for unapproved expense report #49160

Closed

6 tasks

This comment was marked as outdated.

Sign in to view

nkdengineer added 2 commits September 30, 2024 16:42

Merge branch 'main' into fix/49160

7cb90b7

resolve conflict

ddbc57b

DylanDylann reviewed Oct 7, 2024

View reviewed changes

nkdengineer added 5 commits October 8, 2024 23:56

Merge branch 'main' into fix/49160

697b4c5

Using utils function

b8ed590

resolve conflict

882258d

change es file

4b2b210

fix: add new translation key

4814471

DylanDylann reviewed Oct 11, 2024

View reviewed changes

src/languages/params.ts Show resolved Hide resolved

src/pages/home/report/ReportActionItem.tsx Outdated Show resolved Hide resolved

nkdengineer added 3 commits October 11, 2024 14:19

remove isUnapprovedOrApprovedAction and getIOUUnapprovedOrApprovedMes…

e35c4a9

…sage

minor change

01e156a

minor change

6555081

DylanDylann approved these changes Oct 11, 2024

View reviewed changes

melvin-bot bot requested a review from iwiznia October 11, 2024 08:04

DylanDylann reviewed Oct 11, 2024

View reviewed changes

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

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

nkdengineer and others added 2 commits October 11, 2024 21:24

Update src/languages/en.ts

4c77d3a

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

Update src/languages/es.ts

8bef74e

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

iwiznia approved these changes Oct 11, 2024

View reviewed changes

iwiznia merged commit 1220039 into Expensify:main Oct 11, 2024
16 checks passed

rojiphil mentioned this pull request Oct 14, 2024

[$250] Expense - Unapprove system message changes format after unapproving a scanning expense #50305

Closed

6 tasks

github-actions bot mentioned this pull request Oct 15, 2024

Deploy Checklist: New Expensify 2024-10-15 #50764

Closed

71 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

fix: Square bracket displayed in system message for unapproved expense report #49831

fix: Square bracket displayed in system message for unapproved expense report #49831

nkdengineer commented Sep 27, 2024 •

edited

Loading

melvin-bot bot commented Sep 27, 2024

This comment was marked as outdated.

DylanDylann commented Sep 30, 2024

DylanDylann Oct 7, 2024

DylanDylann Oct 7, 2024

DylanDylann Oct 7, 2024

iwiznia Oct 7, 2024

DylanDylann Oct 8, 2024 •

edited

Loading

iwiznia Oct 9, 2024

DylanDylann Oct 9, 2024

nkdengineer Oct 9, 2024

DylanDylann Oct 10, 2024

DylanDylann commented Oct 7, 2024

DylanDylann commented Oct 7, 2024 •

edited

Loading

nkdengineer commented Oct 11, 2024

iwiznia commented Oct 11, 2024

DylanDylann commented Oct 11, 2024

iwiznia commented Oct 11, 2024

DylanDylann commented Oct 11, 2024

iwiznia commented Oct 11, 2024

DylanDylann commented Oct 11, 2024 •

edited

Loading

iwiznia commented Oct 11, 2024

DylanDylann commented Oct 11, 2024

OSBotify commented Oct 11, 2024

github-actions bot commented Oct 15, 2024

github-actions bot commented Oct 17, 2024

fix: Square bracket displayed in system message for unapproved expense report #49831

fix: Square bracket displayed in system message for unapproved expense report #49831

Conversation

nkdengineer commented Sep 27, 2024 • edited Loading

Details

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

melvin-bot bot commented Sep 27, 2024

This comment was marked as outdated.

DylanDylann commented Sep 30, 2024

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

DylanDylann Oct 8, 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

DylanDylann commented Oct 7, 2024

DylanDylann commented Oct 7, 2024 • edited Loading

Reviewer Checklist

Screenshots/Videos

nkdengineer commented Oct 11, 2024

iwiznia commented Oct 11, 2024

DylanDylann commented Oct 11, 2024

iwiznia commented Oct 11, 2024

DylanDylann commented Oct 11, 2024

iwiznia commented Oct 11, 2024

DylanDylann commented Oct 11, 2024 • edited Loading

iwiznia commented Oct 11, 2024

DylanDylann commented Oct 11, 2024

OSBotify commented Oct 11, 2024

github-actions bot commented Oct 15, 2024

github-actions bot commented Oct 17, 2024

nkdengineer commented Sep 27, 2024 •

edited

Loading

DylanDylann Oct 8, 2024 •

edited

Loading

DylanDylann commented Oct 7, 2024 •

edited

Loading

DylanDylann commented Oct 11, 2024 •

edited

Loading