fix: close date picker on forward/backward navigation in iOS mWeb by x-dev90 · Pull Request #93617 · Expensify/App

x-dev90 · 2026-06-15T18:58:17Z

Explanation of Change

This PR fixes the iOS Safari mWeb date picker behavior in the Add bank account flow.

On small-screen web, DatePickerModal renders through the bottom-docked Modal path instead of the normal Popover path. That small-screen path was not closing the date picker on browser Back/Forward navigation, so the calendar could remain visible after navigating from the date of birth or company incorporation date step to a later step.

This change makes DatePickerModal close on real browser popstate navigation when it is visible, on web small screens, and when shouldCloseWhenBrowserNavigationChanged is enabled. Native platforms and wide-screen web behavior are unchanged

Fixed Issues

$ #91311
PROPOSAL: #91311 (comment)

Tests

Go to Wallet.
Click Add bank account.
On the Bank Purpose page, choose Make Payments.
Choose United States.
Continue through the flow until the confirmation page.
Use the browser Back button to return to the date of birth step.
Verify the date picker appears on the date of birth step.
Use the browser Forward button to navigate to the next step.
Verify the date picker closes and does not remain stuck on screen.

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-06-16.at.11.03.24.PM.mov

Android: mWeb Chrome

Screen.Recording.2026-06-16.at.10.18.56.PM.mov

iOS: Native

Screen.Recording.2026-06-16.at.10.44.12.PM.mp4

iOS: mWeb Safari

Screen.Recording.2026-06-16.at.10.55.13.PM.mov

MacOS: Chrome / Safari

Screen.Recording.2026-06-16.at.11.13.01.PM.mov

melvin-bot · 2026-06-15T18:58:22Z

Hey! I see that you made changes to our Form component. Make sure to update the docs in FORMS.md accordingly. Cheers!

codecov · 2026-06-15T19:03:44Z

Codecov Report

❌ Looks like you've decreased code coverage for some files. Please write tests to increase, or at least maintain, the existing level of code coverage. See our documentation here for how to interpret this table.

Files with missing lines	Coverage Δ
src/components/DatePicker/DatePickerModal.tsx	`87.50% <55.55%> (-12.50%)`	⬇️
... and 12 files with indirect coverage changes

nahrinoda

The root cause here is in PopoverWithMeasuredContent/index.tsx (lines 31-40) — on small screens it renders <Modal> directly, bypassing Popover entirely. That means Popover's popstate listener (which handles shouldCloseWhenBrowserNavigationChanged at Popover/index.tsx:55-74) is never mounted on small screens.

Adding the listener here in DatePickerModal fixes this specific component, but the gap is one layer down. If the shouldCloseWhenBrowserNavigationChanged popstate handling were added to PopoverWithMeasuredContent's small-screen <Modal> path, every consumer (EmojiPicker, PopoverMenu, TagPickerModal, etc.) would get the fix automatically — and DatePickerModal wouldn't need its own listener.

x-dev90 · 2026-06-16T05:16:41Z

@nahrinoda Thanks for checking this. I agree the generic gap is in PopoverWithMeasuredContent, but for this issue the safer fix is scoped to DatePickerModal.

Changing PopoverWithMeasuredContent would alter small-screen browser-navigation behavior for every consumer, including menus, emoji picker, context menus, reaction list, FAB menu, and search filters. That is a broader behavior change than the reported DatePicker bug needs.

DatePickerModal already owns the date-picker-specific opt-in, and the normal DatePicker explicitly enables it, so this fix closes only the affected picker path without expanding the regression surface.

marufsharifi · 2026-06-16T14:12:18Z

@x-dev90, any estimation to be ready for review?

nahrinoda

Fair point — scoping to DatePickerModal avoids unintended side effects for other consumers. The generic fix could be a follow-up if the same issue surfaces elsewhere. LGTM on the approach.

marufsharifi · 2026-06-17T04:12:55Z

@x-dev90, gentle bump.

melvin-bot · 2026-06-17T04:15:50Z

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

JmillsExpensify

LGTM

x-dev90 · 2026-06-17T10:05:58Z

@marufsharifi Updated to use getPlatform() instead of Platform.OS, keeping the fix minimal and scoped to DatePickerModal.
The failing Jest job looks unrelated to this PR.

marufsharifi · 2026-06-17T13:08:08Z

@x-dev90, please check the failed unit test.

x-dev90 · 2026-06-18T06:24:13Z

@marufsharifi All done can you please do another review, thanks.

marufsharifi · 2026-06-18T10:52:43Z

I will review this by EOD. thanks.

chatgpt-codex-connector · 2026-06-18T10:53:37Z

You have reached your Codex usage limits for code reviews. You can see your limits in the Codex usage dashboard.

marufsharifi · 2026-06-18T13:05:26Z

Code changes look good to me; I am testing

marufsharifi · 2026-06-18T13:05:56Z

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

Screen.Recording.2026-06-19.at.4.34.31.PM.mov

Android: mWeb Chrome

Screen.Recording.2026-06-19.at.4.56.46.PM.mov

iOS: HybridApp

Screen.Recording.1405-03-29.at.9.37.42.PM.mov

iOS: mWeb Safari

Screen.Recording.2026-06-19.at.5.26.51.PM.mov

MacOS: Chrome / Safari

Screen.Recording.2026-06-19.at.4.17.51.PM.mov

marufsharifi · 2026-06-19T17:14:12Z

LGTM!

github-actions · 2026-06-21T19:00:10Z

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

OSBotify · 2026-06-21T19:04:33Z

✋ 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 · 2026-06-21T19:05:42Z

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

