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

fix: hold Expense option is displayed on expenses on a closed report #42574

Merged
merged 8 commits into from
Jun 4, 2024

Conversation

nkdengineer
Copy link
Contributor

@nkdengineer nkdengineer commented May 24, 2024

Details

Fixed Issues

$ #42202
PROPOSAL: #42202 (comment)

Tests

  1. Set a workspace without an approval flow
  2. Invite a employee
  3. As the employee - Submit 2 expenses to the workspace
  4. Submit the report - Since there's no approval workflow - the report should auto-close
  5. Navigate to a expense of the closed report
  6. Click on the 3-dot menu
  7. Verify that: Hold menu option will not be present.
  • Verify that no errors appear in the JS console

Offline tests

QA Steps

  1. Set a workspace without an approval flow
  2. Invite a employee
  3. As the employee - Submit 2 expenses to the workspace
  4. Submit the report - Since there's no approval workflow - the report should auto-close
  5. Navigate to a expense of the closed report
  6. Click on the 3-dot menu
  7. Verify that: Hold menu option will not be present.
  • Verify that no errors appear in the JS console

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
Android: mWeb Chrome android-mweb
iOS: Native
ios.mov
iOS: mWeb Safari
ios-mweb.mov
MacOS: Chrome / Safari web
MacOS: Desktop desktop

@nkdengineer nkdengineer marked this pull request as ready for review May 24, 2024 08:48
@nkdengineer nkdengineer requested a review from a team as a code owner May 24, 2024 08:48
@melvin-bot melvin-bot bot requested review from rojiphil and removed request for a team May 24, 2024 08:48
Copy link

melvin-bot bot commented May 24, 2024

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

@nkdengineer
Copy link
Contributor Author

@rojiphil i added new generic error, and ask for Spanish in here
please check again

@rojiphil
Copy link
Contributor

@rojiphil i added new generic error, and ask for Spanish in here please check again

@nkdengineer First we need to get the English text reviewed with marketing team. Only then we have to post in the slack channel. We can do this here in the PR itself.

@rojiphil
Copy link
Contributor

rojiphil commented May 28, 2024

@Expensify/marketing We want to display an error message when BE sends an error response to the Hold Expense API and Unhold Expense API request.

Does the following error messages in English look good?
Unexpected error while holding the expense. Please try again later.
Unexpected error while unholding the expense. Please try again later.

@jamesdeanexpensify
Copy link
Contributor

@rojiphil @pecanoro I need to get the English copy approved first. Will bring this out into Slack and then circle back here. Thanks!

@jamesdeanexpensify
Copy link
Contributor

Actually one question - do we know any reason for these errors, so we can tell the user what's going on and be more specific about how to fix the issue?

@rojiphil
Copy link
Contributor

 do we know any reason for these errors, so we can tell the user what's going on and be more specific about how to fix the issue?

@jamesdeanexpensify Well! No. We just wanted to capture any unexpected error as currently there is no error message displayed if the API request failed.
And oh! I just noticed a generic error message i.e. Unexpected error, please try again later. in the translations here. This has been used for unexpected errors during IOU requests like CancelPayment, SubmitReport
I think this may be good enough.
What do you think?

@jamesdeanexpensify
Copy link
Contributor

Getting some quick internal thoughts! Back in a bit.

@jamesdeanexpensify
Copy link
Contributor

Let's go with:

Unexpected error while holding the expense. Please try again later.
Unexpected error while taking the expense off hold. Please try again later.

nkdengineer and others added 3 commits May 29, 2024 10:12
Co-authored-by: Rocio Perez-Cano <pecanoro@users.noreply.github.com>
Co-authored-by: Rocio Perez-Cano <pecanoro@users.noreply.github.com>
@nkdengineer
Copy link
Contributor Author

@rojiphil @pecanoro @jamesdeanexpensify i updated, please check again 🙏

@jamesdeanexpensify
Copy link
Contributor

I think the next step is just @pecanoro taking a look at the Spanish translations of:

Unexpected error while holding the expense. Please try again later.
Unexpected error while taking the expense off hold. Please try again later.

@pecanoro
Copy link
Contributor

I did already! Waiting for @rojiphil to leave a review so I can leave my final one!

@rojiphil
Copy link
Contributor

Waiting for @rojiphil to leave a review so I can leave my final one!

Oh! Sorry. Completely missed this.

@rojiphil
Copy link
Contributor

@pecanoro Here are the computer generated translations for the approved wordings.
Does this sound correct in Spanish?

English: Unexpected error while holding the expense. Please try again later.
Spanish: Error inesperado al realizar el gasto. Vuelva a intentarlo más tarde.

