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: show category picker when creating invoices #41524

Merged
merged 5 commits into from
May 6, 2024

Conversation

gijoe0295
Copy link
Contributor

@gijoe0295 gijoe0295 commented May 2, 2024

Details

This PR shows category picker when creating invoices.

Fixed Issues

$ #41281
PROPOSAL: #41281 (comment)

Tests

Note

Tags, Tax rate and Tax amount does not appear in IOU confirmation screen but appear in transaction report. This is a temporary fix until the BE supported those fields when creating invoices.

  1. Press FAB >> Send invoice >> Select any participant and a Collect workspace with categories enabled
  2. Verify in confirmation screen, the Category menu shows and you can select a category
  3. If the workspace required user provided the merchant, verify Required appears in the Merchant field
  4. Press Send invoice
  5. Open transaction report
  6. Verify you can change the category
  7. Verify you can change the tags and tax, if any
  • Verify that no errors appear in the JS console

Offline tests

NA

QA Steps

Note

Tags, Tax rate and Tax amount does not appear in IOU confirmation screen but appear in transaction report. This is a temporary fix until the BE supported those fields when creating invoices.

  1. Press FAB >> Send invoice >> Select any participant and a Collect workspace with categories enabled
  2. Verify in confirmation screen, the Category menu shows and you can select a category
  3. If the workspace required user provided the merchant, verify Required appears in the Merchant field
  4. Press Send invoice
  5. Open transaction report
  6. Verify you can change the category
  7. Verify you can change the tags and tax, if any
  • 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
video_2024-05-03_17-37-08.mp4
Android: mWeb Chrome
video_2024-05-03_19-31-42.mp4
iOS: Native
Screen.Recording.2024-05-03.at.17.28.12-source.mov
iOS: mWeb Safari
Screen.Recording.2024-05-03.at.17.03.14-source.mov
MacOS: Chrome / Safari
Screen.Recording.2024-05-03.at.19.29.28-source.mov
MacOS: Desktop
Screen.Recording.2024-05-03.at.16.30.07-source.mov

@gijoe0295 gijoe0295 changed the title show category picker for invoices fix: show category picker when creating invoices May 2, 2024
@gijoe0295 gijoe0295 marked this pull request as ready for review May 3, 2024 10:38
@gijoe0295 gijoe0295 requested a review from a team as a code owner May 3, 2024 10:38
@melvin-bot melvin-bot bot removed the request for review from a team May 3, 2024 10:38
Copy link

melvin-bot bot commented May 3, 2024

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

@melvin-bot melvin-bot bot requested a review from Pujan92 May 3, 2024 10:38
@gijoe0295
Copy link
Contributor Author

gijoe0295 commented May 3, 2024

@Pujan92 @davidcardoza PR is ready for review. I temporarily hide tag and tax fields in both IOU confirmation step and transaction report (MoneyRequestView).

However, there's an edge case that if the workspace required tags or tax, and we currently hide them, the transaction would have missing tag/tax violation, causing the report preview to have red indicator.

My two cents are either:

  1. Hard code the hasViolations util to temporarily ignore missing tags/tax violation for invoices (too cumbersome, should avoid); or
  2. Hide those fields in IOU confirmation screen but show them in transaction report to allow user to manually add tags/tax (i.e. resolve the violations); or
  3. Fix the BE to temporarily ignore such violations until those fields are supported.

Also, if there's any temporary FE work, I'm happy to create follow-up PRs as soon as the BE work is done.

What is your suggestion?

@Pujan92
Copy link
Contributor

Pujan92 commented May 3, 2024

  1. Hide those fields in IOU confirmation screen but show them in transaction report to allow user to manually add tags/tax

@gijoe0295 I think this option seems good as of now bcoz updating these fields in the money request will be allowed and works. So users can fix the violation if there is any.

@gijoe0295
Copy link
Contributor Author

gijoe0295 commented May 3, 2024

@Pujan92 But does it go against with what we're fixing now (category is not in confirmation screen but is in money request view)? I know this is quite tricky because BE is at limited support.

@Pujan92
Copy link
Contributor

Pujan92 commented May 3, 2024

@Pujan92 But does it go against with what we're fixing now (category is not in confirmation screen but is in money request view)? I know this is quite tricky because BE is at limited support.

