Align device and in-app back navigation in "Paid" filter section by marufsharifi · Pull Request #83154 · Expensify/App

marufsharifi · 2026-02-22T10:11:17Z

Explanation of Change

Previously, selecting a date mode (On, After, Before) lived only in the local component state, so hardware/browser back could conflict with what users saw on screen. Now, the date filter step is represented in the URL as a subpage (main, On, After, Before) and managed through useSubPage.

Fixed Issues

$ #70180
PROPOSAL: #70180 (comment)

Tests

Open reports
Go to advance filter > paid > before.
Tap the device's back button
Verify it redirected you to the "Paid" section page

Verify that no errors appear in the JS console

Offline tests

Same as Tests.

QA Steps

Same as Tests.

// TODO: These must be filled out, or the issue title must include "[No QA]."

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Android: Native

Screen.Recording.2026-02-24.at.10.22.53.AM.mov

Android: mWeb Chrome

Screen.Recording.2026-02-24.at.10.25.40.AM.mov

iOS: Native

Screen.Recording.2026-02-24.at.10.32.34.AM.mov

iOS: mWeb Safari

Screen.Recording.2026-02-24.at.10.39.16.AM.mov

MacOS: Chrome / Safari

Screen.Recording.2026-02-24.at.10.21.42.AM.mov

codecov · 2026-02-22T10:16:38Z

Codecov Report

✅ Changes either increased or maintained existing code coverage, great job!

Files with missing lines	Coverage Δ
src/CONST/index.ts	`93.60% <ø> (ø)`
src/libs/Navigation/linkingConfig/config.ts	`75.00% <ø> (ø)`
src/ROUTES.ts	`16.13% <80.00%> (+0.13%)`	⬆️
...ponents/Search/FilterComponents/DateFilterBase.tsx	`0.00% <0.00%> (ø)`
...mponents/Search/SearchDatePresetFilterBasePage.tsx	`0.00% <0.00%> (ø)`
... and 10 files with indirect coverage changes

melvin-bot · 2026-02-23T18:52:36Z

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

src/components/Search/SearchDatePresetFilterBasePage.tsx

marufsharifi · 2026-02-24T06:40:15Z

1. Date

date.mov

2. Approved

approved.mov

3. Submitted

submitted.mov

4. Exported

exported.mov

5. Withdrawn

withdrawn.mov

joekaufmanexpensify

👍

…er-back-nav-alignment

joekaufmanexpensify

Good for product

jjcoffee · 2026-03-04T15:56:02Z

@marufsharifi TS is still failing, can you take a look? 🙏

marufsharifi · 2026-03-05T10:14:34Z

@jjcoffee, done, please take another look. thanks.

src/libs/Navigation/linkingConfig/config.ts

jjcoffee · 2026-03-05T16:03:36Z

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 that the composer does not automatically focus or open the keyboard on mobile unless explicitly intended. This includes checking that returning the app from the background does not unexpectedly open the keyboard.
I verified tests pass on all platforms & I tested again on:
- Android: HybridApp
- Android: mWeb Chrome
- iOS: HybridApp
- iOS: mWeb Safari
- MacOS: Chrome / Safari
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.ts 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.
For any bug fix or new feature in this PR, I verified that sufficient unit tests are included to prevent regressions in this flow.
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: HybridApp

android-app-2026-03-05_17.24.53.mp4

Android: mWeb Chrome

android-chrome-2026-03-05_17.29.04.mp4

iOS: HybridApp

ios-app-2026-03-05_17.14.55.mp4

iOS: mWeb Safari

ios-safari-2026-03-05_17.16.27.mp4

MacOS: Chrome / Safari

desktop-chrome-2026-03-05_17.10.23.mp4

jjcoffee · 2026-03-05T16:05:27Z

@marufsharifi Can you also write correct test steps? They seem to be copied from the issue.

jjcoffee · 2026-03-12T13:37:22Z

@marufsharifi Looks like the design has changed a bit by now. The on/before/after modes are now selectors and so I guess shouldn't lead to subpages. With this PR we have weird navigation animation when switching between the modes:

desktop-chrome-retest-2026-03-12_14.33.33.mp4

marufsharifi · 2026-03-14T10:22:21Z

@jjcoffee I think the design was reverted. Could you please take another look? Thanks!

Screen.Recording.1404-12-23.at.2.49.58.PM.mov

marufsharifi · 2026-03-16T05:38:36Z

@jjcoffee, gentle bump. thanks.

jjcoffee · 2026-03-16T09:17:39Z

@marufsharifi Oh nice, that saves some work! One last nitpick here, I think it makes more sense if the sub page paths are all lowercase - it's a bit awkward to have capitalised path in a URI I think. Unless we've already used this pattern elsewhere?

marufsharifi · 2026-03-16T20:37:18Z

One last nitpick here, I think it makes more sense if the sub page paths are all lowercase - it's a bit awkward to have capitalised path in a URI I think. Unless we've already used this pattern elsewhere?

@jjcoffee, I've addressed your comment. Please take another look. thanks.

