Feat/workspace categories settings #37133

ArekChr · 2024-02-23T11:48:32Z

Details

This PR addresses the implementation of the categories settings page, allowing to enable or disable the expense category requirement.

Fixed Issues

$ #35706
PROPOSAL: https://docs.google.com/document/d/1gk3xqOs7epMbUrSSiX8K7YcqfPLVgqEos0sf-D-GMDA/edit#bookmark=id.2cvhhb9mrm8w

Tests

Verify that no errors appear in the JS console
Pre-requisite: an account in the violations beta

Navigate to the workspace settings as an admin within a paid policy group.
Verify that you can access the workspace categories settings page.
Verify that you can disable and enable "categorize all spend" option.
Access workspace settings as a member/admin with a free group policy or member of paid policy group
Replace the sub-path /profile with /categories/settings in the URL.
Confirm that you are unable to access the categories page.
Navigate to Workspace Settings > Collect Workspace > Categories > Settings
Verify that Members must categorize all spend is off
Navigate to the Workspace chat for that Workspace
+ > Request money and verify that Category is not required
Navigate to Workspace Settings > Collect Workspace > Categories > Settings
Turn on Members must categorize all spend
Repeat step 4 and verify that category shows up as required (only shown if account is in the violations beta). Note that we can still submit the request without adding a category, this is intended as we don't block the user and instead show a violation after the request is made.
Make the request, verify that there's a RBR icon next to the request and the category shows an error.

Screen.Recording.2024-02-23.at.10.31.36.AM.mov

Offline tests

Switch network off
Go to workspace with paid policy group as a admin
Go to workspace categories settings
toggle on or off "members must categorize all spend"
Switch network on
Verify that toggle has changed and is not "disabled"

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

307329869-4164c182-d822-44b4-b21c-983f5a26a8bb.mov

MacOS: Desktop

melvin-bot · 2024-02-23T13:47:52Z

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

