Create description, merchant and reportID filters by SzymczakJ · Pull Request #46477 · Expensify/App

SzymczakJ · 2024-07-30T08:34:10Z

Details

Fixed Issues

$ #46043
$ #46034
$ #46032
PROPOSAL: N/A

Tests

Go to advanced Filters page.
Verify that description filter works and adds description part to url after saving viewing results.
Verify that merchant filter works and adds merchant part to url after saving viewing results.
Verify that reportID filter works and adds reportID part to url after saving viewing results.

Offline tests

QA Steps

Same as tests.

PR Author Checklist

Screenshots/Videos

Android: Native

android.mov

Android: mWeb Chrome

androidWeb.mov

iOS: Native

ios.mov

iOS: mWeb Safari

iosweb.mov

MacOS: Chrome / Safari

web.mov

MacOS: Desktop

dekstop.mov

Kicu

LGTM 👍
found you a few naming errors, but other than that code looks straightforward

Kicu · 2024-07-30T08:52:33Z

src/pages/Search/SearchFiltersDescriptionPage.tsx

+            offlineIndicatorStyle={styles.mtAuto}
+        >
+            <FullPageNotFoundView shouldShow={false}>
+                <HeaderWithBackButton title={translate('common.date')} />


copy-paste error, fix translation

Kicu · 2024-07-30T08:53:01Z

src/pages/Search/SearchFiltersDescriptionPage.tsx

+    );
+}
+
+SearchFiltersDescriptionPage.displayName = 'SearchFiltersMerchantPage';


Suggested change

SearchFiltersDescriptionPage.displayName = 'SearchFiltersMerchantPage';

SearchFiltersDescriptionPage.displayName = 'SearchFiltersDescriptionPage';

Kicu · 2024-07-30T08:53:15Z

src/pages/Search/SearchFiltersMerchantPage.tsx

+            offlineIndicatorStyle={styles.mtAuto}
+        >
+            <FullPageNotFoundView shouldShow={false}>
+                <HeaderWithBackButton title={translate('common.date')} />


fix translation

Kicu · 2024-07-30T08:53:54Z

src/pages/Search/SearchFiltersReportIDPage.tsx

+            offlineIndicatorStyle={styles.mtAuto}
+        >
+            <FullPageNotFoundView shouldShow={false}>
+                <HeaderWithBackButton title={translate('common.date')} />


fix translation

Kicu · 2024-07-30T08:54:05Z

src/pages/Search/SearchFiltersReportIDPage.tsx

+    );
+}
+
+SearchFiltersReportIDPage.displayName = 'SearchFiltersMerchantPage';


Suggested change

SearchFiltersReportIDPage.displayName = 'SearchFiltersMerchantPage';

SearchFiltersReportIDPage.displayName = 'SearchFiltersReportIDPage';

luacmartins

PR is looking good. Let's get this in review soon!

luacmartins · 2024-07-30T19:09:53Z

src/languages/es.ts

        value: 'Valor',
        downloadFailedTitle: 'Error en la descarga',
        downloadFailedDescription: 'No se pudo completar la descarga. Por favor, inténtalo más tarde.',
+        reportID: 'ID informe',


Suggested change

reportID: 'ID informe',

reportID: 'ID del informe',

melvin-bot · 2024-07-31T17:37:22Z

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

SzymczakJ · 2024-07-31T17:37:57Z

Ready for review @luacmartins!

ikevin127 · 2024-07-31T20:03:30Z

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

Android: mWeb Chrome

android-mweb.webm

iOS: Native

ios.mp4

iOS: mWeb Safari

ios-mweb.mp4

MacOS: Chrome / Safari

web.mov

MacOS: Desktop

desktop.mov

ikevin127

Similarly to #46197 (review), code and UI wise this is on point 🚀

The only thing that I found to be off with the functionality is that once a filter is applied, it doesn't seem to change anything in the search Expenses list compared to before the filter was applied.

For example the reviewer checklist Web video:

MacOS: Chrome / Safari

web.mov

Few other observations (NAB) but wanted to bring them up before merge:

all 3 fields capitalize the value once added; this does not get passed to the filters URL - only shows capitalized UI
Report ID field allows all characters (inc. non-numeric)

@luacmartins @SzymczakJ If this is expected for now, and will be fixed to actually work once all filter categories are implemented then we're good to go here 🟢, but if this is supposed to work differently than in the video shown above then I think it should be fixed here before merging.

…tID-filters

SzymczakJ · 2024-08-01T10:16:28Z

@ikevin127 it's an expected result. We're just modifying URL, which later will be used to produce expected Expenses list, but BE is not ready yet.

Kicu · 2024-08-01T10:59:19Z

src/libs/Navigation/linkingConfig/CENTRAL_PANE_TO_RHP_MAPPING.ts