jjcoffee

LGTM!

arosiclair · 2026-03-17T13:43:20Z

src/components/Search/SearchDatePresetFilterBasePage.tsx

+        buildRoute: buildSubPageRoute,
+    });
+
+    const selectedDateModifier = useMemo<SearchDateModifier | null>(() => {


It doesn't look like this needs to be memoized since it's just a few if statements. Can we just compute this value plainly?

arosiclair · 2026-03-17T14:32:12Z

src/components/Search/SearchDatePresetFilterBasePage.tsx

+const DATE_FILTER_SUB_PAGES: Array<PageConfig<SubPageProps>> = [
+    {pageName: CONST.SEARCH.DATE_FILTER_SUB_PAGE.MAIN, component: EmptySubPageComponent},
+    {pageName: CONST.SEARCH.DATE_FILTER_SUB_PAGE.ON, component: EmptySubPageComponent},
+    {pageName: CONST.SEARCH.DATE_FILTER_SUB_PAGE.AFTER, component: EmptySubPageComponent},
+    {pageName: CONST.SEARCH.DATE_FILTER_SUB_PAGE.BEFORE, component: EmptySubPageComponent},
+];


Hmm It's kind of odd that we're using useSubPage like this. I didn't realize this is what we would end up doing in the proposal either. It seems like we're not really using most of the hook's functionality, so can we just use regular page navigation instead to implement this? @marufsharifi

marufsharifi · 2026-03-18T09:56:38Z

@arosiclair, I've addressed your comments, please take another look. thanks.

arosiclair · 2026-03-18T13:42:07Z

src/pages/domain/BaseDomainVerifiedPage.tsx

-        Navigation.setNavigationActionToMicrotaskQueue(() => Navigation.navigate(redirectTo, {forceReplace: true}));
-    }, [domainAccountID, domain?.validated, doesDomainExist, redirectTo]);
+        Navigation.setNavigationActionToMicrotaskQueue(() => Navigation.navigate(redirectToPath as Route, {forceReplace: true}));
+    }, [domain?.validated, doesDomainExist, redirectToPath]);


Why is this change needed?

This change was added by mistake while I was fixing a type issue. I've reverted it. Thanks

arosiclair · 2026-03-18T13:44:46Z

src/ROUTES.ts

+            if (!subPage || !filterKey) {
+                return baseRoute;
+            }
+            return `${baseRoute}/${encodeURIComponent(subPage)}` as const;


Suggested change

return `${baseRoute}/${encodeURIComponent(subPage)}` as const;

return `${baseRoute}/${subPage}` as const;

encodeURIComponent seems unnecessary here since the subPage should just be plain text

marufsharifi · 2026-03-18T21:55:50Z

@arosiclair, I've addressed your comments. Could you please take another look? Thanks!

arosiclair · 2026-03-19T15:07:36Z

@jjcoffee we changed the implementation a little bit. Can you retest?

jjcoffee · 2026-03-19T15:18:45Z

@arosiclair Still working fine for me on web and native!

github-actions · 2026-03-19T15:54:09Z

🚧 @arosiclair has triggered a test Expensify/App build. You can view the workflow run here.

github-actions · 2026-03-19T15:59:40Z

🧪🧪 Use the links below to test this adhoc build on Android, iOS, and Web. Happy testing! 🧪🧪
Built from App PR #83154.

Android 🤖	iOS 🍎
❌ FAILED ❌	https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-ios-device-AdHoc-e972bdb-c628576-961e83ec63718b95d7cbda7d0da7981acf939e0d/index.html
The QR code can't be generated, because the Android build failed

Web 🕸️
https://83154.pr-testing.expensify.com

👀 View the workflow run that generated this build 👀

OSBotify · 2026-03-19T15:59: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.

OSBotify · 2026-03-19T20:23:45Z

🚀 Deployed to staging by https://github.com/arosiclair in version: 9.3.41-0 🚀

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

Bundle Size Analysis (Sentry):

Android
iOS

OSBotify · 2026-03-23T09:25:27Z

🚀 Deployed to production by https://github.com/cristipaval in version: 9.3.41-4 🚀

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

fix: align device and in-app back navigation behavior in Paid filter

0997e2f

melvin-bot bot assigned marufsharifi Feb 22, 2026

marufsharifi marked this pull request as ready for review February 23, 2026 18:52

marufsharifi requested review from a team as code owners February 23, 2026 18:52

melvin-bot bot requested review from jjcoffee and joekaufmanexpensify and removed request for a team February 23, 2026 18:52

melvin-bot bot removed the request for review from a team February 23, 2026 18:52

github-actions bot reviewed Feb 23, 2026

View reviewed changes

src/components/Search/SearchDatePresetFilterBasePage.tsx Outdated Show resolved Hide resolved

joekaufmanexpensify previously approved these changes Feb 24, 2026

View reviewed changes

mateuuszzzzz mentioned this pull request Feb 26, 2026

[Tracking] Ensure any error page is recoverable and logs necessary info for more debugging #69850