It does but if we can't hold for the backend change then this is the most convenient change looks to me.

@gijoe0295
Copy link
Contributor Author

gijoe0295 commented May 3, 2024

Thanks @Pujan92. Agree. I'll push the changes and note this so we could handle it later in follow-up PRs and QA team be aware of.

@gijoe0295
Copy link
Contributor Author

@Pujan92 Added the changes, ready for review.

@Pujan92
Copy link
Contributor

Pujan92 commented May 3, 2024

Thanks @Pujan92. Agree. I'll push the changes and note this so we could handle it later in follow-up PRs and QA team be aware of.

Exactly, Thanks!

@Pujan92
Copy link
Contributor

Pujan92 commented May 4, 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

Android: Native
mn2.webm
Android: mWeb Chrome
ma1.webm
iOS: Native
Simulator.Screen.Recording.-.iPhone.15.Pro.-.2024-05-04.at.16.02.18.mp4
iOS: mWeb Safari
Simulator.Screen.Recording.-.iPhone.15.Pro.-.2024-05-04.at.15.58.52.mp4
MacOS: Chrome / Safari
Screen.Recording.2024-05-04.at.15.48.57.mov
MacOS: Desktop
Screen.Recording.2024-05-04.at.16.05.27.mov

Copy link
Contributor

@Pujan92 Pujan92 left a comment

Choose a reason for hiding this comment

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

LGTM!

@melvin-bot melvin-bot bot requested a review from cristipaval May 4, 2024 10:57
@cristipaval cristipaval merged commit cd9a9ad into Expensify:main May 6, 2024
15 checks passed
@OSBotify
Copy link
Contributor

OSBotify commented May 6, 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.

@@ -563,7 +563,7 @@ function IOURequestStepConfirmation({
// split rather than forcing the user to create a new group, just for that expense. The reportID is empty, when the action was initiated from
// the floating-action-button (since it is something that exists outside the context of a report).
canModifyParticipants={!transaction?.isFromGlobalCreate}
policyID={report?.policyID}
policyID={report?.policyID ?? policy?.id ?? ''}
Copy link
Contributor

Choose a reason for hiding this comment

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

This line is causing crash.

Steps to repro

  1. Create a new account
  2. Click on FAB > Submit Expense.
  3. Enter the email where you want to submit the expense.
  4. Click on the option.

cc @cristipaval

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Checking.

Copy link
Contributor

@Pujan92 Pujan92 May 6, 2024

Choose a reason for hiding this comment

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

@gijoe0295 seems passing an empty string as a fallback causing the issue. Bcoz an empty string for the passed policyId will fetch all records from the onyx in component MoneyRequestConfirmationList.

Copy link
Contributor Author

@gijoe0295 gijoe0295 May 6, 2024

Choose a reason for hiding this comment

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

Yes I found the problem. policyTags_undefined key returns undefined policyTags value but policyTags_ key returns whichever policyTags in Onyx which is the personal policy.

@cristipaval
Copy link
Contributor

I'm reverting because it causes a crash in the App.

@Pujan92
Copy link
Contributor

Pujan92 commented May 6, 2024

@cristipaval the problem is found by the @gijoe0295 and looks simpler to fix. How about we fix that in the quick PR instead of revert?

@Pujan92
Copy link
Contributor

Pujan92 commented May 6, 2024

@gijoe0295 plz raise a new PR again with the original changes with the crash fix.

@cristipaval
Copy link
Contributor

@cristipaval the problem is found by the @gijoe0295 and looks simpler to fix. How about we fix that in the quick PR instead of revert?

Sorry, I missed this. I've been ooo today and I jumped off after the revert.

@kbecciv
Copy link

kbecciv commented May 7, 2024

This PR is failing because of issue #41281

The issue is reproducible in: All Platforms

1715099373430.41524_web.mp4
1715112146423.41524_mWeb_.mp4
1715108831931.PR_41524_iOS.mp4
1715113356174.41524_Android_.mp4

@gijoe0295
Copy link
Contributor Author

@kbecciv This PR was reverted!

@OSBotify
Copy link
Contributor

OSBotify commented May 9, 2024

🚀 Deployed to production by https://github.com/marcaaron in version: 1.4.71-6 🚀

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

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.

6 participants