Migrate feature training modals to centered modal layout by jmusial · Pull Request #93437 · Expensify/App

jmusial · 2026-06-12T13:57:08Z

Explanation of Change

This PR it migrates modals from FeatureTrainingModalNavigator to not use Modal component.

Fixed Issues

$ #90475
PROPOSAL:

Tests

For `TrackTraining` and `AutoSubmit`:

Pre requisite:
add in src/hooks/useOnboardingFlow.ts#69 to trigger modal

                if (true) {
                    Navigation.navigate(ROUTES.TRACK_TRAINING_MODAL);
                    // Navigation.navigate(ROUTES.AUTO_SUBMIT_MODAL_ROOT);
                    return;
                }

or use urls on web (/auto-submit & /track-training)

Verify that modal shows
Dismiss modal

For `ChangePolicyEducation`

Get a fresh account with 2 workspaces.
Create an expense in one of them
Open expense, from More click Move to a Workspace
Verify that ChangePolicyEducationModal shows.
When you move it for the second time it should not show.

Offline tests

QA Steps

Same as tests

PR Author Checklist

Screenshots/Videos

Android: Native

Screen.Recording.2026-06-12.at.16.36.50.mov

Android: mWeb Chrome

Screen.Recording.2026-06-12.at.16.40.47.mov

iOS: Native

Screen.Recording.2026-06-12.at.16.30.02.mov

Screen.Recording.2026-06-12.at.16.27.26.mov

iOS: mWeb Safari

Screen.Recording.2026-06-12.at.16.23.36.mov

MacOS: Chrome / Safari

Screen.Recording.2026-06-12.at.16.13.31.mov

codecov · 2026-06-12T14:02:18Z

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/libs/Navigation/AppNavigator/AuthScreens.tsx	`82.97% <ø> (ø)`
...tion/AppNavigator/useRootNavigatorScreenOptions.ts	`93.33% <100.00%> (+0.74%)`	⬆️
src/components/FeatureTrainingModal/index.tsx	`86.95% <50.00%> (-4.30%)`	⬇️
src/components/FeatureTrainingSingleBody.tsx	`96.22% <96.22%> (ø)`
...gator/Navigators/FeatureTrainingModalNavigator.tsx	`10.00% <0.00%> (-2.50%)`	⬇️
src/styles/index.ts	`58.58% <14.28%> (-1.84%)`	⬇️
src/pages/ChangePolicyEducationalModal.tsx	`0.00% <0.00%> (ø)`
src/pages/TrackTrainingPage.tsx	`7.69% <0.00%> (-6.60%)`	⬇️
src/components/CenteredModalLayout.tsx	`0.00% <0.00%> (ø)`
src/components/AutoSubmitModal.tsx	`0.00% <0.00%> (ø)`
... and 23 files with indirect coverage changes

…tered-modal-layout

jmusial · 2026-06-17T12:27:31Z

@codex review

…tered-modal-layout

chatgpt-codex-connector · 2026-06-17T12:36:33Z

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

Reviewed commit: f82f70cb1e

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

melvin-bot · 2026-06-17T13:21:51Z

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

parasharrajat · 2026-06-18T14:36:30Z

    const {shouldUseNarrowLayout} = useResponsiveLayout();
    return (
        <NoDropZone>
-            <View>


Maybe a view was needed for NoDropZone

Dunno, it works fine w/o it

jmusial · 2026-06-18T14:52:46Z

@parasharrajat this one is ready for you :)

A large conflicting PR just got merged to main, will let you know once I'm done resolving the merge 😢

JmillsExpensify

LGTM

mountiny · 2026-06-18T16:35:13Z

@parasharrajat how is it looking?

parasharrajat · 2026-06-18T19:52:34Z

Started testing. The code looks good. Will update this in morning.

jmusial · 2026-06-19T08:03:51Z

so #93977 the conflicting PR just got reverted, I removed merge commits, @parasharrajat shoud be GTG

parasharrajat · 2026-06-19T18:40:24Z

+                illustrationInnerContainerStyle={[styles.alignItemsCenter, styles.justifyContentCenter, StyleUtils.getBackgroundColorStyle(colors.blue700)]}
+                illustrationOuterContainerStyle={styles.p0}
+                contentInnerContainerStyles={[styles.mb5, styles.gap2]}
+                onClose={handleClose}


why are we not passing onConfirm prop?

