[CP Staging] Fix - Android - Expense - Extra space in Change workspace modal, not scrollable in landscape by jmusial · Pull Request #94298 · Expensify/App

jmusial · 2026-06-23T11:17:06Z

Explanation of Change

Fixed Issues

$ #94253
PROPOSAL:

Tests

Launch Expensify app.
Create two workspaces.
Open any workspace chat.
Create an expense.
Open the report.
Click More > Change workspace.
Do not dismiss Change workspace modal.
Rotate device to landscape.
Scroll Change workspace modal.
In portrait mode, Change workspace modal does not have extra space at the top and bottom.
In landscape mode, Change workspace modal is scrollable.

Offline tests

N/A

QA Steps

Same as tests.

PR Author Checklist

Screenshots/Videos

Android: Native

android.webm

iOS: Native

Screen.Recording.2026-06-23.at.13.31.46.mov

MacOS: Chrome / Safari

Screen.Recording.2026-06-23.at.13.26.25.mov

jmusial · 2026-06-23T11:22:19Z

@codex review

chatgpt-codex-connector · 2026-06-23T11:28:46Z

Codex Review: Didn't find any major issues. Already looking forward to the next diff.

Reviewed commit: 0c6e1e3266

ℹ️ 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".

…mode

melvin-bot · 2026-06-23T11:36:05Z

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

codecov · 2026-06-23T11:39:16Z

Codecov Report

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

Files with missing lines	Coverage Δ
src/pages/ChangePolicyEducationalModal.tsx	`0.00% <0.00%> (ø)`
...rc/components/CenteredModalLayoutOverlay/index.tsx	`0.00% <0.00%> (ø)`
src/components/CenteredModalLayout.tsx	`0.00% <0.00%> (ø)`
...onents/CenteredModalLayoutOverlay/index.native.tsx	`0.00% <0.00%> (ø)`
... and 7 files with indirect coverage changes

Pujan92 · 2026-06-23T11:42:19Z

@mountiny Do I need to review or @parasharrajat will handle this?

parasharrajat

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.

23.06.2026_21.09.56_REC.mp4

23.06.2026_22.26.13_REC.mp4

🎀 👀 🎀 C+ reviewed

github-actions · 2026-06-23T17:06:01Z

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

…y-education-modal-landscape-mode [CP Staging] Fix - Android - Expense - Extra space in Change workspace modal, not scrollable in landscape (cherry picked from commit b9e663d) (cherry-picked to staging by mountiny)

github-actions · 2026-06-23T17:13:05Z

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

Android 🤖	iOS 🍎
https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-android-Adhoc-b9e663d78de-99ba22e-446b9e4887bffa9475110bfd97e4460e8c8ccd07/index.html	https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-ios-device-AdHoc-b9e663d-99ba22e-9d14ca6a904824f79212cbd9ac465388604912dc/index.html

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

👀 View the workflow run that generated this build 👀

OSBotify · 2026-06-23T17:38:13Z

🚀 Cherry-picked to staging by https://github.com/mountiny in version: 9.4.17-2 🚀

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

Bundle Size Analysis (Sentry):

Android
iOS

MelvinBot · 2026-06-23T17:40:33Z

🤖 No help site changes required.

I reviewed the changes in this PR and they don't require any updates to the help site files under docs/articles.

This PR is a UI layout bug fix — it makes the "Change workspace" educational modal scrollable in landscape and removes the extra top/bottom spacing in portrait. Specifically:

Refactors CenteredModalLayout to use a new platform-split CenteredModalLayoutOverlay backdrop component.
Adds contentStyle={[styles.pt0, styles.pb0]} to ChangePolicyEducationalModal to trim the extra spacing.

There's no change to any user-facing feature, label, button, tab, or documented behavior — the educational modal's content and the "Change workspace" flow itself are unchanged. Help articles describe how to use features, not internal modal scroll/spacing mechanics, so there's nothing here to document. No draft docs PR was created.

@jmusial, since no help site changes are needed, there's no linked help site PR to review. If you believe a behavior change here should be reflected in the docs, let me know and I'll take another look.

