Fix/29901: Selected category should be in the list by DylanDylann · Pull Request #32902 · Expensify/App

DylanDylann · 2023-12-12T06:18:21Z

Details

Selected category should be in the list when it is disabled and there is <8 categories

Fixed Issues

$ #29901
PROPOSAL: #29901 (comment)

Tests

Precondition: There must be less than 8 enable categories in the workspace.

[Employee] Create a manual receipt with a category
[Admin] Go to OldDot and disable the category that is used in Step 1
[Employee] Go to the expense details page and click Category
[Employee] Verify that the selected category is present in the category list

Verify that no errors appear in the JS console

Offline tests

Same above

QA Steps

Same above

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Android: Native

Screencast.from.15-12-2023.18_05_43.webm

Android: mWeb Chrome

chr.mp4

iOS: Native

ios2.mp4

iOS: mWeb Safari

sa.mp4

MacOS: Chrome / Safari

des.mp4

MacOS: Desktop

web.mp4

melvin-bot · 2023-12-14T07:09:56Z

@aimane-chnaif 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]

aimane-chnaif · 2023-12-16T22:45:41Z

@DylanDylann please resolve conflict

DylanDylann · 2023-12-18T07:12:46Z

@aimane-chnaif Updated, please check again

DylanDylann · 2023-12-20T09:04:25Z

@aimane-chnaif bump, could you help to review this PR?

aimane-chnaif · 2023-12-25T06:57:20Z

There's small margin difference when selected category is enabled vs disabled

Screen.Recording.2023-12-25.at.1.55.22.AM.mov

DylanDylann · 2023-12-25T08:50:18Z

@aimane-chnaif I updated. Please help to check again

aimane-chnaif · 2023-12-25T11:01:59Z

-            // "All" section when items amount less than the threshold
+            // "Selected" section
            title: '',
            shouldShow: false,


ok so true > false change is fine but curious why this empty section header is needed when title is empty.

App/src/components/OptionsList/BaseOptionsList.js

Lines 236 to 238 in 595bf40

if (!title && shouldShow && !hideSectionHeaders && sectionHeaderStyle) {

return <View style={sectionHeaderStyle} />;

}

Have you found any case this is necessary?

@aimane-chnaif I see that we also do the same thing in here

App/src/libs/OptionsListUtils.js

Lines 824 to 828 in 595bf40

if (numberOfCategories === 0 && selectedOptions.length > 0) {

categorySections.push({

// "Selected" section

title: '',

shouldShow: false,

so that I update shouldshow : true > false to make it consistency

aimane-chnaif · 2023-12-25T18:36:59Z

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

android.mov

Android: mWeb Chrome

mchrome.mov

iOS: Native

ios.mov

iOS: mWeb Safari

msafari.mov

MacOS: Chrome / Safari

web.mov

MacOS: Desktop

desktop.mov

aimane-chnaif · 2023-12-25T18:37:19Z

Please add missing author checklist

DylanDylann · 2023-12-28T09:37:57Z

@yuwenmemon Could you help to take a look at this PR?

OSBotify · 2024-01-03T21:27:23Z

✋ 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-01-04T19:03:15Z

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

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

OSBotify · 2024-01-04T20:10:52Z

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

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

OSBotify · 2024-01-09T05:19:32Z

🚀 Deployed to production by https://github.com/thienlnam in version: 1.4.22-6 🚀

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

allroundexperts · 2024-04-15T13:34:58Z

-    if (!_.isEmpty(selectedOptions)) {
+    const selectedOptionNames = _.map(selectedOptions, (selectedOption) => selectedOption.name);
+    const filteredCategories = _.filter(enabledCategories, (category) => !_.includes(selectedOptionNames, category.name));
+    const numberOfVisibleCategories = selectedOptions.length + filteredCategories.length;


We should have checked if the selectedOptions were enabled or not. This later caused #37766

DylanDylann added 3 commits December 12, 2023 13:14

add selected category first

ea7e89a

add selected category once

a9bf6d6

fix lint

61a83f4

DylanDylann marked this pull request as ready for review December 14, 2023 07:09

DylanDylann requested a review from a team as a code owner December 14, 2023 07:09

melvin-bot Bot requested review from aimane-chnaif and removed request for a team December 14, 2023 07:09

merge main

3140d05

DylanDylann added 2 commits December 18, 2023 14:03

merge main

910e9bf

fix lint

477c3a3

aimane-chnaif reviewed Dec 25, 2023

View reviewed changes

Comment thread src/libs/OptionsListUtils.js Outdated

DylanDylann added 4 commits December 25, 2023 15:02

merge main

7a914e8

fix margin bug

7039ed9

fix margin bug

3abcdfb

fix margin bug

19891e1

aimane-chnaif reviewed Dec 25, 2023

View reviewed changes

aimane-chnaif approved these changes Dec 25, 2023

View reviewed changes

melvin-bot Bot requested a review from yuwenmemon December 25, 2023 18:37

yuwenmemon approved these changes Jan 3, 2024

View reviewed changes

yuwenmemon merged commit 339987b into Expensify:main Jan 3, 2024

github-actions Bot mentioned this pull request Jan 4, 2024

Deploy Checklist: New Expensify 2024-01-04 #33973

Closed

74 tasks

This was referenced Jan 16, 2024

[HOLD for payment 2024-02-07] [$125] IOU - The selected category moves to the top of the list when <8 categories active #34018

Closed

Keep selected category at the same position if the list length is < 8 #34848

Merged

allroundexperts reviewed Apr 15, 2024

View reviewed changes

allroundexperts mentioned this pull request Apr 15, 2024

[HOLD for payment 2024-04-05] [$500] Category - Recent and All sections appear when selected category is invalid with <8 categories #37766

Closed

6 tasks

	if (!title && shouldShow && !hideSectionHeaders && sectionHeaderStyle) {
	return <View style={sectionHeaderStyle} />;
	}

	if (numberOfCategories === 0 && selectedOptions.length > 0) {
	categorySections.push({
	// "Selected" section
	title: '',
	shouldShow: false,

Conversation

DylanDylann commented Dec 12, 2023 • 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 Dec 14, 2023

Uh oh!

aimane-chnaif commented Dec 16, 2023

Uh oh!

DylanDylann commented Dec 18, 2023

Uh oh!

DylanDylann commented Dec 20, 2023

Uh oh!

aimane-chnaif commented Dec 25, 2023

Uh oh!

Uh oh!

DylanDylann commented Dec 25, 2023

Uh oh!

aimane-chnaif Dec 25, 2023

Choose a reason for hiding this comment

Uh oh!

DylanDylann Dec 25, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

aimane-chnaif commented Dec 25, 2023

Reviewer Checklist

Screenshots/Videos

Uh oh!

aimane-chnaif commented Dec 25, 2023

Uh oh!

DylanDylann commented Dec 28, 2023

Uh oh!

OSBotify commented Jan 3, 2024

Uh oh!

OSBotify commented Jan 4, 2024

Uh oh!

OSBotify commented Jan 4, 2024

Uh oh!

OSBotify commented Jan 9, 2024

Uh oh!

allroundexperts Apr 15, 2024

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

DylanDylann commented Dec 12, 2023 •

edited

Loading

DylanDylann Dec 25, 2023 •

edited

Loading