English: Unexpected error while taking the expense off hold. Please try again later.
Spanish: Error inesperado al retirar el gasto de la espera. Vuelva a intentarlo más tarde.

@rojiphil
Copy link
Contributor

rojiphil commented May 29, 2024

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

MacOS: Chrome / Safari
42574-web-safari-001.mp4
Android: Native
42574-android-native-001.mp4
Android: mWeb Chrome
42574-mweb-chrome-001.mp4
iOS: Native
42574-ios-native-001.mp4
iOS: mWeb Safari
42574-mweb-safari-001.mp4
MacOS: Desktop
42574-desktop-001.mp4

Copy link
Contributor

@rojiphil rojiphil left a comment

Choose a reason for hiding this comment

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

Code LGTM. Tests well on web platform. Looking forward to complete the checklist once the following comments are addressed.

@nkdengineer Here are few comments for addressal.

  1. We can remove Step 7 in the Tests section as Hold menu option will not be present.
  2. Please add test cases and screenshots/videos to demonstrate display of error messages due to failure in Hold and Unhold API requests.
    3. While we wait for the correct translations, let us, meanwhile, use the computer generated ones as mentioned here
    3rd point can be ignored as it is going to be updated anyway in the final review as mentioned here

@nkdengineer
Copy link
Contributor Author

@rojiphil For the error case that I mentioned in my proposal, we have a BE issue here. When device 1 hold a request in offline and device 2 hold the request online, after device 1 go online HoldRequest API doesn't return jsonCode with error although the OnyxData is empty and when we reset cache, the error hold action disappear.

I think we can create a separate internal issue for this case that will return as an error API if the request is already held.

cc @dangrous

adc-1.mov

@pecanoro
Copy link
Contributor

I already left suggestions for the translations so we are covered in that sense

@pecanoro
Copy link
Contributor

Oh wait forget it, I though I did, but it seems I didn't

Co-authored-by: Rocio Perez-Cano <pecanoro@users.noreply.github.com>
@rojiphil
Copy link
Contributor

For the error case that I mentioned in my proposal, we have a BE issue here.

Thanks for pointing this out. I did another test which involved holding the expense offline in first device while submitting and closing the report from second device. In this case too, the HoldRequest API should have failed when the first device came online. But it didn’t. Here is a test video demonstrating this.

So, we have two options to take this forward:

  1. Make this issue internal, fix in BE and, then, test and close this issue. Or
  2. As suggested before, complete the checklist here and create separate internal issue for BE.

I also think 2. may be better.

@dangrous Please advice

42574-hold-error.mp4

@pecanoro
Copy link
Contributor

pecanoro commented Jun 3, 2024

@dangrous I also think we should do option 2, what do you think?

@pecanoro pecanoro requested a review from dangrous June 4, 2024 00:10
Copy link
Contributor

@rojiphil rojiphil left a comment

Choose a reason for hiding this comment

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

While we await the final decision from @dangrous, I have verified that the original issue is resolved on all platforms and have completed the checklist.
However, if we go with option 1 I will rerun the checklist.

@melvin-bot melvin-bot bot requested a review from pecanoro June 4, 2024 06:34
@dangrous
Copy link
Contributor

dangrous commented Jun 4, 2024

Yep, I agree - let's make a separate issue for that BE issue.

Will review/merge this in one sec!

@dangrous dangrous merged commit e4b9324 into Expensify:main Jun 4, 2024
17 checks passed
@OSBotify
Copy link
Contributor

OSBotify commented Jun 4, 2024

✋ 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
Copy link
Contributor

🚀 Deployed to production by https://github.com/luacmartins in version: 1.4.81-11 🚀

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

@dangrous
Copy link
Contributor

Did we make the internal issue for #42574 (comment) yet? I did not, but I can shortly if not!

@nkdengineer
Copy link
Contributor Author

Did we make the internal issue for #42574 (comment) yet? I did not, but I can shortly if not!

We didn't. I think you can create an internal issue for it.

@dangrous
Copy link
Contributor

Internal issue created! https://github.com/Expensify/Expensify/issues/406394 . Screenshot below for non-internal folks.

image

@@ -6749,6 +6749,7 @@ function putOnHold(transactionID: string, comment: string, reportID: string) {
comment: {
hold: null,
},
errors: ErrorUtils.getMicroSecondOnyxError('iou.genericHoldExpenseFailureMessage'),
Copy link
Member

Choose a reason for hiding this comment

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

we used the wrong path for this key causing #43279

Copy link
Contributor

Choose a reason for hiding this comment

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

Ah, thank you!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants