Skip to content

[NoQA] Fix CenteredModalLayout on native wider screens - #99050

Merged
mountiny merged 2 commits into
Expensify:mainfrom
software-mansion-labs:@GCyganek/fix-centered-modal-layout-native-wide-screens
Aug 21, 2026
Merged

mountiny merged 2 commits into
Expensify:mainfrom
software-mansion-labs:@GCyganek/fix-centered-modal-layout-native-wide-screens

Conversation

@GCyganek

@GCyganek GCyganek commented Aug 20, 2026 •

Copy link
Copy Markdown
Contributor

Explanation of Change

CenteredModalLayout used shouldUseNarrowLayout, which is always true on native, so the modal was always docked to the bottom full-width even on tablets. It now uses onboardingIsMediumOrLargerScreenWidth (via a shouldDockToBottom flag), so wide native screens get a centered modal.

Fixed Issues

$ #98770
PROPOSAL: N/A

Tests

  1. On iOS/Android tablet trigger a modal that uses CenteredModalLayout (AI Feature Promo Modal/Track Training/Auto Submit, etc.)
  2. Verify the modal is centered on the screen and that it does not have any empty white space

Verify these modals stay bottom docked on iOS/Android phones (native app) without changes

To trigger AI Feature Promo Modal:

  • set isAIPromoModalDismissed and isEligible to false in useAIFeaturesPromoModal and open the Spend screen

To trigger Auto Submit/Track Training add this to src/hooks/useOnboardingFlow.ts inside the useEffect:

                if (true) {
                    Navigation.navigate(ROUTES.TRACK_TRAINING_MODAL);
                    // Navigation.navigate(ROUTES.AUTO_SUBMIT_MODAL_ROOT);
                    return;
                }
  • Verify that no errors appear in the JS console

Offline tests

N/A — the change is layout-only and does not touch API calls, data fetching, or Onyx.

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.

Screenshots/Videos

Android: Native Screenshot 2026-08-19 at 12 56 31 Screenshot 2026-08-19 at 13 30 04
Android: mWeb Chrome
iOS: Native Screenshot 2026-08-19 at 12 56 38 Screenshot 2026-08-19 at 12 56 43 Screenshot 2026-08-19 at 13 31 32 Screenshot 2026-08-20 at 11 03 37 Screenshot 2026-08-20 at 11 03 25
iOS: mWeb Safari
MacOS: Chrome / Safari
Screen.Recording.2026-08-19.at.13.21.12.mov

@GCyganek

Copy link
Copy Markdown
Contributor Author

@Expensify/design could you confirm this is what we want?

So basically now on tablets we have this for modals that use CenteredModalLayout:

Screenshot 2026-08-19 at 12 49 42

and I'm changing it to centered modal in the native app for wide tablet screens:

Screenshot 2026-08-19 at 12 56 31

alternatively we can keep them bottom docked but they're quite big in this case:

Screenshot 2026-08-19 at 12 51 13 Screenshot 2026-08-19 at 12 51 20

@codecov

codecov Bot commented Aug 20, 2026 •

Copy link
Copy Markdown

Codecov Report

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

Files with missing lines Coverage Δ
src/components/CenteredModalLayout/index.tsx 100.00% <100.00%> (ø)
src/styles/index.ts 63.00% <100.00%> (ø)
... and 99 files with indirect coverage changes

@jmusial jmusial left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Overall looks good, but I'd suggest a second look on the modal paddings to make sure they align with what was before

