fix: Toggle, GL code & Payroll code are no longer grayed out after renaming category by etCoderDysto · Pull Request #46176 · Expensify/App

etCoderDysto · 2024-07-25T10:21:01Z

Details

Fixed Issues

$ #45755
PROPOSAL: #45755 (comment)

Tests

Precondition:

Workspace is under Control plan.

Go to staging.new.expensify.com
Go offline
Go to workspace settings
Go to Categories.
Click on any category.
Click on the toggle, edit GL code and Payroll code.
Note that the options gray out.
Click on the category name.
Rename the category and save it.

Verify that the toggle, GL code, and Payroll code remained disabled
Verify that no errors appear in the JS console

Offline tests

QA Steps

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Android: Native

Android.mp4

Android: mWeb Chrome

Android.Web.mp4

iOS: Native

IOS.mp4

iOS: mWeb Safari

iOS.safari.mp4

MacOS: Chrome / Safari

Web.mp4

MacOS: Desktop

Desktop.mp4

melvin-bot · 2024-07-30T16:55:02Z

@rayane-djouah 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]

rayane-d · 2024-07-30T18:52:32Z

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

Screen.Recording.2024-08-01.at.3.12.47.PM.mov

Android: mWeb Chrome

Screen.Recording.2024-08-01.at.3.10.14.PM.mov

iOS: Native

Simulator.Screen.Recording.-.iPhone.15.Pro.Max.-.2024-08-01.at.15.15.27.mp4

iOS: mWeb Safari

Simulator.Screen.Recording.-.iPhone.15.Pro.Max.-.2024-08-01.at.15.12.13.mp4

MacOS: Chrome / Safari

Screen.Recording.2024-08-01.at.3.05.57.PM.mov

MacOS: Desktop

Screen.Recording.2024-08-01.at.3.07.43.PM.mov

rayane-d · 2024-08-01T14:28:16Z

