Put category and tag approvers behind a new beta by marcaaron · Pull Request #49811 · Expensify/App

marcaaron · 2024-09-26T20:04:37Z

Details

cc @JmillsExpensify puts the Category and Tag approver parts of OldDot Rules Migration behind a new beta.

Fixed Issues (Part 2)

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

Tests

Test with an account that has the workspaceRules beta enabled, workflows, approvals, and the categoryAndTagApprovers beta disabled (on dev apply the diff below)

diff --git a/src/libs/Permissions.ts b/src/libs/Permissions.ts
index 18d2810fd2f..be1859fbdba 100644
--- a/src/libs/Permissions.ts
+++ b/src/libs/Permissions.ts
@@ -46,6 +46,7 @@ function canUseWorkspaceRules(betas: OnyxEntry<Beta[]>): boolean {
 }

 function canUseCategoryAndTagApprovers(betas: OnyxEntry<Beta[]>): boolean {
+    return false;
     return !!betas?.includes(CONST.BETAS.CATEGORY_AND_TAG_APPROVERS) || canUseAllBetas(betas);
 }

Enable categories and tags
Add a new tag
Navigate to a tag setting and verify the option to add an approver are not present
Navigate to a category setting and verify the option to add an approver are not present

Verify that no errors appear in the JS console

Offline tests

❌

QA Steps

Same as tests

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Android: Native

Android: mWeb Chrome

iOS: Native

iOS: mWeb Safari

MacOS: Chrome / Safari

MacOS: Desktop

melvin-bot · 2024-09-27T00:40:39Z

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

marcaaron · 2024-09-27T00:54:58Z

To my future internal reviewer whenever you get assigned... I'm probably already OOO for the week, but if you can make sure this PR gets merged while I'm gone would be great.

cc @JmillsExpensify can maybe find me a replacement if that trick fails :)

This is one of the last things blocking us from OldDot Rules Migration roll out 🎉

mananjadhav · 2024-09-27T01:01:25Z

@marcaaron I can see it's held on Web PR, but does this need C+ review?

marcaaron · 2024-09-27T01:10:47Z

Yes the beta will be added whenever it's added, but the test steps are the same.

mananjadhav · 2024-09-27T01:16:21Z

Cool will review and test this.

mananjadhav

I reviewed the code and I think I'll start with the checklist despite being on Hold for Web? We're only disabling the feature right?

dylanexpensify · 2024-10-01T22:10:14Z

Web-E PR is on prod now!

mananjadhav · 2024-10-07T06:47:57Z

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

Android: mWeb Chrome

iOS: Native

iOS: mWeb Safari

MacOS: Chrome / Safari

MacOS: Desktop

marcaaron · 2024-10-07T21:38:45Z

The beta should be live now. I will fix the conflicts. @mananjadhav I see you started the checklist, but did not complete it. Let me know if you're blocked on anything.

marcaaron · 2024-10-07T22:38:54Z

Prettier issue should be resolved soon https://expensify.slack.com/archives/C03V9A4TB/p1728339612502319?thread_ts=1728334029.063939&cid=C03V9A4TB

mananjadhav · 2024-10-08T03:01:45Z

The app was running very slow and delayed yesterday. I'll finish the checklist today.

melvin-bot · 2024-10-08T13:14:53Z

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

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

marcaaron · 2024-10-08T18:23:54Z

@grgia Gonna get another reviewer and try to get this one merged since the changes are fairly trivial and we are just adding some code to wall certain features behind a beta - and that code is also behind a beta 😄

neil-marcellini

Looks good and makes sense if this part of the feature is still incomplete, but we want to release workspace rules.

OSBotify · 2024-10-08T18:40:31Z

✋ This PR was not deployed to staging yet because QA is ongoing. It will be automatically deployed to staging after the next production release.

github-actions · 2024-10-09T20:47:05Z

🚀 Deployed to staging by https://github.com/neil-marcellini in version: 9.0.47-1 🚀

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

github-actions · 2024-10-10T23:02:16Z

🚀 Deployed to production by https://github.com/thienlnam in version: 9.0.47-4 🚀

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

Put category and tag approvers behind a new beta

cc2aca1

marcaaron self-assigned this Sep 26, 2024

marcaaron added 2 commits September 26, 2024 10:06

Hide the More Features cta text on CategorySettingsPage

246fa81

Merge branch 'main' into marcaaron-categoryAndTagApproversBeta

cc95a3b

marcaaron marked this pull request as ready for review September 27, 2024 00:40

marcaaron requested a review from a team as a code owner September 27, 2024 00:40

melvin-bot Bot requested a review from mananjadhav September 27, 2024 00:40

melvin-bot Bot removed the request for review from a team September 27, 2024 00:40

mananjadhav reviewed Oct 1, 2024

View reviewed changes

dylanexpensify changed the title ~~[HOLD Web-E #43712] Put category and tag approvers behind a new beta~~ Put category and tag approvers behind a new beta Oct 1, 2024

Fix conflicts

7f09f54

marcaaron requested a review from mananjadhav October 7, 2024 21:39

Merge branch 'main' into marcaaron-categoryAndTagApproversBeta

9d95fbf

Merge branch 'main' into marcaaron-categoryAndTagApproversBeta

ac9116e

mananjadhav approved these changes Oct 8, 2024

View reviewed changes

melvin-bot Bot requested a review from grgia October 8, 2024 13:14

melvin-bot Bot mentioned this pull request Oct 8, 2024

[Payment due Oct 18]Payment issue for E/App PR#49811 #50413

Closed

Expensify deleted a comment from melvin-bot Bot Oct 8, 2024

marcaaron removed the request for review from grgia October 8, 2024 18:23

neil-marcellini self-requested a review October 8, 2024 18:26

neil-marcellini approved these changes Oct 8, 2024

View reviewed changes

neil-marcellini merged commit 7e80021 into main Oct 8, 2024

neil-marcellini deleted the marcaaron-categoryAndTagApproversBeta branch October 8, 2024 18:30

github-actions Bot mentioned this pull request Oct 9, 2024

Deploy Checklist: New Expensify 2024-10-09 #50518

Closed

58 tasks

Uh oh!

Conversation

marcaaron commented Sep 26, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Details

Fixed Issues (Part 2)

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

Uh oh!

melvin-bot Bot commented Sep 27, 2024

Uh oh!

marcaaron commented Sep 27, 2024

Uh oh!

mananjadhav commented Sep 27, 2024

Uh oh!

marcaaron commented Sep 27, 2024

Uh oh!

mananjadhav commented Sep 27, 2024

Uh oh!

mananjadhav left a comment

Choose a reason for hiding this comment

Uh oh!

dylanexpensify commented Oct 1, 2024

Uh oh!

mananjadhav commented Oct 7, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Reviewer Checklist

Screenshots/Videos

Uh oh!

marcaaron commented Oct 7, 2024

Uh oh!

marcaaron commented Oct 7, 2024

Uh oh!

mananjadhav commented Oct 8, 2024

Uh oh!

melvin-bot Bot commented Oct 8, 2024

Uh oh!

marcaaron commented Oct 8, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

neil-marcellini left a comment

Choose a reason for hiding this comment

Uh oh!

OSBotify commented Oct 8, 2024

Uh oh!

github-actions Bot commented Oct 9, 2024

Uh oh!

github-actions Bot commented Oct 10, 2024

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

marcaaron commented Sep 26, 2024 •

edited

Loading

mananjadhav commented Oct 7, 2024 •

edited

Loading

marcaaron commented Oct 8, 2024 •

edited

Loading