Skip to content

Android & iOS - Expense - Description field is not visible when focused - #94398

Merged
puneetlath merged 6 commits into
Expensify:mainfrom
thelullabyy:fix/94274
Jun 25, 2026
Merged

puneetlath merged 6 commits into
Expensify:mainfrom
thelullabyy:fix/94274

Conversation

@thelullabyy

@thelullabyy thelullabyy commented Jun 24, 2026 •

Copy link
Copy Markdown
Contributor

Explanation of Change

Fixed Issues

$ #94274
PROPOSAL: NA

Tests

Enable newManualExpenseFlow beta

  1. Launch Expensify app.
  2. Tap + > Create expense > Manual.
  3. Tap Description field.
  4. Description field will be visible when focused.
  • Verify that no errors appear in the JS console

Offline tests

QA Steps

Enable newManualExpenseFlow beta

  1. Launch Expensify app.
  2. Tap + > Create expense > Manual.
  3. Tap Description field.
  4. Description field will be visible when focused.
  • Verify that no errors appear in the JS console

PR Author Checklist

  • I linked the correct issue in the ### Fixed Issues section above
  • I wrote clear testing steps that cover the changes made in this PR
    • I added steps for local testing in the Tests section
    • I added steps for the expected offline behavior in the Offline steps section
    • I added steps for Staging and/or Production testing in the QA steps section
    • I added steps to cover 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 tested this PR with a High Traffic account against the staging or production API to ensure there are no regressions (e.g. long loading states that impact usability).
  • I included screenshots or videos for tests on all platforms
  • I ran the tests on all platforms & verified they passed on:
    • Android: Native
    • Android: mWeb Chrome
    • iOS: Native
    • iOS: mWeb Safari
    • MacOS: Chrome / Safari
  • I verified there are no console errors (if there's a console error not related to the PR, report it or open an issue for it to be fixed)
  • I followed proper code patterns (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 followed the guidelines as stated in the Review Guidelines
  • I tested other components that can be impacted by my changes (i.e. if the PR modifies a shared library or component like Avatar, I verified the components using Avatar are working as expected)
  • 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 new assets were added or existing ones were modified, I verified that:
    • The assets are optimized and compressed (for SVG files, run npm run compress-svg)
    • The assets load correctly across all supported platforms.
  • 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.
  • I added unit tests for any new feature or bug fix in this PR to help automatically prevent regressions in this user 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.

Screenshots/Videos

Android: Native
Screen.Recording.2026-06-24.at.01.02.03.mov
Android: mWeb Chrome
Screen.Recording.2026-06-24.at.00.57.27.mov
iOS: Native
Screen.Recording.2026-06-24.at.00.37.59.mov
iOS: mWeb Safari
Screen.Recording.2026-06-24.at.00.51.39.mov
MacOS: Chrome / Safari
Screen.Recording.2026-06-24.at.00.52.37.mov

@codecov

codecov Bot commented Jun 24, 2026 •

Copy link
Copy Markdown

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 Δ
...onents/MoneyRequestConfirmationFields/Provider.tsx 100.00% <ø> (ø)
...mponents/MoneyRequestConfirmationFields/context.ts 80.00% <ø> (ø)
src/components/MoneyRequestConfirmationList.tsx 94.61% <100.00%> (+0.08%) ⬆️
.../components/MoneyRequestConfirmationListFooter.tsx 100.00% <ø> (ø)
...ListWithSections/BaseSelectionListWithSections.tsx 92.70% <100.00%> (+0.15%) ⬆️
...uestConfirmationList/sections/DescriptionField.tsx 74.07% <66.66%> (-1.93%) ⬇️
...lectionList/hooks/useScrollToFocusedInput/index.ts 0.00% <0.00%> (ø)
...List/hooks/useScrollToFocusedInput/index.native.ts 53.12% <53.12%> (ø)
... and 194 files with indirect coverage changes

@thelullabyy

Copy link
Copy Markdown
Contributor Author

@codex review

@chatgpt-codex-connector

Copy link
Copy Markdown

Codex Review: Didn't find any major issues. Can't wait for the next one!

Reviewed commit: 3119a10a07

ℹ️ About Codex in GitHub

Codex has been enabled to automatically review pull requests in this repo. Reviews are triggered when you

  • Open a pull request for review
  • Mark a draft as ready
  • Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

When you sign up for Codex through ChatGPT, Codex can also answer questions or update the PR, like "@codex address that feedback".

@thelullabyy
thelullabyy marked this pull request as ready for review June 24, 2026 05:02
@thelullabyy
thelullabyy requested review from a team as code owners June 24, 2026 05:02
@melvin-bot
melvin-bot Bot requested review from aimane-chnaif and heyjennahay and removed request for a team June 24, 2026 05:02
@melvin-bot

melvin-bot Bot commented Jun 24, 2026

Copy link
Copy Markdown

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

@melvin-bot
melvin-bot Bot removed the request for review from a team June 24, 2026 05:02

@chatgpt-codex-connector chatgpt-codex-connector Bot left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: d2f8c50520

ℹ️ About Codex in GitHub

Codex has been enabled to automatically review pull requests in this repo. Reviews are triggered when you

  • Open a pull request for review
  • Mark a draft as ready
  • Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

When you sign up for Codex through ChatGPT, Codex can also answer questions or update the PR, like "@codex address that feedback".

@thelullabyy

Copy link
Copy Markdown
Contributor Author

@aimane-chnaif You can do final review now

@aimane-chnaif

aimane-chnaif commented Jun 25, 2026 •

Copy link
Copy Markdown
Contributor

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-25.at.10.01.59.AM.mov
Android: mWeb Chrome
Screen.Recording.2026-06-25.at.10.04.42.AM.mov
iOS: HybridApp
Screen.Recording.2026-06-25.at.10.00.27.AM.mov
iOS: mWeb Safari
Screen.Recording.2026-06-25.at.10.05.22.AM.mov
MacOS: Chrome / Safari
Screen.Recording.2026-06-25.at.10.05.53.AM.mov

@melvin-bot
melvin-bot Bot requested a review from puneetlath June 25, 2026 09:08
@MelvinBot

Copy link
Copy Markdown
Contributor

🤖 Review — the approach is sound: footer inputs aren't list items, so scrollToIndex can't reach them, and pulling the focused input up toward the list's top anchor once the keyboard shows is a reasonable fix. The platform split (no-op on web, keyboard-aware scroll on native) and the use of react-native-keyboard-controller's keyboardDidShow (to cover Android ≤10 under adjustResize) are well-reasoned and the code is nicely commented. A few things worth confirming before merge:

1. The Merchant field has the same problem but isn't fixed. MerchantField.tsx:104-116 renders the identical inline TextInput-in-footer pattern in the new manual expense flow, but only DescriptionField.tsx:114 wires up onFocus={() => scrollFocusedInputIntoView?.(...)}. If Merchant can also sit behind the keyboard when focused, it should get the same treatment (scrollFocusedInputIntoView is already exposed via the context, so this is just a ref + onFocus per field). If Description is genuinely the only field that can be obscured given the footer layout, a one-line note saying so would help.

2. MeasurableInput = unknown is looser than needed. The only consumer is the isMeasurable guard, which checks for measureInWindow — i.e. a View. Typing it as View | null (the type actually passed from fieldContainerRef.current) would keep the same runtime guard while catching wrong call-sites at compile time, instead of silently accepting any value across the 5 files it threads through.

3. Tests / coverage. The author checklist marks unit tests as added, but I don't see any test files in the diff, and Codecov reports a coverage drop on DescriptionField plus 53%/0% on the new hook files. Native keyboard-scroll behavior is genuinely hard to unit-test, so this may be acceptable — but the checklist claim and the actual diff should match. Either add coverage for the measurable/isMeasurable logic or note why it's not unit-testable.

Minor / non-blocking
  • trackScrollOffset is now invoked on every onScroll for all consumers of SelectionListWithSections, not just the manual-expense flow. The cost is a single ref write, so it's negligible — just flagging that this shared component now does a tiny bit of extra work everywhere.
  • The cleanup/timeout choreography in index.native.ts correctly avoids double-scrolling (the keyboardDidShow listener and the safety-net timeout each call cleanup() before acting) — looks correct to me.

This is automated feedback from a code review. A human reviewer should still verify the behavior on device.

@chatgpt-codex-connector

Copy link
Copy Markdown

Codex Review: Didn't find any major issues. Breezy!

Reviewed commit: f71e7a2e5f

ℹ️ About Codex in GitHub

Codex has been enabled to automatically review pull requests in this repo. Reviews are triggered when you

  • Open a pull request for review
  • Mark a draft as ready
  • Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

When you sign up for Codex through ChatGPT, Codex can also answer questions or update the PR, like "@codex address that feedback".

@MelvinBot

Copy link
Copy Markdown
Contributor

🤖 Regression scan — no high-risk regressions found. The risky surface is the change to the shared BaseSelectionListWithSections (40+ consumers across Search, NewChat, pickers, IOU, etc.), but those changes are inert for every existing consumer, and all CI gates (typecheck, React Compiler Compliance, ESLint, Prettier, unit + perf tests) pass. The only behavioral change is gated behind the newManualExpenseFlow beta and limited to the description field.

Why the shared-component changes are safe for existing consumers:

  • The new behavior runs only when scrollInputIntoView is invoked, which happens only from the DescriptionField's onFocus (beta-gated). For all other consumers it's never called, so no keyboard listeners are registered and no scrolling happens.
  • The always-on additions are just ref={containerRef} on the outer View and a single ref-write trackScrollOffset(event) on every onScroll — negligible cost, no behavior change.
  • Adding a required scrollInputIntoView to SelectionListWithSectionsHandle doesn't break the wrappers that call useImperativeHandle (e.g. MoneyRequestParticipantsSelector.tsx:76) — they expose their own narrow handle (Ref<InputFocusRef>) and merely consume a SelectionListWithSectionsHandle ref. The sole implementer is BaseSelectionListWithSections, which provides the method. Confirmed by the passing typecheck check.

Lower-confidence behavioral edge cases to verify on device (all within the beta flow, not caught by CI):

Details
  1. Safety-net timeout can cause a late/unexpected scroll. In useScrollToFocusedInput/index.native.ts, if keyboardDidShow never fires (hardware/Bluetooth keyboard, or focus moves away before it fires), the MAX_TRANSITION_DURATION_MS fallback calls performScroll() unconditionally. If the user has already blurred the field or manually scrolled in the meantime, this could produce a jarring jump. Worth testing: focus the description field with a hardware keyboard attached, and focus-then-quickly-dismiss.

  2. Other inline footer inputs aren't wired up. As noted in my earlier review, MerchantField.tsx:104-116 renders the same inline-input-in-footer pattern in the new flow but has no onFocus → scrollFocusedInputIntoView. Not a regression (it's a new feature), but if Merchant can also sit behind the keyboard it has the same defect this PR fixes for Description.

  3. mWeb relies on the no-op web path. index.ts is a no-op (browser auto-scroll). The original bug was reported on native only, so this is expected — just confirm mWeb Chrome/Safari still bring the focused field into view via native browser behavior.

Bottom line: the blast radius is well-contained and the shared-component change is correctly designed to be a no-op for non-beta consumers. The remaining risks are confined to the beta description-field flow and are best verified by device testing rather than code review.


This is automated regression analysis. A human reviewer should still verify on-device behavior before merge.

@puneetlath
puneetlath merged commit 5488f8b into Expensify:main Jun 25, 2026
34 checks passed
@OSBotify

Copy link
Copy Markdown
Contributor

✋ 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

Copy link
Copy Markdown
Contributor

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

@OSBotify OSBotify mentioned this pull request Jun 25, 2026
60 tasks done
@OSBotify

Copy link
Copy Markdown
Contributor

🚀 Deployed to staging by https://github.com/puneetlath in version: 9.4.20-0 🚀

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

@MelvinBot

Copy link
Copy Markdown
Contributor

🤖 No help site changes required.

This PR is a mobile-only UI/scroll-behavior bug fix: it ensures the Description field scrolls into view (above the keyboard) when focused during the new manual expense flow on Android & iOS native. It does not change any feature behavior, settings, labels, tabs, or workflows — the change is entirely internal (a scrollFocusedInputIntoView plumbed through SelectionListWithSections so inline footer fields aren't hidden behind the keyboard).

The Expensify help site (App/docs/articles) documents how to create expenses and add a description, but does not document keyboard/scroll visibility behavior of individual fields. Nothing in those articles describes or contradicts this fix, so no draft docs PR is needed.

@thelullabyy, if you believe any user-facing behavior here is documented on the help site and should be updated, let me know and I'll draft a PR.

@mvtglobally

Copy link
Copy Markdown

We are unable to verify this PR on Native app. BETA is not enabling for Expensifail accounts as well as if we run it on Web and try to use same account on Hybrid. How can we proceed?

1000380169.mp4

@thelullabyy

thelullabyy commented Jun 26, 2026 •

Copy link
Copy Markdown
Contributor Author

@mvtglobally we can use Onyx.merge('betas', ['newManualExpenseFlow']); to enable. Or I think you need to ask internal engineer to help you enable the flag

@OSBotify

Copy link
Copy Markdown
Contributor

🚀 Deployed to production by https://github.com/blimpich in version: 9.4.20-1 🚀

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

Bundle Size Analysis (Sentry):

@puneetlath

Copy link
Copy Markdown
Contributor

Tested on iOS and it worked as expected for me.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

7 participants