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

Category MenuItem and CategoryPicker component #25470

Merged
merged 19 commits into from
Aug 23, 2023

Conversation

rezkiy37
Copy link
Contributor

@rezkiy37 rezkiy37 commented Aug 18, 2023

Details

This is the first PR of three for the issue. Goals for this PR:

  1. Add a “Category” menu item to the Money Request screen.
  2. Create a basic Category Picker screen. It includes: title, description and simple list.

UPD: The backend is now sending categories to Onyx, so you shouldn’t need to set mock data manually anymore. To get categories please ask for a beta - newDotCategories.

DEPRECATED: Since, the backend is not ready, I use local created data. I attach an example how I did it.

Example
  1. Open own workspace page.
  2. Take a workspace ID from the url.
Screenshot Screenshot 2023-08-22 at 12 43 20
  1. Put the code sample below to src/pages/iou/steps/MoneyRequestConfirmPage.js. Note: you can put any amount of categories and use other names.
Code sample
// src/pages/iou/steps/MoneyRequestConfirmPage.js

// Add a default Onyx instance import
import Onyx, {withOnyx} from 'react-native-onyx';
// ... Other imports
  
function MoneyRequestConfirmPage(props) {
  useEffect(() => {
      Onyx.merge('policyCategories_<YOUR_POLICY_ID>', {
          Car: {enabled: true, name: 'Car'},
          Fees: {enabled: true, name: 'Fees'},
          Labor: {enabled: true, name: 'Labor'},
      });
  }, []);
  
  // ... Other logic
}
  1. Open a workspace chat.
  2. Click on "+" (Actions) to the left of Composer.
  3. Click on "Request money".
  4. Enter any amount.
  5. Click on "Next".
  6. Recommended: Verify that's data has appeared in the local DB.
Screenshots Screenshot 2023-08-22 at 12 50 20 Data
  1. Click on "Show more".
  2. Verify that there is "Category" row.
  3. Click on the row.
  4. Verify that there is a list of categories.

Fixed Issues

For #24463
PROPOSAL: Slack conversation

Tests

DEPRECATED: Before next steps you have to have categories locally (check the example above).

  1. Open a workspace chat.
  2. Click on "+" (Actions) to the left of Composer.
  3. Click on "Request money".
  4. Enter any amount.
  5. Click on "Next".
  6. Click on "Show more".
  7. Verify that there is "Category" row.
  8. Click on the row.
  9. Verify that there is a list of categories.
  10. Verify that, when you click on back button or any category, the app redirects you to the previous page.
  • Verify that no errors appear in the JS console

Offline tests

Same as "Tests"

QA Steps