It is working as it is, but I am curious.

parasharrajat · 2026-06-19T18:54:41Z

Looks good.

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 shown in the product is localized by adding it to src/languages/* files and using the translation method
- I verified all numbers, amounts, dates and phone numbers shown in the product are using the localization methods
- 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)
- I verified proper file naming conventions were followed for any new files or renamed files. All non-platform specific files are named after what they export and are not named "index.js". All platform-specific files are named for the platform the code supports as outlined in the README.
- I verified the JSDocs style guidelines (in STYLE.md) were followed
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)
I verified all code is DRY (the PR doesn't include any logic written more than once, with the exception of tests)
I verified any variables that can be defined as constants (ie. in CONST.ts or at the top of the file that uses the constant) are defined as such
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.
If a new page is added, I verified it's using the ScrollView component to make it scrollable when more elements are added to the page.
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

🔲 iOS / native

20.06.2026_00.56.26_REC.mp4

🔲 iOS / Safari

20.06.2026_01.01.48_REC.mp4

🔲 MacOS / Chrome

20.06.2026_00.26.33_REC.mp4

20.06.2026_00.29.15_REC.mp4

20.06.2026_00.59.52_REC.mp4

🔲 Android / native

20.06.2026_01.27.26_REC.mp4

🎀 👀 🎀 C+ reviewed

melvin-bot · 2026-06-21T13:24:01Z

@mountiny looks like this was merged without a test passing. Please add a note explaining why this was done and remove the Emergency label if this is not an emergency.

OSBotify · 2026-06-21T13:24:55Z

✋ This PR was not deployed to staging yet because QA is ongoing. It will be automatically deployed to staging after the next production release.

mountiny · 2026-06-21T13:25:07Z

Not an emergency, the checklist is filled out

github-actions · 2026-06-21T13:27:47Z

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

github-actions · 2026-06-21T13:33:08Z

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

Android 🤖	iOS 🍎
https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-android-Adhoc-67cd432beba-aa5daf5-806f0e924e721966bc2c3bb2c57070c52ccd721a/index.html	https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-ios-device-AdHoc-67cd432-aa5daf5-aa6dcb30a31407d93b957c1ad2eeea994c7321b6/index.html

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

👀 View the workflow run that generated this build 👀

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

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

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

Bundle Size Analysis (Sentry):

Android
iOS

MelvinBot · 2026-06-22T23:28:51Z

🤖 No help site changes required.

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

This PR is a purely internal/architectural refactor — it migrates the feature training modals (AutoSubmitModal, TrackTrainingPage, ChangePolicyEducationalModal) away from FeatureTrainingModalNavigator/the Modal component to a new CenteredModalLayout + FeatureTrainingContent rendering approach.

Why no docs update is needed:

No copy or user-facing text changed. Every translation key (autoSubmitModal.title, autoSubmitModal.description, iou.changePolicyEducational.title, featureTraining.doNotShowAgain, etc.) is identical before and after — the strings are simply moved into the new component.
No src/languages/* files are touched.
No new features, settings, tabs, buttons, or user flows were added or removed. The modals display the same content as before; only the underlying rendering mechanism changed.
The help site documents user-facing features and how-to guidance, which is unaffected by this modal-layout migration.

No draft docs PR was created since no content changes are warranted.

@jmusial, please confirm this assessment. If you believe a user-facing behavior change here does warrant a help site update, let me know what it is and I'll open a draft docs PR.

mitarachim · 2026-06-23T01:57:23Z

Deploy Blocker #94253 was identified to be related to this PR.

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

🚀 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:37:49Z

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

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

jmusial added 8 commits June 11, 2026 15:45

Migrate ExplanationModal to CenteredModalLayout

9e0a783

self-review 1

73f3c6b

fix lint

0e9da78

adjust safe area bottom padding on mobile

72610f4

refactor small screen sizing

9c0368e

unify finishing onboarding

0a3df98

fix lint

663d3ae

Migrate TrackTraining, AutoSubmit and ChangePolicy modals

a2715f6

melvin-bot Bot assigned jmusial Jun 12, 2026

jmusial mentioned this pull request Jun 12, 2026

[Due for payment 2026-07-01] [Due for payment 2026-06-30] [Due for payment 2026-06-25] Migrate FeatureTrainingModal to @react-navigation modal screen #90475

Open

jmusial mentioned this pull request Jun 17, 2026

Migrate ExplanationModal to CenteredModalLayout #93292

Closed

49 tasks

jmusial added 6 commits June 17, 2026 12:16

Merge branch 'main' into chore/migrate-feature-training-modals-to-cen…

5639635

…tered-modal-layout

revert changes connected to explanation modal

431c465

fix ts

07f7e02

Remove Explanation Modal Screen

ee92251

Merge branch 'main' into chore/migrate-feature-training-modals-to-cen…

2b55890

…tered-modal-layout

self review

f82f70c

Merge branch 'main' into chore/migrate-feature-training-modals-to-cen…

45a9c68

…tered-modal-layout

jmusial marked this pull request as ready for review June 17, 2026 13:21

jmusial requested review from a team as code owners June 17, 2026 13:21

melvin-bot Bot requested review from JmillsExpensify and parasharrajat and removed request for a team June 17, 2026 13:21

melvin-bot Bot removed the request for review from a team June 17, 2026 13:21

parasharrajat reviewed Jun 18, 2026

View reviewed changes

JmillsExpensify previously approved these changes Jun 18, 2026

View reviewed changes

jmusial dismissed JmillsExpensify’s stale review via 45a9c68 June 19, 2026 08:03

jmusial force-pushed the chore/migrate-feature-training-modals-to-centered-modal-layout branch from e29c604 to 45a9c68 Compare June 19, 2026 08:03

jmusial mentioned this pull request Jun 19, 2026

Migrate test drive modal to centered modal layout #94015

Closed

42 tasks

parasharrajat reviewed Jun 19, 2026

View reviewed changes

parasharrajat approved these changes Jun 19, 2026

View reviewed changes

melvin-bot Bot requested a review from mountiny June 19, 2026 19:58

mountiny approved these changes Jun 21, 2026

View reviewed changes

mountiny merged commit 67cd432 into Expensify:main Jun 21, 2026
63 of 70 checks passed

melvin-bot Bot added the Emergency label Jun 21, 2026

mountiny removed the Emergency label Jun 21, 2026

OSBotify mentioned this pull request Jun 22, 2026

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

Closed

applause-bot Bot 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

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

[Due for payment 2026-07-01] [Due for payment 2026-06-30] Android - Expense - More button overlaps with next step message and hardly tappable #94254

Closed

7 tasks

Uh oh!

Conversation

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

Uh oh!

Explanation of Change

Fixed Issues

Tests

For TrackTraining and AutoSubmit:

For ChangePolicyEducation

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

Uh oh!

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

jmusial commented Jun 17, 2026

Uh oh!

chatgpt-codex-connector Bot commented Jun 17, 2026

Uh oh!

melvin-bot Bot commented Jun 17, 2026

Uh oh!

parasharrajat Jun 18, 2026

Choose a reason for hiding this comment

Uh oh!

jmusial Jun 18, 2026

Choose a reason for hiding this comment

Uh oh!

jmusial commented Jun 18, 2026

Uh oh!

JmillsExpensify left a comment

Choose a reason for hiding this comment

Uh oh!

mountiny commented Jun 18, 2026

Uh oh!

parasharrajat commented Jun 18, 2026

Uh oh!

jmusial commented Jun 19, 2026

Uh oh!

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

Uh oh!

Choose a reason for hiding this comment

Uh oh!

parasharrajat Jun 19, 2026

Choose a reason for hiding this comment

Uh oh!

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

Uh oh!

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

Screenshots

🔲 iOS / native

🔲 iOS / Safari

🔲 MacOS / Chrome

🔲 Android / native

Uh oh!

Uh oh!

melvin-bot Bot commented Jun 21, 2026

Uh oh!

OSBotify commented Jun 21, 2026

Uh oh!

mountiny commented Jun 21, 2026

Uh oh!

github-actions Bot 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!

mitarachim commented Jun 23, 2026

Uh oh!

OSBotify commented Jun 23, 2026

Uh oh!

jmusial commented Jun 12, 2026 •

edited

Loading

For `TrackTraining` and `AutoSubmit`:

For `ChangePolicyEducation`

codecov Bot commented Jun 12, 2026 •

edited by github-actions Bot

Loading

parasharrajat Jun 19, 2026 •

edited

Loading

parasharrajat commented Jun 19, 2026 •

edited

Loading

parasharrajat left a comment •

edited

Loading