Open

Merge branch 'main' of github.com:marufsharifi/App into fix/paid-filt…

0f2a3ec

…er-back-nav-alignment

marufsharifi dismissed joekaufmanexpensify’s stale review via 0f2a3ec March 3, 2026 07:27

marufsharifi requested a review from joekaufmanexpensify March 3, 2026 07:31

joekaufmanexpensify previously approved these changes Mar 3, 2026

View reviewed changes

fixed typecheck

088e730

marufsharifi dismissed joekaufmanexpensify’s stale review via 088e730 March 4, 2026 10:43

Merge branch 'main' into fix/paid-filter-back-nav-alignment

9d0c334

marufsharifi added 2 commits March 5, 2026 11:59

Merge branch 'main' into fix/paid-filter-back-nav-alignment

ed0f2d4

fixed typecheck

7e6797b

jjcoffee reviewed Mar 5, 2026

View reviewed changes

src/libs/Navigation/linkingConfig/config.ts Show resolved Hide resolved

This comment was marked as resolved.

Sign in to view

Merge branch 'main' into fix/paid-filter-back-nav-alignment

47d706a

Merge branch 'main' into fix/paid-filter-back-nav-alignment

e1859e9

Use lowercase date filter subpage paths

8480a43

Fix date preset filter lint/type issue

f7b21d9

jjcoffee approved these changes Mar 17, 2026

View reviewed changes

melvin-bot bot requested a review from arosiclair March 17, 2026 10:39

arosiclair reviewed Mar 17, 2026

View reviewed changes

marufsharifi added 2 commits March 18, 2026 13:32

Merge branch 'main' into fix/paid-filter-back-nav-alignment

10fad4d

refactor: simplify search date filter subpage navigation

d5db688

arosiclair reviewed Mar 18, 2026

View reviewed changes

marufsharifi added 2 commits March 19, 2026 01:15

Merge branch 'main' into fix/paid-filter-back-nav-alignment

3a99439

Revert unrelated domain change and remove subPage encoding

02e5952

arosiclair approved these changes Mar 19, 2026

View reviewed changes

arosiclair merged commit e972bdb into Expensify:main Mar 19, 2026
32 checks passed

OSBotify mentioned this pull request Mar 19, 2026

Deploy Checklist: New Expensify 2026-03-19 #85862

Closed

melvin-bot bot mentioned this pull request Mar 23, 2026

[Due for payment 2026-03-30] [BACK BUTTON][$250] report-Inconsistent behavior between device and in-app back navigation in 'Paid' filter section #70180

Open

8 tasks

	return `${baseRoute}/${encodeURIComponent(subPage)}` as const;
	return `${baseRoute}/${subPage}` as const;

Conversation

marufsharifi commented Feb 22, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Explanation of Change

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

Uh oh!

codecov bot commented Feb 22, 2026 • edited by github-actions bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

melvin-bot bot commented Feb 23, 2026

Uh oh!

Uh oh!

marufsharifi commented Feb 24, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

joekaufmanexpensify left a comment

Choose a reason for hiding this comment

Uh oh!

joekaufmanexpensify left a comment

Choose a reason for hiding this comment

Uh oh!

jjcoffee commented Mar 4, 2026

Uh oh!

marufsharifi commented Mar 5, 2026

Uh oh!

Uh oh!

jjcoffee commented Mar 5, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Reviewer Checklist

Screenshots/Videos

Uh oh!

This comment was marked as resolved.

jjcoffee commented Mar 5, 2026

Uh oh!

jjcoffee commented Mar 12, 2026

Uh oh!

marufsharifi commented Mar 14, 2026

Uh oh!

marufsharifi commented Mar 16, 2026

Uh oh!

jjcoffee commented Mar 16, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

marufsharifi commented Mar 16, 2026

Uh oh!

jjcoffee left a comment

Choose a reason for hiding this comment

Uh oh!

arosiclair Mar 17, 2026

Choose a reason for hiding this comment

Uh oh!

arosiclair Mar 17, 2026

Choose a reason for hiding this comment

Uh oh!

marufsharifi commented Mar 18, 2026

Uh oh!

arosiclair Mar 18, 2026

Choose a reason for hiding this comment

Uh oh!

marufsharifi Mar 18, 2026

Choose a reason for hiding this comment

Uh oh!

arosiclair Mar 18, 2026

Choose a reason for hiding this comment

Uh oh!

marufsharifi commented Mar 18, 2026

Uh oh!

arosiclair commented Mar 19, 2026

Uh oh!

jjcoffee commented Mar 19, 2026

Uh oh!

Uh oh!

github-actions bot commented Mar 19, 2026

Uh oh!

marufsharifi commented Feb 22, 2026 •

edited

Loading

codecov bot commented Feb 22, 2026 •

edited by github-actions bot

Loading

marufsharifi commented Feb 24, 2026 •

edited

Loading

jjcoffee commented Mar 5, 2026 •

edited

Loading

jjcoffee commented Mar 16, 2026 •

edited

Loading