Android 🤖	iOS 🍎
https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-android-Adhoc-fcf1086e503-9980e46-d697f71b0a8447f170bab080e11b866f0b2983c6/index.html	https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-ios-device-AdHoc-fcf1086-9980e46-3695adeec9e32685fe53ad159c5f24d5e7d5b2cc/index.html

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

👀 View the workflow run that generated this build 👀

OSBotify · 2026-06-22T23:27:35Z

🚀 Deployed to staging by https://github.com/inimaga in version: 9.4.17-0 🚀

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

Bundle Size Analysis (Sentry):

Android
iOS

MelvinBot · 2026-06-22T23:29:10Z

🤖 Help site review — no changes required

I reviewed the change in this PR against the help site articles under App/docs/articles.

Conclusion: No help site updates are required.

Why: This is a behavioral bug fix internal to the DatePickerModal component. It makes the date picker close on real browser back/forward (popstate) navigation on web small screens, so the calendar no longer stays stuck on screen after navigating between steps (e.g. date of birth / company incorporation date) in the Add bank account flow.

The help site documents how to use features — the steps to add a bank account remain exactly the same. This PR doesn't add, remove, or change any user-facing feature, setting, label, button, or workflow that the docs describe; it only fixes an overlay that failed to dismiss on navigation. There's nothing in App/docs/articles that describes this low-level UI rendering behavior, so no article is now inaccurate.

Because no documentation is affected, I did not create a draft help site PR. If you believe a specific article should be updated, let me know which one and I'll take another look.

@x-dev90, please confirm you agree no help site changes are needed for this PR.

OSBotify · 2026-06-23T21:59:49Z

🚀 Deployed to production by https://github.com/blimpich in version: 9.4.17-3 🚀

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

OSBotify · 2026-06-23T23:38:19Z

🚀 Deployed to production by https://github.com/blimpich in version: 9.4.17-3 🚀

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

fix: close date picker when navigating forward/backward on iOS mWeb

33e9252

melvin-bot Bot assigned x-dev90 Jun 15, 2026

nahrinoda reviewed Jun 15, 2026

View reviewed changes

nahrinoda reviewed Jun 16, 2026

View reviewed changes

x-dev90 marked this pull request as ready for review June 17, 2026 04:15

x-dev90 requested review from a team as code owners June 17, 2026 04:15

melvin-bot Bot requested a review from marufsharifi June 17, 2026 04:15

melvin-bot Bot requested review from JmillsExpensify and removed request for a team June 17, 2026 04:15

github-actions Bot reviewed Jun 17, 2026

View reviewed changes

Comment thread src/components/DatePicker/DatePickerModal.tsx

JmillsExpensify previously approved these changes Jun 17, 2026

View reviewed changes

Fix DatePicker modal close on browser navigation

0c3561f

x-dev90 dismissed JmillsExpensify’s stale review via 0c3561f June 17, 2026 09:58

:Merge branch 'main' into fix/ios-mweb-date-picker-navigation-state

8aab8a8

marufsharifi approved these changes Jun 19, 2026

View reviewed changes

melvin-bot Bot requested review from arosiclair and inimaga June 19, 2026 17:13

inimaga approved these changes Jun 21, 2026

View reviewed changes

inimaga merged commit fcf1086 into Expensify:main Jun 21, 2026
34 checks passed

OSBotify mentioned this pull request Jun 22, 2026

Deploy Checklist: New Expensify 2026-06-22 #94222

Closed

melvin-bot Bot mentioned this pull request Jun 23, 2026

[Due for payment 2026-06-30] [$250] iOS mWeb - Date picker stays open after navigating forward/backward #91311

Closed

7 tasks

Uh oh!

Conversation

x-dev90 commented Jun 15, 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!

melvin-bot Bot commented Jun 15, 2026

Uh oh!

codecov Bot commented Jun 15, 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!

nahrinoda left a comment

Choose a reason for hiding this comment

Uh oh!

x-dev90 commented Jun 16, 2026

Uh oh!

marufsharifi commented Jun 16, 2026

Uh oh!

nahrinoda left a comment

Choose a reason for hiding this comment

Uh oh!

marufsharifi commented Jun 17, 2026

Uh oh!

melvin-bot Bot commented Jun 17, 2026

Uh oh!

Uh oh!

JmillsExpensify left a comment

Choose a reason for hiding this comment

Uh oh!

x-dev90 commented Jun 17, 2026

Uh oh!

marufsharifi commented Jun 17, 2026

Uh oh!

x-dev90 commented Jun 18, 2026

Uh oh!

marufsharifi commented Jun 18, 2026

Uh oh!

chatgpt-codex-connector Bot commented Jun 18, 2026

Uh oh!

marufsharifi commented Jun 18, 2026

Uh oh!

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

Uh oh!

Reviewer Checklist

Screenshots/Videos

Uh oh!

marufsharifi commented Jun 19, 2026

Uh oh!

Uh oh!

github-actions Bot commented Jun 21, 2026

Uh oh!

OSBotify commented Jun 21, 2026

Uh oh!

github-actions Bot commented Jun 21, 2026

Uh oh!

OSBotify commented Jun 22, 2026

Uh oh!

MelvinBot commented Jun 22, 2026

Uh oh!

OSBotify commented Jun 23, 2026

Uh oh!

OSBotify commented Jun 23, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

7 participants

x-dev90 commented Jun 15, 2026 •

edited

Loading

codecov Bot commented Jun 15, 2026 •

edited by github-actions Bot

Loading

marufsharifi commented Jun 18, 2026 •

edited

Loading