+        SCREENS.SEARCH.ADVANCED_FILTERS_MERCHANT_RHP,
+        SCREENS.SEARCH.ADVANCED_FILTERS_REPORT_ID_RHP,
+        SCREENS.SEARCH.ADVANCED_FILTERS_CATEGORY_RHP,
+    ],


luacmartins

LGTM! @SzymczakJ Let's fix the capitalization of merchant and description in a follow up PR.

OSBotify · 2024-08-01T12:42:04Z

✋ 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-02T01:42:38Z

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

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

OSBotify · 2024-08-06T04:02:49Z

🚀 Deployed to production by https://github.com/marcaaron in version: 9.0.16-8 🚀

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

SzymczakJ added 4 commits July 30, 2024 10:30

add merchant, description and reportID to filters form

20270a8

add description, merchant and reportID filter pages

a803827

add spanish translation

08381cd

fix typos

914688f

Kicu reviewed Jul 30, 2024

View reviewed changes

fix translations

cd3187e

luacmartins self-requested a review July 30, 2024 14:51

luacmartins reviewed Jul 30, 2024

View reviewed changes

fix spanish translations

9e3a1e5

SzymczakJ marked this pull request as ready for review July 31, 2024 17:37

SzymczakJ requested a review from a team as a code owner July 31, 2024 17:37

melvin-bot bot requested review from ikevin127 and removed request for a team July 31, 2024 17:37

ikevin127 approved these changes Jul 31, 2024

View reviewed changes

melvin-bot bot requested a review from luacmartins July 31, 2024 23:36

SzymczakJ added 2 commits August 1, 2024 10:55

Merge branch 'main' into @szymczak/create-description-merchant-repor…

8203284

…tID-filters

add filters screens to CENTRAL_PANE_TO_RHP_MAPPING

a80c186

Kicu reviewed Aug 1, 2024

View reviewed changes

luacmartins approved these changes Aug 1, 2024

View reviewed changes

luacmartins merged commit e0f17df into Expensify:main Aug 1, 2024

rayane-d mentioned this pull request Aug 1, 2024

[HOLD for payment 2024-08-13] [$250] [Search v2.1] [App] Create Description filter #46034

Closed

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

Deploy Checklist: New Expensify 2024-08-02 #46687

Closed

50 tasks

ikevin127 mentioned this pull request Aug 5, 2024

Add keyword advanced filter for Search #46799

Merged

50 tasks

melvin-bot bot mentioned this pull request Aug 6, 2024

[HOLD for payment 2024-08-13] [Search v2.1] [App] Create ReportID filter #46043

Closed

melvin-bot bot mentioned this pull request Aug 6, 2024

[PAID] [$250] [Search v2.1] [App] Create Merchant filter #46032

Closed

SzymczakJ deleted the @szymczak/create-description-merchant-reportID-filters branch April 8, 2025 09:12

	SearchFiltersDescriptionPage.displayName = 'SearchFiltersMerchantPage';
	SearchFiltersDescriptionPage.displayName = 'SearchFiltersDescriptionPage';

	SearchFiltersReportIDPage.displayName = 'SearchFiltersMerchantPage';
	SearchFiltersReportIDPage.displayName = 'SearchFiltersReportIDPage';

Conversation

SzymczakJ commented Jul 30, 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!

Kicu left a comment

Choose a reason for hiding this comment

Uh oh!

Kicu Jul 30, 2024

Choose a reason for hiding this comment

Uh oh!

Kicu Jul 30, 2024

Choose a reason for hiding this comment

Uh oh!

Kicu Jul 30, 2024

Choose a reason for hiding this comment

Uh oh!

Kicu Jul 30, 2024

Choose a reason for hiding this comment

Uh oh!

Kicu Jul 30, 2024

Choose a reason for hiding this comment

Uh oh!

luacmartins left a comment

Choose a reason for hiding this comment

Uh oh!

luacmartins Jul 30, 2024

Choose a reason for hiding this comment

Uh oh!

melvin-bot bot commented Jul 31, 2024

Uh oh!

SzymczakJ commented Jul 31, 2024

Uh oh!

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

Uh oh!

Reviewer Checklist

Screenshots/Videos

Uh oh!

ikevin127 left a comment

Choose a reason for hiding this comment

Uh oh!

SzymczakJ commented Aug 1, 2024

Uh oh!

Kicu Aug 1, 2024

Choose a reason for hiding this comment

Uh oh!

luacmartins left a comment • 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!

OSBotify commented Aug 1, 2024

Uh oh!

OSBotify commented Aug 2, 2024

Uh oh!

OSBotify commented Aug 6, 2024

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

SzymczakJ commented Jul 30, 2024 •

edited

Loading

ikevin127 commented Jul 31, 2024 •

edited

Loading

luacmartins left a comment •

edited

Loading