OSBotify · 2026-06-23T22:01:37Z

🚀 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-23T22:20:23Z

🚀 Cherry-picked to staging by https://github.com/mountiny in version: 9.4.18-0 🚀

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

Bundle Size Analysis (Sentry):

Android
iOS

MelvinBot · 2026-06-23T22:22:09Z

🤖 No help site changes required.

This PR is a front-end-only layout fix. It refactors the CenteredModalLayout backdrop into a platform-split CenteredModalLayoutOverlay component and adds pt0/pb0 padding to the Change workspace educational modal so it no longer renders extra top/bottom space and is scrollable in landscape.

It does not change any user-facing feature, label, setting, button, or workflow that the help site documents. The existing Change workspace action articles (e.g. Expense-and-Report-Actions.md and Understanding-Report-Statuses-and-Actions.md) describe what the action does and who can use it — none of which this PR affects. The fix only corrects the modal's visual presentation.

No draft docs PR was created.

OSBotify · 2026-06-23T23:40:07Z

🚀 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-24T19:16:35Z

🚀 Deployed to production by https://github.com/blimpich in version: 9.4.18-2 🚀

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

Fix landscape mode scroll for ChangePolicyEducationalModal

817efb0

melvin-bot Bot assigned jmusial Jun 23, 2026

fix prettier

0c6e1e3

Merge branch 'main' into fix/change-policy-education-modal-landscape-…

bce5d2d

…mode

jmusial marked this pull request as ready for review June 23, 2026 11:35

jmusial requested review from a team as code owners June 23, 2026 11:35

melvin-bot Bot requested review from Pujan92 and heyjennahay and removed request for a team June 23, 2026 11:36

melvin-bot Bot removed the request for review from a team June 23, 2026 11:36

jmusial mentioned this pull request Jun 23, 2026

[Due for payment 2026-07-01] [Due for payment 2026-06-30] Android - Expense - Extra space in Change workspace modal, not scrollable in landscape #94253

Closed

7 tasks

mountiny changed the title ~~Fix - Android - Expense - Extra space in Change workspace modal, not scrollable in landscape~~ [CP Staging] Fix - Android - Expense - Extra space in Change workspace modal, not scrollable in landscape Jun 23, 2026

mountiny requested review from parasharrajat and removed request for Pujan92 June 23, 2026 15:16

parasharrajat reviewed Jun 23, 2026

View reviewed changes

mountiny approved these changes Jun 23, 2026

View reviewed changes

parasharrajat approved these changes Jun 23, 2026

View reviewed changes

melvin-bot Bot requested a review from mountiny June 23, 2026 17:01

mountiny merged commit b9e663d into Expensify:main Jun 23, 2026
39 of 40 checks passed

OSBotify added the CP Staging marks PRs that have been CP'd to staging label Jun 23, 2026

OSBotify mentioned this pull request Jun 23, 2026

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

Closed

Uh oh!

Conversation

jmusial commented Jun 23, 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!

jmusial commented Jun 23, 2026

Uh oh!

chatgpt-codex-connector Bot commented Jun 23, 2026

Uh oh!

melvin-bot Bot commented Jun 23, 2026

Uh oh!

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

Pujan92 commented Jun 23, 2026

Uh oh!

parasharrajat 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

Reviewer Checklist

Uh oh!

Uh oh!

github-actions Bot commented Jun 23, 2026

Uh oh!

github-actions Bot commented Jun 23, 2026

Uh oh!

OSBotify commented Jun 23, 2026

Uh oh!

MelvinBot commented Jun 23, 2026

Uh oh!

OSBotify commented Jun 23, 2026

Uh oh!

OSBotify commented Jun 23, 2026

Uh oh!

MelvinBot commented Jun 23, 2026

Uh oh!

OSBotify commented Jun 23, 2026

Uh oh!

OSBotify commented Jun 24, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

jmusial commented Jun 23, 2026 •

edited

Loading

codecov Bot commented Jun 23, 2026 •

edited by github-actions Bot

Loading

parasharrajat left a comment •

edited

Loading