Skip to content

Fix Add field button cut off at bottom of workspace Reports page on Android - #99455

Merged
mjasikowski merged 1 commit into
mainfrom
claude-reportsPageAddFieldSafeArea
Aug 27, 2026
Merged

mjasikowski merged 1 commit into
mainfrom
claude-reportsPageAddFieldSafeArea

Conversation

@MelvinBot

@MelvinBot MelvinBot commented Aug 25, 2026 •

Copy link
Copy Markdown
Contributor

Explanation of Change

On the workspace Reports page, the Add field button was cut off / hidden behind the Android system navigation bar when scrolled to the bottom.

ScreenWrapper on this page uses enableEdgeToEdgeBottomSafeAreaPadding, which makes the wrapper stop applying its own bottom safe-area inset and delegate that to the scrollable content. But the page's ScrollView was rendered without addBottomSafeAreaPadding, so nothing reserved the bottom inset — on Android (edge-to-edge draws content under the system nav bar) the last row was drawn behind the nav bar.

This adds addBottomSafeAreaPadding to the ScrollView, matching the pattern already used on other edge-to-edge workspace pages (e.g. WorkspacePerDiemSettingsPage). The ScrollView now reserves the bottom safe-area inset so the Add field button clears the system navigation bar. It also covers the offline-indicator inset, since addOfflineIndicatorBottomSafeAreaPadding defaults on with it.

Fixed Issues

$ #99335
PROPOSAL: #99335 (comment)

Tests

  1. On an Android device/build, open a workspace > Reports.
  2. Enable Report fields so the fields list and the Add field button appear (add a few fields so the list is long enough to scroll).
  3. Scroll to the very bottom of the page.
  4. Verify the Add field button is fully visible and not cut off / hidden behind the Android system navigation bar.
  • Verify that no errors appear in the JS console

Offline tests

Same as tests.

QA Steps

Same as tests.

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

…dd field button is not cut off

Co-authored-by: Manan <mananjadhav@users.noreply.github.com>
@MelvinBot
MelvinBot requested a review from a team August 25, 2026 18:15
@melvin-bot melvin-bot Bot added Melvin-Test-Android Melvin-Test-Web Triggers Melvin to run the testing steps of the PR on web labels Aug 25, 2026
@codecov

codecov Bot commented Aug 25, 2026 •

Copy link
Copy Markdown

Codecov Report

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

Files with missing lines Coverage Δ
...c/pages/workspace/reports/WorkspaceReportsPage.tsx 0.00% <0.00%> (ø)
... and 12 files with indirect coverage changes

@MelvinBot

Copy link
Copy Markdown
Contributor Author

🤖 Ran the PR's testing steps on Android (standalone NewDot). Result: ✅ pass — after enabling Report fields on a workspace's Reports page and scrolling to the bottom of a list of 5 fields, the Add field button is fully visible and hittable, clear of the Android system navigation bar (bottom edge at y=2265 on a 2400px screen → ~135px clearance). No related JS console errors.

Step Status Observation
Open workspace > Reports page ✅ pass Navigated via Workspaces tab > workspace > Reports settings; page shows Report title and Report fields sections
Enable Report fields and add several fields ✅ pass Report fields switch enabled (green); 5 fields present (Business Trip, Client Reference, Project Code, Supplier Address, VAT Number)
Scroll to the very bottom of the page ✅ pass Scroll reported already at bottom, no hidden content below
Add field button fully visible, not hidden behind system nav bar ✅ pass Add field attrs: visibleToUser:true, hittable:true, rect y=2097 height=168 (bottom=2265) on a 2400px screen → ~135px clearance; button fully rendered, not clipped
No errors in JS console ✅ pass Only two pre-existing dev-only warnings from an earlier unrelated onboarding step; none during the Report fields / Add field interactions
Setup notes

The test account needed the post-magic-link "Join" screen completed, a first-run onboarding flow, and an in-app Upgrade of the workspace to the Control plan (Report fields is Control-only; test workspace, still within trial — no real payment). All of this was in-app test-account setup to reach the target screen; none of it touched App source.

Evidence (1)

Reports page scrolled to bottom showing 5 report fields and the fully visible Add field button clear of the screen edge

Reports page scrolled to bottom showing 5 report fields and the fully visible Add field button clear of the screen edge

view run

@MelvinBot

Copy link
Copy Markdown
Contributor Author

🤖 Ran the PR's testing steps on Web (dev NewDot). Result: ✅ pass — after enabling Report fields on a workspace's Reports page and scrolling to the bottom of a list of 6 fields, the Add field button renders fully visible and not clipped. This confirms no regression on web from the native safe-area padding fix (web has no system nav bar).

