Remove the categories beta by yuwenmemon · Pull Request #28296 · Expensify/App

yuwenmemon · 2023-09-27T04:09:38Z

@puneetlath please review (and merge when you feel comfortable to set categories out of beta)

Details

Removes the categories Beta. I.e., shows the categories selectors in the MoneyRequestConfirmationList and the MoneyRequestView

Fixed Issues

$ https://github.com/Expensify/Expensify/issues/308355

Tests

Create a Workspace money request. Ensure that you see a selector to choose a category for the Expense
Select a category. Create the request
Open the created request, and ensure that you see a selector to choose a category when editing the request

Offline tests

Same as above.

QA Steps

Same as above, both offline and online.
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

Mobile Web - Chrome

Mobile Web - Safari

Desktop

iOS

Android

melvin-bot · 2023-09-27T04:09:42Z

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

yuwenmemon · 2023-09-27T05:04:17Z

Test fail is not unique to this PR: https://expensify.slack.com/archives/C01GTK53T8Q/p1695788055569909

fedirjh · 2023-09-27T17:05:18Z

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

Mobile Web - Chrome

Mobile Web - Safari

Desktop

iOS

Android

CleanShot.2023-09-27.at.18.03.49.mp4

fedirjh

LGTM

fedirjh · 2023-09-27T17:06:54Z

Should merge main to resolve failing test.

melvin-bot · 2023-09-27T17:07:03Z

@pecanoro 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 · 2023-09-27T17:07:08Z

🎯 @fedirjh, thanks for reviewing and testing this PR! 🎉

An E/App issue has been created to issue payment here: #28333.

pecanoro · 2023-09-28T04:49:32Z

Conflicts!

pecanoro · 2023-10-02T05:10:23Z

@puneetlath Waiting on your final review!

puneetlath · 2023-10-02T07:38:31Z

Going to approve/merge after this: https://expensify.slack.com/archives/C9YU7BX5M/p1696223764861079

pecanoro · 2023-10-10T08:10:30Z

It is taking a while so we have some conflicts!

pecanoro · 2023-10-10T08:10:54Z

@puneetlath Do you want me to solve the conflicts since Yuwen is out?

fedirjh · 2023-10-10T10:16:38Z

We should update this line as well :

App/src/pages/EditRequestPage.js

Line 126 in a63f853

    
           const shouldShowCategories = isPolicyExpenseChat && Permissions.canUseCategories(betas) && (transactionCategory || OptionsListUtils.hasEnabledOptions(lodashValues(policyCategories)));

pecanoro · 2023-10-11T12:41:24Z

@puneetlath friendly bump so we know how to proceed!

puneetlath · 2023-10-11T15:51:36Z

Whoops, sorry, I commented on the GH issue but not here. Just waiting for this bug to be fixed: #28964

Then I'll fix conflicts and you can re-review. Cool?

pecanoro · 2023-10-17T22:51:33Z

@puneetlath Sounds good! I will be ready for another re-review hehe

puneetlath · 2023-10-24T15:03:58Z

Just merged the PR that we were waiting on. So as long as it makes it to production without getting reverted, I'll clean this PR up in the next day or two.

puneetlath · 2023-10-26T13:39:29Z

@pecanoro this is off hold and ready for another quick review!

pecanoro

Looking good and it seems to work from what I tested!

OSBotify · 2023-10-26T16:08:21Z

✋ 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 · 2023-10-26T22:59:29Z

🚀 Deployed to staging by https://github.com/pecanoro in version: 1.3.92-0 🚀

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

OSBotify · 2023-10-30T07:42:47Z

🚀 Deployed to production by https://github.com/Beamanator in version: 1.3.92-4 🚀

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

OSBotify · 2023-10-30T08:03:47Z

🚀 Deployed to staging by https://github.com/pecanoro in version: 1.3.93-0 🚀

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

OSBotify · 2023-10-31T21:36:56Z

🚀 Deployed to production by https://github.com/Beamanator in version: 1.3.93-1 🚀

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

yuwenmemon added 2 commits September 27, 2023 11:35

Remove the categories beta

4785593

Merge branch 'main' of github.com:Expensify/App into yuwen-removeCatBeta

2672054

yuwenmemon requested a review from a team as a code owner September 27, 2023 04:09

yuwenmemon assigned puneetlath Sep 27, 2023

melvin-bot bot removed the request for review from a team September 27, 2023 04:09

melvin-bot bot requested a review from fedirjh September 27, 2023 04:09

yuwenmemon assigned yuwenmemon and unassigned puneetlath Sep 27, 2023

yuwenmemon requested a review from puneetlath September 27, 2023 04:09

yuwenmemon added 2 commits September 27, 2023 16:03

Fix JS error

7e4e58f

Merge branch 'main' of github.com:Expensify/App into yuwen-removeCatBeta

ca550a5

fedirjh approved these changes Sep 27, 2023

View reviewed changes

melvin-bot bot requested a review from pecanoro September 27, 2023 17:07

melvin-bot bot mentioned this pull request Sep 27, 2023

[$500] 5 Sep 2023 - Payment issue for E/App PR#28296 #28333

Closed

pecanoro previously approved these changes Sep 28, 2023

View reviewed changes

Merge branch 'main' of github.com:Expensify/App into yuwen-removeCatBeta

12f3816

Fix conflicts

b7fceda

yuwenmemon dismissed pecanoro’s stale review via b7fceda September 28, 2023 12:54

pecanoro previously approved these changes Sep 29, 2023

View reviewed changes

Merge main into branch

d20f983

puneetlath dismissed pecanoro’s stale review via d20f983 October 26, 2023 13:27

Remove one more case of canUseCategories

0d3830e

puneetlath self-assigned this Oct 26, 2023

puneetlath removed their request for review October 26, 2023 13:32

Prettier fix

f3d70cc

pecanoro approved these changes Oct 26, 2023

View reviewed changes

pecanoro merged commit 8c76d2a into main Oct 26, 2023

pecanoro deleted the yuwen-removeCatBeta branch October 26, 2023 16:01

OSBotify mentioned this pull request Oct 26, 2023

Deploy Checklist: New Expensify 2023-10-26 #30469

Closed

64 tasks

OSBotify mentioned this pull request Oct 30, 2023

Deploy Checklist: New Expensify 2023-10-30 #30560

Closed

Conversation

yuwenmemon commented Sep 27, 2023

Details

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

Uh oh!

melvin-bot bot commented Sep 27, 2023

Uh oh!

yuwenmemon commented Sep 27, 2023

Uh oh!

fedirjh commented Sep 27, 2023

Reviewer Checklist

Screenshots/Videos

Uh oh!

fedirjh left a comment

Choose a reason for hiding this comment

Uh oh!

fedirjh commented Sep 27, 2023

Uh oh!

melvin-bot bot commented Sep 27, 2023

Uh oh!

melvin-bot bot commented Sep 27, 2023

Uh oh!

pecanoro commented Sep 28, 2023

Uh oh!

pecanoro commented Oct 2, 2023

Uh oh!

puneetlath commented Oct 2, 2023

Uh oh!

pecanoro commented Oct 10, 2023

Uh oh!

pecanoro commented Oct 10, 2023

Uh oh!

fedirjh commented Oct 10, 2023

Uh oh!

pecanoro commented Oct 11, 2023

Uh oh!

puneetlath commented Oct 11, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

pecanoro commented Oct 17, 2023

Uh oh!

puneetlath commented Oct 24, 2023

Uh oh!

puneetlath commented Oct 26, 2023

Uh oh!

pecanoro left a comment

Choose a reason for hiding this comment

Uh oh!

OSBotify commented Oct 26, 2023

Uh oh!

OSBotify commented Oct 26, 2023

Uh oh!

OSBotify commented Oct 30, 2023

Uh oh!

OSBotify commented Oct 30, 2023

Uh oh!

OSBotify commented Oct 31, 2023

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

puneetlath commented Oct 11, 2023 •

edited

Loading