[Submit] In-product modal for existing "Get paid back" intent users (Wave 4) by abzokhattab · Pull Request #95099 · Expensify/App

abzokhattab · 2026-07-01T23:04:35Z

Explanation of Change

Wave 4 of the Submit plan project (#87912). Adds an in-product welcome modal that nudges existing users who previously selected the "Get paid back" (EMPLOYER) onboarding intent but are not an owner or member of any paid workspace to adopt the free Submit plan.

The whole feature is gated behind the SUBMIT_2026 beta and mirrors the existing MigratedUserWelcomeModal architecture: a centered modal in its own navigator, proactively shown by a navigation guard, and dismissed once via the DismissedProductTraining NVP.

Behavior:

Get the free plan → records the dismissal and calls useAutoCreateSubmitWorkspace(firstName, lastName), which creates a SUBMIT workspace, completes onboarding (producing the #admins Concierge welcome message), and routes the user to Workspace → Categories with #admins open in the RHP.
No thanks / backdrop / ESC → records the dismissal so the modal never reappears.

Trigger conditions (all required): authenticated and app not loading, SUBMIT_2026 beta enabled, introSelected.choice === EMPLOYER, onboarding completed, no paid (Team/Corporate) policy, and not previously dismissed.

Main changes:

New SubmitPlanWelcomeModal component, SubmitPlanWelcomeModalNavigator, and SubmitPlanWelcomeModalGuard (registered in guards/index.ts).
Navigation scaffolding: SCREENS, NAVIGATORS, ROUTES (submit-plan-welcome dynamic route), navigation param-list types, linkingConfig, and a RootStack.Screen in AuthScreens.
New SUBMIT_PLAN_WELCOME_MODAL constant + DismissedProductTraining type entry.
Copy added to all 10 language files.
Unit test for the guard and UI test for the modal.

Fixed Issues

$ #87912
PROPOSAL:

Tests

Enable the SUBMIT_2026 beta for your account.
Use an eligible account: chose "Get paid back by my employer" during onboarding, finished onboarding, and is not in any group workspace — either log in with an account that has no workspace, or delete all existing workspaces.
Open the app. The "Get paid back, for free" modal should appear automatically.
- If it doesn't show, clear cache and restart (or re-login) and check again.
Tap Get the free plan and verify a Submit workspace is created and you are routed to Workspace → Categories.
Reload the app and verify the modal does not appear again.
Repeat with another eligible account, tap No thanks (or backdrop / ESC), and verify the modal closes and does not reappear after reload.
Verify that no errors appear in the JS console

Offline tests

With an eligible account, go offline.
Verify the modal still renders and is dismissible.
Tap Get the free plan while offline and verify the workspace is created optimistically and the navigation to Categories still occurs; the request syncs when back online.

QA Steps

Same as tests.

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Android: Native

Android: mWeb Chrome

iOS: Native

Screen.Recording.2026-07-11.at.21.53.45.mov

iOS: mWeb Safari

Screen.Recording.2026-07-11.at.21.56.04.mov

MacOS: Chrome / Safari

Screen.Recording.2026-07-11.at.21.35.10.mov

Screen.Recording.2026-07-11.at.21.51.14.mov

… users Introduces a guard-triggered, dismiss-once modal (behind the SUBMIT_2026 beta) for users who previously selected the "Get paid back" (EMPLOYER) onboarding intent but are not on any paid workspace. "Get the free plan" creates a Submit workspace via useAutoCreateSubmitWorkspace and routes to Categories with the #admins room in the RHP; "No thanks" dismisses it permanently via the DismissedProductTraining NVP.

melvin-bot · 2026-07-01T23:04:40Z

Hey, I noticed you changed src/languages/en.ts in a PR from a fork. For security reasons, translations are not generated automatically for PRs from forks.

If you want to automatically generate translations for other locales, an Expensify employee will have to:

Look at the code and make sure there are no malicious changes.
Run the Generate static translations GitHub workflow. If you have write access and the K2 extension, you can simply click: [this button]

Alternatively, if you are an external contributor, you can run the translation script locally with your own OpenAI API key. To learn more, try running:

npx ts-node ./scripts/generateTranslations.ts --help

Typically, you'd want to translate only what you changed by running npx ts-node ./scripts/generateTranslations.ts --compare-ref main

codecov · 2026-07-01T23:09:45Z

Codecov Report

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

Files with missing lines	Coverage Δ
src/CONST/index.ts	`94.81% <ø> (ø)`
src/ONYXKEYS.ts	`100.00% <ø> (ø)`
src/ROUTES.ts	`20.78% <ø> (ø)`
src/SCREENS.ts	`100.00% <ø> (ø)`
src/components/SubmitPlanWelcomeModal.tsx	`100.00% <100.00%> (ø)`
src/libs/Navigation/AppNavigator/AuthScreens.tsx	`82.97% <100.00%> (+0.18%)`	⬆️
...ateRootStackNavigator/GetStateForActionHandlers.ts	`65.84% <ø> (ø)`
src/libs/Navigation/guards/index.ts	`100.00% <100.00%> (ø)`
src/libs/Navigation/linkingConfig/config.ts	`76.92% <ø> (ø)`
src/styles/variables.ts	`100.00% <ø> (ø)`
... and 4 more
... and 22 files with indirect coverage changes

Update the title/intro copy and add the four-item benefits bullet list ("Get reimbursed faster", "Build expense reports in seconds", "Categorize your expenses", "Invite your boss when you're ready") to match the design mockup, across all supported languages.

Per the design doc, the modal targets the legacy cohort who selected the "Get paid back" intent before the Submit workspace existed and are therefore "not on a workspace". Gate on getGroupPoliciesWhereReportCanBeCreated (paid Team/Corporate AND free Submit workspaces) instead of only paid policies, so users who already own a Submit workspace - including anyone who just completed the EMPLOYER onboarding flow - are excluded. This also removes the transient NotFound /home flash caused by the guard racing the onboarding navigation.

- Persist "modal shown" via new nvp_submitMigrationModalShown NVP (SetNameValuePair) instead of the product-training NVP, per BE decision - Skip CompleteGuidedSetup for already-onboarded users so the modal closes immediately on "Get the free plan" - Use the ReceiptWrangler lasso illustration on a yellow panel to match the design

Add SUBMIT_PLAN_MODAL_NAVIGATOR to MODAL_ROUTES_TO_DISMISS so that Navigation.dismissModal() actually pops the modal when the user taps "Get the free plan", instead of leaving it on screen while navigating to Categories.

abzokhattab · 2026-07-02T23:40:26Z

it looks like the backend doesn't preserve the choice value yet ... am i passing the values right? @iwiznia

abzokhattab · 2026-07-02T23:41:09Z

also @garrettmknight let me know when the new illustration is ready so that i can use it

abzokhattab · 2026-07-02T23:46:28Z

Also, I have another question ... given that a user does the following steps

Sign up with a submit-enabled beta acc
Click on Get Paid by employer --> a new submit workpsace is created
user deletes the current workspace

now should the Get the free plan modal show up since the conditions are satisfied? (the user chose "get paid by employer" + has no workspaces) Or should it only happen on login?

iwiznia · 2026-07-03T11:19:47Z

it looks like the backend doesn't preserve the choice value yet ... am i passing the values right? @iwiznia

I'm not sure what I am looking there exactly, if your refer that the NVP is not returned in openapp nor updates are sent to it, that's because it was deployed: 6 hours ago (Jul 3, 2026, 6:33 AM GMT+2)

When the guard proactively opens the modal on boot, the active route can be a screen that isn't a valid entry screen for the submit-plan-welcome dynamic route (e.g. /settings/troubleshoot after "Clear cache and restart"), which made the route resolve to NotFound. Because the modal never mounted, it also never persisted the "shown" NVP and kept re-triggering. Fall back to HOME when the active route isn't an allowed entry screen so the modal renders correctly and records that it was seen.

abzokhattab · 2026-07-05T10:29:51Z

@iwiznia thanks! but it still doesn't work even after the deploy .. repro:

click "Get the free plan"
remove the workspace
clear cache and restart
--> the modal shows up again

i'm setting it via SetNameValuePair with name: nvp_submitMigrationModalShown, value: true -- exact same way as nvp_hasSeenTrackTraining / nvp_dismissedHoldUseExplanation etc, so the payload looks right (screenshot below). but it's not coming back in openapp, so the modal keeps re-triggering.

can you check if it's being persisted/returned on the BE side?

Screen.Recording.2026-07-05.at.12.26.54.mov

garrettmknight · 2026-07-06T14:06:31Z

@abzokhattab illustration has been added here, but hasn't deployed yet.

abzokhattab · 2026-07-06T15:34:06Z

great thanks for tackling that ... i will get back on this once this BE is handled #95099 (comment)

iwiznia · 2026-07-07T13:11:12Z

i'm setting it via SetNameValuePair with name: nvp_submitMigrationModalShown

That's the problem. The NVPs in onyx are prefixed with nvp_ but the actual NVP name is submitMigrationModalShown, that's what you need to send in the API

The backend NVP is named `submitMigrationModalShown`; the `nvp_` prefix is an Onyx-key-only convention. Sending the prefixed key as the API name meant the value was never persisted or returned in OpenApp, so the modal kept re-triggering. Send the unprefixed name to the API while still storing the value under the prefixed Onyx key.

…odal-87912 # Conflicts: # src/CONST/index.ts # src/NAVIGATORS.ts # src/ROUTES.ts # src/SCREENS.ts # src/languages/en.ts # src/libs/Navigation/AppNavigator/AuthScreens.tsx # src/libs/Navigation/guards/index.ts # src/libs/Navigation/linkingConfig/config.ts # src/libs/Navigation/types.ts

Coalesce the guard's proactive-navigation decision onto a microtask so it runs once after the OpenApp Onyx batch fully settles, preventing a callback-ordering race where a stale hasShownSubmitMigrationModal reopened the modal for users who already saw it. Data subscriptions now only feed the cache; the one-shot redirect is driven solely by the app-load/session signal. Also swaps the modal illustration to ReceiptWranglerSpaceCowgirl with the correct aspect ratio and inset padding.

Drop the unused shouldShowSubmitPlanWelcomeModal export and add a UI test asserting setSubmitMigrationModalShown fires when the modal is removed from the navigation stack.

Gate the submit plan welcome decision on HAS_LOADED_APP so it waits for OpenApp to deliver this session's account data (including the shown-flag). This closes the sign-in race where SignInUser authenticates and delivers the eligibility NVPs before OpenApp fetches nvp_submitMigrationModalShown, which made the modal reappear for users who had already seen it. Also removes the debug/info logs from the guard and modal and drops the onboarding-completion warn log (the catch now swallows with an explanation).

github-actions · 2026-07-14T09:58:01Z

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

github-actions · 2026-07-14T10:03:27Z

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

Android 🤖	iOS 🍎
https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-android-Adhoc-30db31f8caa-b5ec06b-7adcf1f5cf2a28471b7a9f4745f98aa40a0bc2a8/index.html	https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-ios-device-AdHoc-30db31f-b5ec06b-04c6e4e642bea3078e0e106380195509d63ee7ac/index.html

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

👀 View the workflow run that generated this build 👀

OSBotify · 2026-07-14T11:36:39Z

🚀 Deployed to staging by https://github.com/iwiznia in version: 9.4.34-0 🚀

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

lanitochka17 · 2026-07-14T19:40:51Z

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

jponikarchuk · 2026-07-14T19:55:51Z

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

m-natarajan · 2026-07-14T23:12:20Z

@hungvu193 @abzokhattab @iwiznia @tgolen Is this one testable by Applause? Submit2026 beta is enabled for applause.expensifail account and onboarding options are not displayed for the same. Any workaround for this?

IuliiaHerets · 2026-07-15T05:18:19Z

Could this be tested internally? The QA team doesn't have access to verify this on our side.

cc @abzokhattab @iwiznia @tgolen @hungvu193 @jasperhuangg

iwiznia · 2026-07-15T12:05:00Z

Is this one testable by Applause?

Yeah

Submit2026 beta is enabled for applause.expensifail account and onboarding options are not displayed for the same. Any workaround for this?

What are you seeing? What options are not displayed or are different?

garrettmknight · 2026-07-15T12:37:23Z

I think to test, you'll need an existing account, pre-Submit testing with the newDotSubmit intent. I'm seeing two accounts from April:

first_seen: 2026-04-26T06:44:08.975149Zemail: applausetester+tc3255member1777185572988@applause.expensifail.com
first_seen: 2026-04-26T19:57:14.075033Zemail: applausetester+tc3255member1777233157975@applause.expensifail.com

m-natarajan · 2026-07-15T15:29:28Z

@iwiznia Tried with expensifail account, No onboarding indents for applause.expensifail domain. I created a submit workspace in OldDot and deleted the same. No "Get paid back, for free" modal displayed. Am I missing anything here? Please bear with the long video. It was necessary to capture the complete behavior.

Recording.3215.mp4

iwiznia · 2026-07-15T16:00:47Z

Hmmmm weird, not really sure why you are not seeing the onboarding modal...

m-natarajan · 2026-07-15T16:00:52Z

@garrettmknight

I think to test, you'll need an existing account, pre-Submit testing with the newDotSubmit intent. I'm seeing two accounts from April:

first_seen: 2026-04-26T06:44:08.975149Zemail: applausetester+tc3255member1777185572988@applause.expensifail.com

first_seen: 2026-04-26T19:57:14.075033Zemail: applausetester+tc3255member1777233157975@applause.expensifail.com

I am not seeing Submit workspace by logging in to applausetester+tc3255member1777185572988@applause.expensifail.com

Recording.3218.mp4

iwiznia · 2026-07-15T16:08:59Z

Hmmm I think @garrettmknight is right and you need an existing account?
Main thing is:

Use an eligible account

Which I think it's an existing account that selected submit to my employer before the beta? @abzokhattab can you confirm?

OSBotify · 2026-07-16T05:13:17Z

🚀 Deployed to production by https://github.com/roryabraham in version: 9.4.34-14 🚀

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

OSBotify · 2026-07-16T06:04:10Z

🚀 Deployed to production by https://github.com/roryabraham in version: 9.4.34-14 🚀

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

Bundle Size Analysis (Sentry):

Android

garrettmknight · 2026-07-16T07:57:52Z

@m-natarajan maybe applausetester+hb+24061@applause.expensifial.com?

garrettmknight · 2026-07-16T08:08:12Z

I queried for the earliest applause user with the correct intent and it doesn't look like that login is part of any workspaces.

melvin-bot Bot assigned abzokhattab Jul 1, 2026

abzokhattab added 4 commits July 2, 2026 01:19

Dismiss Submit welcome modal by registering its navigator

52f9940

Add SUBMIT_PLAN_MODAL_NAVIGATOR to MODAL_ROUTES_TO_DISMISS so that Navigation.dismissModal() actually pops the modal when the user taps "Get the free plan", instead of leaving it on screen while navigating to Categories.

garrettmknight mentioned this pull request Jul 10, 2026

[Due for payment 2026-07-23] [Submit] In-product modal for existing "Get paid back" intent users (Wave 4) #87912

Closed

abzokhattab added 5 commits July 11, 2026 16:19

fixing spell

f650022

Remove unused guard export and cover modal shown-state persistence

6e56b7f

Drop the unused shouldShowSubmitPlanWelcomeModal export and add a UI test asserting setSubmitMigrationModalShown fires when the modal is removed from the navigation stack.

abzokhattab marked this pull request as ready for review July 11, 2026 20:02

abzokhattab requested review from a team as code owners July 11, 2026 20:02

melvin-bot Bot requested review from gijoe0295 and trjExpensify July 11, 2026 20:02

tgolen approved these changes Jul 13, 2026

View reviewed changes

mountiny removed their request for review July 13, 2026 17:41

luacmartins removed their request for review July 13, 2026 20:11

iwiznia approved these changes Jul 14, 2026

View reviewed changes

iwiznia merged commit 30db31f into Expensify:main Jul 14, 2026
39 checks passed

github-actions Bot mentioned this pull request Jul 14, 2026

Investigate workflow job failing on main: test / test (job 6) #96038

Closed

MelvinBot mentioned this pull request Jul 14, 2026

Pin initially-selected items to the top of long BankAccount and Card filter lists #96031

Merged

53 tasks

OSBotify mentioned this pull request Jul 14, 2026

Deploy Checklist: New Expensify 2026-07-14 #96044

Closed

MelvinBot mentioned this pull request Jul 14, 2026

[No QA] Fix SubmitPlanWelcomeModal test by rendering inside NavigationContainer #96067

Closed

6 tasks

grgia mentioned this pull request Jul 14, 2026

[No QA] Fix failing tests on main from the Submit welcome modal merge race #96064

Merged

40 tasks

applause-bot Bot mentioned this pull request Jul 14, 2026

[Due for payment 2026-07-30] Android - Submit workspace - Free plan modal shows empty space at the bottom #96121

Closed

7 tasks

applause-bot Bot mentioned this pull request Jul 14, 2026

[Due for payment 2026-07-30] Home page opens after clicking Get the free plan when there is a Submit workspace #96123

Closed

7 tasks

abzokhattab mentioned this pull request Jul 19, 2026

Fix Submit plan welcome modal: navigate to existing Submit workspace and remove double bottom safe-area padding #96459

Merged

39 tasks

Uh oh!

Conversation

abzokhattab commented Jul 1, 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!

melvin-bot Bot commented Jul 1, 2026

Uh oh!

codecov Bot commented Jul 1, 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!

abzokhattab commented Jul 2, 2026

Uh oh!

abzokhattab commented Jul 2, 2026

Uh oh!

abzokhattab commented Jul 2, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

iwiznia commented Jul 3, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

abzokhattab commented Jul 5, 2026

Uh oh!

garrettmknight commented Jul 6, 2026

Uh oh!

abzokhattab commented Jul 6, 2026

Uh oh!

iwiznia commented Jul 7, 2026

Uh oh!

Uh oh!

github-actions Bot commented Jul 14, 2026

Uh oh!

github-actions Bot commented Jul 14, 2026

Uh oh!

OSBotify commented Jul 14, 2026

Uh oh!

lanitochka17 commented Jul 14, 2026

Uh oh!

jponikarchuk commented Jul 14, 2026

Uh oh!

m-natarajan commented Jul 14, 2026

Uh oh!

IuliiaHerets commented Jul 15, 2026

Uh oh!

iwiznia commented Jul 15, 2026

Uh oh!

garrettmknight commented Jul 15, 2026

Uh oh!

m-natarajan commented Jul 15, 2026

Uh oh!

iwiznia commented Jul 15, 2026

Uh oh!

m-natarajan commented Jul 15, 2026

Uh oh!

iwiznia commented Jul 15, 2026

Uh oh!

OSBotify commented Jul 16, 2026

Uh oh!

OSBotify commented Jul 16, 2026

Uh oh!

garrettmknight commented Jul 16, 2026

Uh oh!

garrettmknight commented Jul 16, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

12 participants

abzokhattab commented Jul 1, 2026 •

edited

Loading

codecov Bot commented Jul 1, 2026 •

edited by github-actions Bot

Loading

abzokhattab commented Jul 2, 2026 •

edited

Loading

iwiznia commented Jul 3, 2026 •

edited

Loading