allroundexperts · 2024-02-23T17:21:45Z

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 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(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 form input styles:
- I verified that all the inputs inside a form are aligned with each other.
- I added Design label 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

Screen.Recording.2024-02-27.at.11.46.02.AM.mov

Android: mWeb Chrome

Screen.Recording.2024-02-27.at.11.43.38.AM.mov

iOS: Native

Screen.Recording.2024-02-27.at.11.37.46.AM.mov

iOS: mWeb Safari

Screen.Recording.2024-02-27.at.11.32.51.AM.mov

MacOS: Chrome / Safari

Screen.Recording.2024-02-27.at.11.20.51.AM.mov

Screen.Recording.2024-02-27.at.11.22.52.AM.mov

MacOS: Desktop

Screen.Recording.2024-02-27.at.11.29.01.AM.mov

luacmartins

Nice, changes LGTM. Did some basic testing and things seem to work well. I'm gonna add the following to the test steps:

Navigate to Workspace Settings > Collect Workspace > Categories > Settings
Verify that Members must categorize all spend is off
Navigate to the Workspace chat for that Workspace
+ > Request money and verify that Category` is not required
Navigate to Workspace Settings > Collect Workspace > Categories > Settings
Turn on Members must categorize all spend
Repeat step 4 and verify that category shows up as required. Note that we can still submit the request without adding a category, this is intended as we don't block the user and instead show a violation after the request is made.
Make the request, verify that there's a RBR icon next to the request and the category shows an error.

Screen.Recording.2024-02-23.at.10.31.36.AM.mov

allroundexperts · 2024-02-23T18:18:14Z

BUG

Setting the toggle optimistically does not result in the category option showing up as required.

Screen.Recording.2024-02-23.at.11.11.38.PM.mov

allroundexperts · 2024-02-23T18:18:56Z

NitPick: I don't see You are offline message being shown anywhere else on the RHN. Are we sure that we want to show it here?

luacmartins · 2024-02-23T18:27:28Z

@ArekChr we also have conflicts now

allroundexperts · 2024-02-23T18:36:07Z

Even when I am online, the required flag is not showing up for me. I'm using a paid policy with id 1F27FEAE0B1064E5.

Screen.Recording.2024-02-23.at.11.30.38.PM.mov

luacmartins · 2024-02-23T18:55:15Z

@allroundexperts oh that's weird. I definitely saw the required flag (see my video in the OP). Is the call to SetWorkspaceRequiresCategoryParams returning an error for you?

allroundexperts · 2024-02-23T19:03:10Z

Getting the following. Let's wait for the conflicts to get resolved I guess?

ArekChr · 2024-02-26T08:47:29Z

Conflicts resolved

ArekChr · 2024-02-26T08:51:39Z

NitPick: I don't see You are offline message being shown anywhere else on the RHN. Are we sure that we want to show it here?

You're right, last time i saw in year of birth page but it seems it has been removed, fixing

cubuspl42 · 2024-02-26T09:40:58Z

Will this require a double C+ review? I see that @allroundexperts started working on this

allroundexperts · 2024-02-26T17:40:42Z

@ArekChr Did you manage to find a solution for #37133 (comment)?

luacmartins

Left a comment about the offline styles. Everything else looks good to me.

I'm not seeing the issue with the required flag that @allroundexperts mentioned. It works for me both online and offline.

Screen.Recording.2024-02-26.at.12.12.01.PM.mov

src/pages/workspace/categories/WorkspaceCategoriesSettingsPage.tsx

luacmartins · 2024-02-26T19:45:49Z

@cubuspl42 I think we can let @allroundexperts handle this once since they already got started. Thanks for checking though

shawnborton · 2024-02-27T02:22:47Z

Cool, I agree with the prior feedback that the Offline indicator should be at the very bottom of the view.

Otherwise this screen looks good to me:

allroundexperts · 2024-02-27T06:55:18Z

@ArekChr Are you waiting on translations for the checklist?

allroundexperts · 2024-02-27T07:01:21Z

On a Paid workspace whose trial is expired, we're showing the option to enforce categories but when requesting money from the workspace, the category does not show up as required. @ArekChr Can you maybe check why is this the case?

This reverts commit 3fb6e98.

ArekChr · 2024-02-27T10:06:20Z

@ArekChr Did you manage to find a solution for #37133 (comment)?

I have the same issue when setting requires category to true, category is still not required in manual request. Checked that and this is because requires category flag is set to require a logical AND condition together with the canUseViolations flag, I'm not pretty sure what means canUseViolations. cc @luacmartins

App/src/components/MoneyTemporaryForRefactorRequestConfirmationList.js

Line 312 in 1c0d6b9

    
           const isCategoryRequired = canUseViolations && lodashGet(policy, 'requiresCategory', false);

ArekChr · 2024-02-27T10:06:40Z

@ArekChr Are you waiting on translations for the checklist?

Translations reviewed, all good!

ArekChr · 2024-02-27T10:08:14Z

On a Paid workspace whose trial is expired, we're showing the option to enforce categories but when requesting money from the workspace, the category does not show up as required. @ArekChr Can you maybe check why is this the case?

The same as above, I think this relates to canUseViolations flag from permissions

ArekChr · 2024-02-27T10:14:19Z

Cool, I agree with the prior feedback that the Offline indicator should be at the very bottom of the view.

Otherwise this screen looks good to me:

I'm confused again, so do we want to show it at very bottom or remove at all?

Double checked it, we don't show offline indicator in other RHP pages

shawnborton · 2024-02-27T13:03:07Z

Ah, ignore me then - didn't mean to suggest we add it back if we decided not to include it. Though it does look like we show the offline indicator in the RHP on mobile views as a heads up.

luacmartins · 2024-02-27T19:22:09Z

I have the same issue when setting requires category to true, category is still not required in manual request. Checked that and this is because requires category flag is set to require a logical AND condition together with the canUseViolations flag, I'm not pretty sure what means canUseViolations

Nice find @ArekChr. That's just a check to verify that the user is part of the violations beta, but we can remove that and always show the required flag if requiresCategory = true. NAB though.

luacmartins

LGTM!

allroundexperts

Looks good other than the NAB.

luacmartins · 2024-02-27T19:27:36Z

Hmm actually @JmillsExpensify just mentioned that we should keep that beta check for now. So I'm just gonna update the test steps and I think we're good to merge.

OSBotify · 2024-02-27T19:35:26Z

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

ArekChr · 2024-02-28T07:59:00Z

🚀

OSBotify · 2024-02-29T00:07:49Z

🚀 Deployed to staging by https://github.com/luacmartins in version: 1.4.45-0 🚀

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

OSBotify · 2024-02-29T23:32:17Z

🚀 Deployed to production by https://github.com/puneetlath in version: 1.4.45-6 🚀

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

parasharrajat · 2024-04-18T12:59:24Z

src/pages/workspace/categories/WorkspaceCategoriesSettingsPage.tsx

+                        >
+                            <View style={[styles.mt2, styles.mh4]}>
+                                <View style={[styles.flexRow, styles.mb5, styles.mr2, styles.alignItemsCenter, styles.justifyContentBetween]}>
+                                    <Text style={[styles.textNormal, styles.colorMuted]}>{translate('workspace.categories.requiresCategory')}</Text>


The text does not wrap properly which caused #38370

ArekChr added 4 commits February 23, 2024 12:46

feat: implement settings page

bf10806

Merge branch 'main' into feat/workspace_categories_settings

40c01b3

fix: add pending fields

98f1576

fix: header button styles on mobile devices

a126e7d

ArekChr marked this pull request as ready for review February 23, 2024 13:47

ArekChr requested a review from a team as a code owner February 23, 2024 13:47

melvin-bot bot requested review from cubuspl42 and removed request for a team February 23, 2024 13:47

luacmartins requested review from luacmartins and allroundexperts February 23, 2024 17:19

luacmartins previously approved these changes Feb 23, 2024

View reviewed changes

luacmartins self-requested a review February 23, 2024 18:27

Merge branch 'main' into feat/workspace_categories_settings

e9cf472

ArekChr dismissed luacmartins’s stale review via e9cf472 February 26, 2024 08:46

fix: remove offline indicator

3fb6e98

luacmartins requested changes Feb 26, 2024

View reviewed changes

src/pages/workspace/categories/WorkspaceCategoriesSettingsPage.tsx Outdated Show resolved Hide resolved

luacmartins removed the request for review from cubuspl42 February 26, 2024 19:45

luacmartins added the Design label Feb 26, 2024

ArekChr added 3 commits February 27, 2024 10:31

Merge branch 'main' into feat/workspace_categories_settings

12a204f

Revert "fix: remove offline indicator"

edb2251

This reverts commit 3fb6e98.

fix: remove shouldShowOfflineIndicatorInWideScreen

b69d717

ArekChr requested a review from luacmartins February 27, 2024 10:14

luacmartins approved these changes Feb 27, 2024

View reviewed changes

allroundexperts approved these changes Feb 27, 2024

View reviewed changes

melvin-bot bot requested a review from luacmartins February 27, 2024 19:26

luacmartins approved these changes Feb 27, 2024

View reviewed changes

luacmartins merged commit 04644d8 into Expensify:main Feb 27, 2024
17 of 18 checks passed

github-actions bot mentioned this pull request Feb 27, 2024

[HOLD for payment 2024-03-13] Investigate workflow job failing on main: e2ePerformanceTests / Run E2E tests in AWS device farm #37345

Closed

github-actions bot mentioned this pull request Feb 28, 2024

Deploy Checklist: New Expensify 2024-02-28 #37459

Closed

91 tasks

lakchote mentioned this pull request Feb 29, 2024

Category - Offline indicator appears below "Members must categorize.." instead of page bottom #37507

Closed

6 tasks

melvin-bot bot mentioned this pull request Feb 29, 2024

[HOLD for payment 2024-03-07] [$500] [Simplified Collect][Categories] WorkspaceCategoriesSettingsPage: full page implementation - toggle require categories policy, onyx action #35706

Closed

parasharrajat reviewed Apr 18, 2024

View reviewed changes

parasharrajat mentioned this pull request Apr 18, 2024

[HOLD for payment 2024-04-25] [$125] No spacing between explanatory text and toggle button in "settings" #38370

Closed

6 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Feat/workspace categories settings #37133

Feat/workspace categories settings #37133

ArekChr commented Feb 23, 2024 •

edited by luacmartins

Loading

melvin-bot bot commented Feb 23, 2024

allroundexperts commented Feb 23, 2024 •

edited

Loading

luacmartins left a comment

allroundexperts commented Feb 23, 2024 •

edited

Loading

allroundexperts commented Feb 23, 2024

luacmartins commented Feb 23, 2024

allroundexperts commented Feb 23, 2024

luacmartins commented Feb 23, 2024

allroundexperts commented Feb 23, 2024

ArekChr commented Feb 26, 2024

ArekChr commented Feb 26, 2024

cubuspl42 commented Feb 26, 2024

allroundexperts commented Feb 26, 2024

luacmartins left a comment •

edited

Loading

luacmartins commented Feb 26, 2024

shawnborton commented Feb 27, 2024

allroundexperts commented Feb 27, 2024

allroundexperts commented Feb 27, 2024

ArekChr commented Feb 27, 2024 •

edited

Loading

ArekChr commented Feb 27, 2024

ArekChr commented Feb 27, 2024

ArekChr commented Feb 27, 2024

shawnborton commented Feb 27, 2024

luacmartins commented Feb 27, 2024 •

edited

Loading

luacmartins left a comment

allroundexperts left a comment

luacmartins commented Feb 27, 2024

OSBotify commented Feb 27, 2024

ArekChr commented Feb 28, 2024

OSBotify commented Feb 29, 2024

OSBotify commented Feb 29, 2024

parasharrajat Apr 18, 2024

Feat/workspace categories settings #37133

Feat/workspace categories settings #37133

Conversation

ArekChr commented Feb 23, 2024 • edited by luacmartins Loading

Details

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

melvin-bot bot commented Feb 23, 2024

allroundexperts commented Feb 23, 2024 • edited Loading

Reviewer Checklist

Screenshots/Videos

luacmartins left a comment

Choose a reason for hiding this comment

allroundexperts commented Feb 23, 2024 • edited Loading

allroundexperts commented Feb 23, 2024

luacmartins commented Feb 23, 2024

allroundexperts commented Feb 23, 2024

luacmartins commented Feb 23, 2024

allroundexperts commented Feb 23, 2024

ArekChr commented Feb 26, 2024

ArekChr commented Feb 26, 2024

cubuspl42 commented Feb 26, 2024

allroundexperts commented Feb 26, 2024

luacmartins left a comment • edited Loading

Choose a reason for hiding this comment

luacmartins commented Feb 26, 2024

shawnborton commented Feb 27, 2024

allroundexperts commented Feb 27, 2024

allroundexperts commented Feb 27, 2024

ArekChr commented Feb 27, 2024 • edited Loading

ArekChr commented Feb 27, 2024

ArekChr commented Feb 27, 2024

ArekChr commented Feb 27, 2024

shawnborton commented Feb 27, 2024

luacmartins commented Feb 27, 2024 • edited Loading

luacmartins left a comment

Choose a reason for hiding this comment

allroundexperts left a comment

Choose a reason for hiding this comment

luacmartins commented Feb 27, 2024

OSBotify commented Feb 27, 2024

ArekChr commented Feb 28, 2024

OSBotify commented Feb 29, 2024

OSBotify commented Feb 29, 2024

parasharrajat Apr 18, 2024

Choose a reason for hiding this comment

ArekChr commented Feb 23, 2024 •

edited by luacmartins

Loading

allroundexperts commented Feb 23, 2024 •

edited

Loading

allroundexperts commented Feb 23, 2024 •

edited

Loading

luacmartins left a comment •

edited

Loading

ArekChr commented Feb 27, 2024 •

edited

Loading

luacmartins commented Feb 27, 2024 •

edited

Loading