src/libs/actions/Policy/Category.ts


 function renamePolicyCategory(policyID: string, policyCategory: {oldName: string; newName: string}) {
    const policyCategoryToUpdate = allPolicyCategories?.[`${ONYXKEYS.COLLECTION.POLICY_CATEGORIES}${policyID}`]?.[policyCategory.oldName] ?? {};
+    const pendingFields = allPolicyCategories?.[`${ONYXKEYS.COLLECTION.POLICY_CATEGORIES}${policyID}`]?.[policyCategory.oldName]?.pendingFields ?? {};


Suggested change

const pendingFields = allPolicyCategories?.[`${ONYXKEYS.COLLECTION.POLICY_CATEGORIES}${policyID}`]?.[policyCategory.oldName]?.pendingFields ?? {};

rayane-d · 2024-08-01T14:28:32Z

src/libs/actions/Policy/Category.ts

@@ -268,6 +268,7 @@ function createPolicyCategory(policyID: string, categoryName: string) {

 function renamePolicyCategory(policyID: string, policyCategory: {oldName: string; newName: string}) {
    const policyCategoryToUpdate = allPolicyCategories?.[`${ONYXKEYS.COLLECTION.POLICY_CATEGORIES}${policyID}`]?.[policyCategory.oldName] ?? {};


Suggested change

const policyCategoryToUpdate = allPolicyCategories?.[`${ONYXKEYS.COLLECTION.POLICY_CATEGORIES}${policyID}`]?.[policyCategory.oldName] ?? {};

const policyCategoryToUpdate = allPolicyCategories?.[`${ONYXKEYS.COLLECTION.POLICY_CATEGORIES}${policyID}`]?.[policyCategory.oldName];

rayane-d · 2024-08-01T14:29:07Z

src/libs/actions/Policy/Category.ts

                        name: policyCategory.newName,
                        pendingAction: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE,
                        pendingFields: {
+                            ...pendingFields,


Suggested change

...pendingFields,

...(policyCategoryToUpdate?.pendingFields ?? {}),

rayane-d · 2024-08-01T14:29:15Z

src/libs/actions/Policy/Category.ts

                        errors: null,
                        pendingAction: null,
                        pendingFields: {
+                            ...pendingFields,


Suggested change

...pendingFields,

...(policyCategoryToUpdate?.pendingFields ?? {}),

rayane-d · 2024-08-04T11:26:13Z

@etCoderDysto - Could you please address the above comments?

etCoderDysto · 2024-08-05T11:14:36Z

@etCoderDysto - Could you please address the above comments?

I have addressed the comments. Sorry for my late response.

rayane-d

LGTM and tests well

OSBotify · 2024-08-05T17:33: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.

OSBotify · 2024-08-06T04:27:56Z

🚀 Deployed to staging by https://github.com/iwiznia in version: 9.0.17-0 🚀

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

OSBotify · 2024-08-07T22:03:46Z

🚀 Deployed to production by https://github.com/marcaaron in version: 9.0.17-2 🚀

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

OSBotify · 2024-08-08T04:53:23Z

🚀 Deployed to production by https://github.com/marcaaron in version: 9.0.17-2 🚀

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

OSBotify · 2024-08-08T20:04:47Z

🚀 Deployed to production by https://github.com/marcaaron in version: 9.0.17-2 🚀

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

Grayed out fields remain grayed out when editing category name

7e42b44

etCoderDysto mentioned this pull request Jul 26, 2024

[HOLD for payment 2024-08-14] [$250] Categories - Toggle, GL code & Payroll code are no longer grayed out after renaming category #45755

Closed

6 tasks

etCoderDysto added 2 commits July 29, 2024 13:31

Merge branch 'main' into gl-gray-out

bbc3bd0

Merge branch 'main' into gl-gray-out

ca6cc1a

etCoderDysto marked this pull request as ready for review July 30, 2024 16:54

etCoderDysto requested a review from a team as a code owner July 30, 2024 16:54

melvin-bot bot requested review from rayane-d and removed request for a team July 30, 2024 16:55

rayane-d suggested changes Aug 1, 2024

View reviewed changes

Make edit accoridng to the review

f96a4ed

rayane-d approved these changes Aug 5, 2024

View reviewed changes

melvin-bot bot requested a review from iwiznia August 5, 2024 15:14

iwiznia approved these changes Aug 5, 2024

View reviewed changes

iwiznia merged commit afa7d0c into Expensify:main Aug 5, 2024

github-actions bot mentioned this pull request Aug 6, 2024

Deploy Checklist: New Expensify 2024-08-06 #46849

Closed

83 tasks

		@@ -268,6 +268,7 @@ function createPolicyCategory(policyID: string, categoryName: string) {

		function renamePolicyCategory(policyID: string, policyCategory: {oldName: string; newName: string}) {
		const policyCategoryToUpdate = allPolicyCategories?.[`${ONYXKEYS.COLLECTION.POLICY_CATEGORIES}${policyID}`]?.[policyCategory.oldName] ?? {};

	...pendingFields,
	...(policyCategoryToUpdate?.pendingFields ?? {}),

Conversation

etCoderDysto commented Jul 25, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Details

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

Uh oh!

melvin-bot bot commented Jul 30, 2024

Uh oh!

rayane-d commented Jul 30, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Reviewer Checklist

Screenshots/Videos

Uh oh!

rayane-d Aug 1, 2024

Choose a reason for hiding this comment

Uh oh!

rayane-d Aug 1, 2024

Choose a reason for hiding this comment

Uh oh!

rayane-d Aug 1, 2024

Choose a reason for hiding this comment

Uh oh!

rayane-d Aug 1, 2024

Choose a reason for hiding this comment

Uh oh!

rayane-d commented Aug 4, 2024

Uh oh!

etCoderDysto commented Aug 5, 2024

Uh oh!

rayane-d left a comment

Choose a reason for hiding this comment

Uh oh!

OSBotify commented Aug 5, 2024

Uh oh!

OSBotify commented Aug 6, 2024

Uh oh!

OSBotify commented Aug 7, 2024

Uh oh!

OSBotify commented Aug 8, 2024

Uh oh!

OSBotify commented Aug 8, 2024

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

etCoderDysto commented Jul 25, 2024 •

edited

Loading

rayane-d commented Jul 30, 2024 •

edited

Loading