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

Allow Viewing/Editing a category on a Money Request #27459

Merged

Conversation

rezkiy37
Copy link
Contributor

@rezkiy37 rezkiy37 commented Sep 14, 2023

Details

The PR introduces a flow to view and edit a category on an already created money request.
Also, in a scope of this PR, there is a fix to hide categories/tags for DM.

Fixed Issues

$ #24464, #27556
PROPOSAL: N/A

Tests

Note:

  1. You need a beta - newDotCategories.
  2. You need settings via Supportal in OldDot to enable/disable categories.
  3. The backend is not ready yet to test updating categories. Changes on the frontend part work because of the optimistic data.

1. Viewing a Money Request with a category

  1. Open a workspace chat where categories are enabled.
  2. Create a new money request with a category.
  3. Dive into requests and open a newly created money request edit page.
  4. Verify that there is a field - "Category" and a value equals the previously selected category.

2. Viewing a Money Request without a category

  1. Open a workspace chat where categories are enabled.
  2. Create a new money request without a category.
  3. Dive into requests and open a newly created money request edit page.
  4. Verify that there is a field - "Category" and there is not a value.

3. Viewing a Money Request within private messages

  1. Open a private chat.
  2. Create a new money request.
  3. Dive into requests and open a newly created money request edit page.
  4. Verify that there isn't a field - "Category".

4. Editing a category on a Money Request

  1. Open a workspace chat where categories are enabled.
  2. Create a new money request with a category.
  3. Dive into requests and open a newly created money request edit page.
  4. Verify that there is a field - "Category" and a value equals the previously selected category.
  5. Click on the field.
  6. Verify that there is a list of categories.
  7. Select a new category.
  8. Verify that the app redirects you to the previous page.
  9. Verify that there is the new category of the field - "Category".
  10. Click on the field.
  11. Click on the selected category.
  12. Verify that the app redirects you to the previous page.
  13. Verify that there isn't a value of the field - "Category" anymore.

5. Editing a Money Request without an initial category

  1. Open a workspace chat where categories are enabled.
  2. Create a new money request without a category.
  3. Dive into requests and open a newly created money request edit page.
  4. Verify that there is a field - "Category" and there is not a value.
  5. Click on the field.
  6. Select a new category.
  7. Verify that the app redirects you to the previous page.
  8. Verify that there is the new category of the field - "Category".

6. The Category/Tag selector does not show up in DM Money Requests

  1. Open a DM (private) chat.
  2. Create a new money request.
  3. Verify that there is not the category and tag selectors.
  4. Dive into requests and open a newly created money request edit page.
  5. Verify that there is not the category and tag selectors.

A couple of other notes about editing categories:

If a category is disabled, but was already selected on a Money Request, when the user clicks the category to edit it, the disabled but selected category will show in the "Selected Category" section. Unselecting it will make it disappear since the user will be navigated back to the expense, saving an empty category on it.

  • Should they open the list again, because the category was disabled, they will not be able to see it to re-select it.
  • The same would apply if there were < 8 categories on the policy. We would just show the selected category directly in the list of categories itself.

If categories are completely disabled, or there are no enabled categories on the policy, but there is a category on an expense…

  • When the user clicks the category to edit it, the lone category will be shown as the only category in the policy.

  • This will use the "simplified" < 8 categories view.

  • Deselecting the category will again navigate the user back to the expense.

  • This time, because there are no categories on the policy and no category is selected, the Category menu item will disappear.

  • Verify that no errors appear in the JS console

Offline tests

1. Editing a category on a Money Request

  1. Open a workspace chat where categories are enabled.
  2. Create a new money request with/without a category.
  3. Go offline.
  4. Dive into requests and open a newly created money request edit page.
  5. Verify that there is a field - "Category" and there is not a value/there is a value.
  6. Click on the field.
  7. Select a new category.
  8. Verify that the app redirects you to the previous page.
  9. Verify that there is the new category of the field - "Category".
  10. Verify that the field is in a "greyed out" state.
  11. Back online.
  12. Verify that the field in a normal state once sync ups.

QA Steps

Same as "Test" and "Offline 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
all-disabled_qt6lgRpq.mp4
Selected.disabled.mov
Mobile Web - Chrome
IOS.Chrome.MP4
Mobile Web - Safari
IOS.Safari.MP4
Desktop
Desktop.mov
iOS
IOS.mov
Android
Android.mov

src/libs/TransactionUtils.js Outdated Show resolved Hide resolved
src/libs/TransactionUtils.js Outdated Show resolved Hide resolved
src/libs/TransactionUtils.js Outdated Show resolved Hide resolved
src/libs/TransactionUtils.js Outdated Show resolved Hide resolved
src/libs/OptionsListUtils.js Outdated Show resolved Hide resolved
src/libs/OptionsListUtils.js Outdated Show resolved Hide resolved
src/pages/EditRequestCategoryPage.js Outdated Show resolved Hide resolved
src/pages/EditRequestPage.js Show resolved Hide resolved
src/libs/OptionsListUtils.js Outdated Show resolved Hide resolved
src/libs/OptionsListUtils.js Outdated Show resolved Hide resolved
mountiny
mountiny previously approved these changes Sep 21, 2023
Copy link
Contributor

@mountiny mountiny left a comment

Choose a reason for hiding this comment

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

Great job @rezkiy37

@mountiny
Copy link
Contributor

@mananjadhav Yep go ahead please, you need to enable all betas and also this will only work with optimistic udpates, backend is not deployed yet

@yuwenmemon
Copy link
Contributor

@mananjadhav feel free to amend my checklist with screenshots when you have them.

@mountiny
Copy link
Contributor

Unit tests seem to be failing @rezkiy37

@rezkiy37
Copy link
Contributor Author

Unit tests seem to be failing @rezkiy37

There was a minor mistake after merging. Just fixed 🙂

@yuwenmemon yuwenmemon merged commit 00f77a7 into Expensify:main Sep 21, 2023
13 checks passed
@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.73-0 🚀

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

@OSBotify
Copy link
Contributor

🚀 Deployed to production by https://github.com/mountiny in version: 1.3.73-1 🚀

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

@OSBotify
Copy link
Contributor

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

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

@OSBotify
Copy link
Contributor

🚀 Deployed to production by https://github.com/chiragsalian in version: 1.3.74-3 🚀

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

@Santhosh-Sellavel
Copy link
Collaborator

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

@hoangzinh
Copy link
Contributor

We forgot to update policyRecentlyUsedCategories when implement editing a category on this PR, it causes a bug here #32230

We fixed here #32467

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.