fix condition by adding check if taxes are enabled #52462

sumo-slonik · 2024-11-13T11:18:02Z

Explanation of Change

I added a condition to the function that fetches tax information to check if the tax functionality is enabled for a given workspace. In addition, I fixed the same bug for:

CategoryFilter
TagFilter
CardFilter

Fixed Issues

#52378

Tests

Go to staging.new.expensify.com
Log in with a new account
Create a new workspace
Go to workspace settings > More features
Enable Taxes
Go to Search > Filters.
Verify that there is tax filter displayed if user has taxes
Go back to workspace settings > More features
Disable Taxes
Go to Search > Filters.

Offline tests

No offline tests

QA Steps

Same as tests

PR Author Checklist

Screenshots/Videos

Android: Native

android.app_1.mp4

Android: mWeb Chrome

android.web.mp4

iOS: Native

ios.app_1.mp4

iOS: mWeb Safari

ios.app_2.mp4

MacOS: Chrome / Safari

desktop.web_1.mp4

MacOS: Desktop

desktop.app_1.mp4

github-actions · 2024-11-13T11:18:14Z

All contributors have signed the CLA ✍️ ✅
_{Posted by the CLA Assistant Lite bot.}

Kicu

Looks pretty good and clean 👍
I left you 2 comments both related to code style/naming but not bugs.

Feel free to open this for review

Kicu · 2024-11-14T09:50:46Z

src/pages/Search/AdvancedSearchFilters.tsx

+    return (numberOfFilters !== 0 || optionalCondition) && isFeatureEnabled;
+}
+
+function isFeatureEnabledInPolicies(policies: OnyxCollection<Policy>, featureName: PolicyFeatureName) {


I suggest an early return here instead of policies ?? {} just do

if (emptyObject) { return false }

I found a util function in the code for checking this:
import {isEmptyObject} from '@src/types/utils/EmptyObject';

Kicu · 2024-11-14T09:55:58Z

src/pages/Search/AdvancedSearchFilters.tsx

@@ -251,6 +252,14 @@ function getFilterInDisplayTitle(filters: Partial<SearchAdvancedFiltersForm>, _:
        : undefined;
 }

+function shouldDisplayFilter(numberOfFilters: number, isFeatureEnabled: boolean, optionalCondition = false): boolean {


the argument name optionalCondition is kinda confusing because of the very generic name.
In general this function feels a bit off because of it. Is it possible to not pass this argument, but instead call this function, and then in the place where you call it do something like:

const shouldDisplayXXX = shouldDisplayFilter(...) && !!singlePolicyTagLists

or similar?

melvin-bot · 2024-11-15T13:43:43Z

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

carlosmiceli · 2024-11-15T15:03:49Z

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 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

carlosmiceli · 2024-11-15T15:08:30Z

@sumo-slonik I think you're missing some checks. Let me know and I can review.

luacmartins · 2024-11-15T17:36:35Z

@sumo-slonik please sign the CLA as instructed here

luacmartins

LGTM

sumo-slonik · 2024-11-18T10:00:16Z

I have read the CLA Document and I hereby sign the CLA

sumo-slonik · 2024-11-18T10:02:32Z

Hi, @carlosmiceli now everything should be ok.

luacmartins

LGTM

OSBotify · 2024-11-18T16:47:40Z

✋ 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-11-19T01:22:35Z

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

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

github-actions · 2024-11-21T01:16:32Z

🚀 Deployed to production by https://github.com/chiragsalian in version: 9.0.64-4 🚀

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

fix condition by adding check if taxes are enabled

078c57d

sumo-slonik closed this Nov 13, 2024

sumo-slonik reopened this Nov 13, 2024

sumo-slonik added 2 commits November 13, 2024 17:05

fix problems with other disabled filters

2b8150c

remove unnecessary change

27cc805

Kicu approved these changes Nov 14, 2024

View reviewed changes

Kicu mentioned this pull request Nov 15, 2024

[PAID] [Search v2.5] - Category field is still present after deleting all the categories #52362

Closed

8 tasks

changes after Mateusz CR

0e0a3df

sumo-slonik marked this pull request as ready for review November 15, 2024 13:43

sumo-slonik requested a review from a team as a code owner November 15, 2024 13:43

melvin-bot bot requested a review from carlosmiceli November 15, 2024 13:43

melvin-bot bot removed the request for review from a team November 15, 2024 13:43

luacmartins self-requested a review November 15, 2024 17:34

luacmartins approved these changes Nov 15, 2024

View reviewed changes

luacmartins approved these changes Nov 18, 2024

View reviewed changes

luacmartins merged commit e777fbb into Expensify:main Nov 18, 2024
18 of 28 checks passed

github-actions bot mentioned this pull request Nov 19, 2024

Deploy Checklist: New Expensify 2024-11-19 #52733

Closed

54 tasks

Kicu mentioned this pull request Dec 9, 2024

[Search v2.5] Tax rate field is displayed after disabling Taxes #52378

Closed

8 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

fix condition by adding check if taxes are enabled #52462

fix condition by adding check if taxes are enabled #52462

sumo-slonik commented Nov 13, 2024 •

edited

Loading

github-actions bot commented Nov 13, 2024 •

edited

Loading

Kicu left a comment

Kicu Nov 14, 2024

Kicu Nov 14, 2024

melvin-bot bot commented Nov 15, 2024

carlosmiceli commented Nov 15, 2024 •

edited

Loading

carlosmiceli commented Nov 15, 2024

luacmartins commented Nov 15, 2024

luacmartins left a comment

sumo-slonik commented Nov 18, 2024

sumo-slonik commented Nov 18, 2024

luacmartins left a comment

OSBotify commented Nov 18, 2024

github-actions bot commented Nov 19, 2024

github-actions bot commented Nov 21, 2024

fix condition by adding check if taxes are enabled #52462

fix condition by adding check if taxes are enabled #52462

Conversation

sumo-slonik commented Nov 13, 2024 • edited Loading

Explanation of Change

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

github-actions bot commented Nov 13, 2024 • edited Loading

Kicu left a comment

Choose a reason for hiding this comment

Kicu Nov 14, 2024

Choose a reason for hiding this comment

Kicu Nov 14, 2024

Choose a reason for hiding this comment

melvin-bot bot commented Nov 15, 2024

carlosmiceli commented Nov 15, 2024 • edited Loading

Reviewer Checklist

Screenshots/Videos

carlosmiceli commented Nov 15, 2024

luacmartins commented Nov 15, 2024

luacmartins left a comment

Choose a reason for hiding this comment

sumo-slonik commented Nov 18, 2024

sumo-slonik commented Nov 18, 2024

luacmartins left a comment

Choose a reason for hiding this comment

OSBotify commented Nov 18, 2024

github-actions bot commented Nov 19, 2024

github-actions bot commented Nov 21, 2024

sumo-slonik commented Nov 13, 2024 •

edited

Loading

github-actions bot commented Nov 13, 2024 •

edited

Loading

carlosmiceli commented Nov 15, 2024 •

edited

Loading