Same as "Tests"

  • 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 / Chrome
    • iOS / native
    • iOS / 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 approved by marketing by adding the Waiting for Copy label 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
  • 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 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
    • If we are not using the full Onyx data that we loaded, I've added the proper selector in order to ensure the component only re-renders when the data it is using changes
    • 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(themeColors.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 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 author checklist, including those that don't apply to this PR.

Screenshots/Videos

Web
Chrome.mov
Chrome.ES.mov
Safari.mov
Safari Empty
Mobile Web - Chrome
IOS.Chrome.MP4
Android.Chrome.mov
Mobile Web - Safari
IOS.Safari.MP4
Desktop
Desktop.mov
iOS
IOS.mov
Android
Android.mov

@rezkiy37 rezkiy37 marked this pull request as ready for review August 18, 2023 12:44
@rezkiy37 rezkiy37 requested a review from a team as a code owner August 18, 2023 12:44
@melvin-bot melvin-bot bot requested review from jjcoffee and removed request for a team August 18, 2023 12:44
@melvin-bot
Copy link

melvin-bot bot commented Aug 18, 2023

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

@jjcoffee
Copy link
Contributor

Will review on Monday!

@jjcoffee
Copy link
Contributor

jjcoffee commented Aug 21, 2023

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 / Chrome
    • iOS / native
    • iOS / 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 approved by marketing by adding the Waiting for Copy label 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
  • 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(themeColors.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 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

Web
chrome-desktop-2023-08-21_17.07.40.mp4
Mobile Web - Chrome
android-chrome.mp4
Mobile Web - Safari

Uploading ios-safari-2023-08-21_19.40.13.mp4…

Desktop
macos-desktop-2023-08-21_19.44.20.mp4
iOS
ios-native-2023-08-21_19.30.24.mp4
Android
android-native-2023-08-21_22.02.47.mp4

Copy link
Contributor

@jjcoffee jjcoffee left a comment

Choose a reason for hiding this comment

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

@rezkiy37 I think we need a tweak to the tests section. FAB refers to the floating + button, rather than the inline + in the composer as you've used in your tests. This one:

image

It's also probably worth specifying to test this on a policy (workspace) chat, as it's not clear that it shouldn't work on normal chats/reports. I think QA might have trouble testing using the example you've provided for creating local policyCategories, but I'm not sure how much of an issue that is!

Related to FAB, should we expect this to work with the FAB request money flow at this stage? When I try the flow FAB->Request Money->Select a workspace, I don't see the category picker at all:

chrome-fab-issue-2023-08-21_16.59.46.mp4

(It works for the same workspace via the inline + in the composer)

@rezkiy37
Copy link
Contributor Author

@jjcoffee, I agree with you.

  1. I will update the "Tests" section to match the videos.
  2. Actually, I don't have any another idea how to set mock values to the local OnyxDB. I haven't found any insert in the inspector. Maybe do you know better way to add data?
  3. In order with the Docs - Category Menu Item code sample, we don't expect this to work with the FAB request money flow. However, it is a good point to clarify.
  4. Fixed conflicts.

Thank you!

@rezkiy37
Copy link
Contributor Author

rezkiy37 commented Aug 21, 2023

@jjcoffee, I've just clarified it here. In short, we want to have this flow, but we will do it in a separate PR. Thank you for mentioned that case 🙂

@rezkiy37 rezkiy37 requested a review from jjcoffee August 21, 2023 17:23
@rezkiy37
Copy link
Contributor Author

@jjcoffee, I've extended the info on setting Onyx data.
Also, no worries for questions, feel free to ask 🙂

Copy link
Contributor

@jjcoffee jjcoffee 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 yuwenmemon August 22, 2023 11:51
Copy link
Contributor

@puneetlath puneetlath left a comment

Choose a reason for hiding this comment

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

Looks pretty good to me! Just some small feedback. Definitely want @yuwenmemon's feedback as well.

@puneetlath
Copy link
Contributor

One thing I noticed, the category doesn't actually seem to get selected and added to the expense. Should that be happening in this PR? Or does that happen later?

Copy link
Contributor

@yuwenmemon yuwenmemon left a comment

Choose a reason for hiding this comment

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

Looking great! I presume this is just part of the overall solution, and we'll implement the following in other PRs, correct?

  • Formulating the option tree/options - getOptions / getOptionsTree
  • Saving the category
  • Editing a pre-existing money request

@yuwenmemon
Copy link
Contributor

This is the first PR of three for the issue. Goals for this PR:
Add a “Category” menu item to the Money Request screen.
Create a basic Category Picker screen. It includes: title, description and simple list.

Ah, yep. Nice 👍

@yuwenmemon
Copy link
Contributor

yuwenmemon commented Aug 22, 2023

Also as a side note no one (not even beta users) will be able to see categories until the policy is passed to the MoneyRequestConfirmationList (which will be done shortly as a part of #22710)

Which is fine!

@rezkiy37
Copy link
Contributor Author

@puneetlath, @yuwenmemon, thank you for review. I've updated the PR, please take a look 🙂

@rezkiy37
Copy link
Contributor Author

BTW, I've added info to the description that the backend is now sending categories.

@yuwenmemon yuwenmemon merged commit 32a72ac into Expensify:main Aug 23, 2023
@OSBotify
Copy link
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.

@OSBotify
Copy link
Contributor

🚀 Deployed to staging by https://github.com/yuwenmemon in version: 1.3.57-0 🚀

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

@OSBotify
Copy link
Contributor

🚀 Deployed to staging by https://github.com/yuwenmemon in version: 1.3.58-0 🚀

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

@OSBotify
Copy link
Contributor

🚀 Deployed to production by https://github.com/luacmartins in version: 1.3.57-6 🚀

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

@OSBotify
Copy link
Contributor

🚀 Deployed to production by https://github.com/luacmartins in version: 1.3.58-5 🚀

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

@Santhosh-Sellavel
Copy link
Collaborator

Santhosh-Sellavel commented Nov 6, 2023

We failed to add subtitle for the category page which resulted in this regression #28952

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