const safeAreaStyle = useBottomSafeSafeAreaPaddingStyle({
addBottomSafeAreaPadding: addBottomSafeAreaPadding && !isInLandscapeMode,
style: [shouldUseNarrowLayout && styles.pt2, !isInLandscapeMode && styles.pb5, safeAreaHorizontalPadding, contentStyle],
style: [shouldDockToBottom && styles.pt2, !isInLandscapeMode && styles.pb5, safeAreaHorizontalPadding, contentStyle],

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Safe-area bottom padding leaks onto the centered card on tablets now like on this sshot:
image

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

thanks, fixed:

Screenshot 2026-08-20 at 17 17 54

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Looks good.

function CenteredModalLayout({children, width, height, onBackdropPress, contentStyle, addBottomSafeAreaPadding = true}: CenteredModalLayoutProps) {
const styles = useThemeStyles();
const {shouldUseNarrowLayout} = useResponsiveLayout();
const {onboardingIsMediumOrLargerScreenWidth} = useResponsiveLayout();

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

this flag is oboarding scoped, should we really use it in generic component?

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

yeah I don't like it, but we could say the same thing about using it in FeatureTrainingModal/FeatureTrainingCarousel. Alternatively we could change shouldUseNarrowLayout to take into consideration screen size but it could require more changes/checking if other things would break, but in case of this flag I wouldn't like the fact that it would suggest that on native we do not use narrow layout on tablets, when we do. We could also add a new flag to useResponsiveLayout, but I'm not sure it's worth it, using onboardingIsMediumOrLargerScreenWidth looks like the safest option apart from adding a new flag IMO

@shawnborton

Copy link
Copy Markdown
Contributor

and I'm changing it to centered modal in the native app for wide tablet screens:

Yeah, that seems way better to me. Though check the bottom padding there, seems like we have extra space at the bottom of that modal (maybe we don't need the SafeSpace buffer there anymore)

@GCyganek
GCyganek requested a review from jmusial August 21, 2026 08:28
@GCyganek
GCyganek marked this pull request as ready for review August 21, 2026 08:28
@GCyganek
GCyganek requested review from a team as code owners August 21, 2026 08:28
@melvin-bot
melvin-bot Bot requested review from abzokhattab, flaviadefaria and mountiny and removed request for a team August 21, 2026 08:28
@melvin-bot

melvin-bot Bot commented Aug 21, 2026

Copy link
Copy Markdown

@abzokhattab @mountiny One of you needs to 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 August 21, 2026 08:28
@abzokhattab

Copy link
Copy Markdown
Contributor

@MelvinBot @codex review the PR and check for regressions, breaking changes or bugs

@chatgpt-codex-connector

Copy link
Copy Markdown

Codex Review: Didn't find any major issues. What shall we delve into next?

Reviewed commit: 1441900b1f

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

Code Review — no regressions found ✅

The change is safe and correctly scoped. CenteredModalLayout now docks to the bottom based purely on screen width instead of shouldUseNarrowLayout, which fixes the full-width-dock bug on native tablets while leaving phones untouched.

Why it's equivalent where it should be: shouldDockToBottom = !onboardingIsMediumOrLargerScreenWidth evaluates to windowWidth <= 800, which is exactly isSmallScreenWidth. The old value was isSmallScreenWidth || isInNarrowPaneModal, so the only behavioral delta is dropping the isInNarrowPaneModal term — and that term is always false for every consumer of this component (verified below). Net effect: native tablets (width > 800) now center; phones (≤ 800) stay bottom-docked. 👍

Verification details

No web regression. All six consumers of CenteredModalLayout render through centeredModalNavigator / FeatureTrainingModalNavigator, both of which use Presentation.TRANSPARENT_MODAL (react-navigation), not a right-docked reanimated modal or RIGHT_MODAL_NAVIGATOR:

Because isInNarrowPaneModal only becomes true for RIGHT_DOCKED modals or children of RIGHT_MODAL_NAVIGATOR, it's false for all of these — so on web the computed value is unchanged.

Renamed style helpers are internal-only. getCenteredModalOuterView / getCenteredModalInnerView have no callers outside CenteredModalLayout, so the parameter rename is a pure refactor. No unit/snapshot tests reference this component.

Minor nit (non-blocking)

Reusing the onboarding-scoped onboardingIsMediumOrLargerScreenWidth in a generic modal-layout component is a slight naming smell — it's functionally identical to !isSmallScreenWidth. const shouldDockToBottom = isSmallScreenWidth; would read more clearly and avoid coupling this component to an onboarding-named concept. Purely cosmetic.

One thing to eyeball manually

On a phone in landscape, windowWidth can exceed 800, so shouldDockToBottom becomes false and the modal centers rather than docking. This is not introduced by this PR (the old shouldUseNarrowLayout also resolved to isSmallScreenWidth here, i.e. false in that case), but since the PR touches exactly this logic it's worth a quick glance to confirm landscape phones still look right.


Note: I reviewed this statically. The fix targets native tablet layout, which can't be exercised on the web test platform, so I did not run a live test. Types weren't run in this environment, but the change is a param rename plus a hook property that already exists on the return type.


view run

@jmusial jmusial left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

LGTM 🚀

@abzokhattab

abzokhattab commented Aug 21, 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 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 Screenshot 2026-08-21 at 13 59 33
Android: mWeb Chrome
iOS: HybridApp image image Screenshot 2026-08-21 at 13 56 05
iOS: mWeb Safari Screenshot 2026-08-21 at 13 55 04
MacOS: Chrome / Safari Screenshot 2026-08-21 at 13 54 33

@abzokhattab abzokhattab left a comment •

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

LGTM 🚀

@mountiny mountiny left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Thanks for testing

@mountiny
mountiny merged commit 31098e8 into Expensify:main Aug 21, 2026
40 of 47 checks passed
@github-actions

Copy link
Copy Markdown
Contributor

🚧 mountiny 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 22, 2026
61 tasks done
@OSBotify

Copy link
Copy Markdown
Contributor

🚀 Deployed to staging by https://github.com/mountiny in version: 9.4.59-0 🚀

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

@MelvinBot

Copy link
Copy Markdown
Contributor

Help site review — no docs changes required ✅

I reviewed the changes in this PR against the help site articles under App/docs/articles, and no updates are needed, so I did not create a draft PR.

Why: This PR is a layout-only fix. It only touches src/components/CenteredModalLayout/index.tsx and src/styles/index.ts, swapping the modal's dock condition so it centers on native wide screens (tablets) instead of docking full-width. It does not:

  • add, remove, or rename any feature, tab, setting, or button label
  • change any user-facing copy or workflow steps
  • alter what any modal does — only where it's positioned on wide native screens

Help site articles document features and how-to workflows, not internal modal positioning/layout, so there's nothing to update here.

If you believe a specific article should be revised, point me at it and I'll take another look.


view run

@kavimuru

Copy link
Copy Markdown

@GCyganek could you provide the QA steps for Applause to execute?

@mountiny mountiny changed the title Fix CenteredModalLayout on native wider screens [NoQA] Fix CenteredModalLayout on native wider screens Aug 24, 2026
@mountiny

Copy link
Copy Markdown
Contributor

@kavimuru I will check this off and @GCyganek @abzokhattab will check in staging. I am not sure how to easily get these modals

@GCyganek

GCyganek commented Aug 24, 2026 •

Copy link
Copy Markdown
Contributor Author

Sorry I missed this, from what I tested AI promo modal usually appears after I create a new account, finish onboarding, sign out and log in again. I will check on staging as Vit requested

@GCyganek

Copy link
Copy Markdown
Contributor Author

Seems to be working fine on staging:

Screenshot 2026-08-24 at 10 45 21 Screenshot 2026-08-24 at 10 45 26 Screenshot 2026-08-24 at 10 46 15
Screen.Recording.2026-08-24.at.10.48.18.mov
Screenshot 2026-08-24 at 10 50 15

@OSBotify

Copy link
Copy Markdown
Contributor

🚀 Deployed to production by https://github.com/AndrewGable in version: 9.4.59-5 🚀

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

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

8 participants