Step Status Observation
Open workspace > Reports page ✅ pass Created a workspace and navigated to Workspace Settings > Reports; page shows Report title and Report fields sections
Enable Report fields and add several fields ✅ pass Toggled Report fields on (required a Control-plan upgrade in dev, as Report fields is Control-only), added 6 fields (Client Name, Cost Center, Job Number, Project Code, Supplier Address, VAT Number)
Scroll to the very bottom of the page ✅ pass Scroll reported already at bottom, no hidden content below; Add field row is the last content
Add field button fully visible, not cut off ✅ pass Visibility check passed; screenshot + bottom-edge pixel crop show the + icon and "Add field" text fully rendered, not truncated or overlapped
No errors in JS console ⚠️ partial Direct browser console capture is out of scope for the web tester. Proxy: network dump showed every request (Ping, CreatePolicyReportField ×3, SetNameValuePair, etc.) returned 200 with no failures, and no error banners/toasts appeared throughout the flow
Notes
  • The offline-indicator inset half of the fix couldn't be exercised — the web tester can't simulate an offline/network-loss state — so only the Add field button placement and general page health were verified. Offline behaviour is best confirmed via the native Android run.
  • "No JS console errors" is reported as partial only because direct console capture isn't supported by the web tester, not because errors were seen — none were observed.
Evidence (2)

Workspace Reports page scrolled to bottom, Add field button fully visible with 6 report fields listed above it

Workspace Reports page scrolled to bottom, Add field button fully visible with 6 report fields listed above it

Pixel-level crop of the very bottom edge of the viewport showing the Add field icon and text fully rendered, not clipped

Pixel-level crop of the very bottom edge of the viewport showing the Add field icon and text fully rendered, not clipped

view run

@mananjadhav

mananjadhav commented Aug 26, 2026 •

Copy link
Copy Markdown
Collaborator

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 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
    • 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
    • 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 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
android-bottom-padding.mov
Android: mWeb Chrome mweb-chrome-report-field-padding
iOS: HybridApp ios-report-field-padding
iOS: mWeb Safari mweb-safari-report-field-padding-2 mweb-safari-report-field-padding-1
MacOS: Chrome / Safari
web-report-field-padding.mov

@github-actions

Copy link
Copy Markdown
Contributor

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

@github-actions

This comment has been minimized.

@melvin-bot
melvin-bot Bot requested a review from mjasikowski August 26, 2026 18:32
@mananjadhav

Copy link
Copy Markdown
Collaborator

I can't update the author checklist, hence I've completed the reviewer checklist here. @mjasikowski Can you mark it ready for review and merge?

@mjasikowski
mjasikowski marked this pull request as ready for review August 27, 2026 06:41
@mjasikowski
mjasikowski requested a review from a team as a code owner August 27, 2026 06:41
@melvin-bot
melvin-bot Bot requested review from mananjadhav and removed request for a team August 27, 2026 06:41
@melvin-bot

melvin-bot Bot commented Aug 27, 2026

Copy link
Copy Markdown

@mananjadhav 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 requested review from heyjennahay and removed request for a team August 27, 2026 06:41
@mjasikowski

Copy link
Copy Markdown
Contributor

@mananjadhav you'll need to approve this again after it's marked as ready to review

@mananjadhav mananjadhav left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

@mjasikowski
mjasikowski merged commit 12712c5 into main Aug 27, 2026
53 of 56 checks passed
@mjasikowski
mjasikowski deleted the claude-reportsPageAddFieldSafeArea branch August 27, 2026 10:02
@github-actions

Copy link
Copy Markdown
Contributor

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

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

@OSBotify OSBotify mentioned this pull request Aug 27, 2026
65 tasks done
@OSBotify

Copy link
Copy Markdown
Contributor

🚀 Deployed to staging by https://github.com/mjasikowski in version: 9.4.63-0 🚀

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

@MelvinBot

Copy link
Copy Markdown
Contributor Author

🤖 I reviewed the changes and no help site updates are required under App/docs/articles.

This PR is a purely visual layout fix — it adds addBottomSafeAreaPadding to the ScrollView on the workspace Reports page so the Add field button clears the Android system navigation bar. It changes no feature, workflow, UI copy, label, setting, or user-facing behavior, and there's nothing in the help site that documents this safe-area padding detail. No draft PR was created since none is needed.

@mananjadhav, since no help site changes are required, there's no linked help site PR to review. If you disagree and think a specific article should be updated, let me know which one and I'll draft it.


view run

@OSBotify

Copy link
Copy Markdown
Contributor

🚀 Deployed to production by https://github.com/AndrewGable in version: 9.4.63-1 🚀

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

Bundle Size Analysis (Sentry):

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

Labels

Melvin-Test-Android Melvin-Test-Web Triggers Melvin to run the testing steps of the PR on web

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants