Defer the trial payment reminder while required 2FA is active. by neerajbachani · Pull Request #102584 · Expensify/App

neerajbachani · 2026-09-29T22:02:00Z

Explanation of Change

The trial payment reminder only waited for ONYXKEYS.MODAL or a modal navigator. The required 2FA screen is a full-screen overlay, not a modal, so the reminder opened from GlobalModals and sat above Enable.

The reminder now stays closed while required 2FA is active (shouldShowRequire2FAPage) or while a 2FA setup screen is focused. Closing it for that reason does not dismiss it, so it can still appear after 2FA is completed. The manager reads navigation from the root navigation ref because it renders outside NavigationContainer.

Fixed Issues

$ #102576
PROPOSAL:

Tests

Sign in on a dev build and land on Home with no right-hand panel open.
In the browser console, paste:

(async () => {
    const pad = (n) => String(n).padStart(2, '0');
    const fmt = (date) =>
        `${date.getUTCFullYear()}-${pad(date.getUTCMonth() + 1)}-${pad(date.getUTCDate())} ${pad(date.getUTCHours())}:${pad(date.getUTCMinutes())}:${pad(date.getUTCSeconds())}`;
    const now = Date.now();
    const firstDay = fmt(new Date(now - 24 * 60 * 60 * 1000));
    const lastDay = fmt(new Date(now + 20 * 24 * 60 * 60 * 1000));
    const session = await Onyx.get('session');
    const accountID = session?.accountID;
    const policies = Object.values((await Onyx.get('policy_')) ?? {}).filter(Boolean);
    const ownedPaid = policies.find(
        (policy) => policy.ownerAccountID === accountID && (policy.type === 'team' || policy.type === 'corporate') && policy.pendingAction !== 'delete',
    );
    if (!ownedPaid) {
        const workspace = policies[0];
        if (!workspace?.id) {
            console.log('No workspace found. Create one, then run this again.');
            return;
        }
        await Onyx.merge(`policy_${workspace.id}`, {ownerAccountID: accountID, type: 'team', pendingAction: null});
    }
    await Onyx.merge('nvp_private_firstDayFreeTrial', firstDay);
    await Onyx.merge('nvp_private_lastDayFreeTrial', lastDay);
    await Onyx.merge('nvp_dismissedTrialPaymentReminder', null);
    await Onyx.merge('nvp_expensify_billingFundID', null);
})();

Verify the "Stay ahead of the deadline" trial reminder opens.
Run:

Onyx.merge('account', {needsTwoFactorAuthSetup: true, requiresTwoFactorAuth: false});

Verify the required 2FA screen is shown and the trial reminder is not on top of it.
Click Enable and verify 2FA setup opens.
Run:

Onyx.merge('account', {needsTwoFactorAuthSetup: false, requiresTwoFactorAuth: true});

Leave the 2FA setup screen and return to Home.
Verify the trial reminder can appear again.
Close the reminder and verify it does not immediately reopen.

Verify that no errors appear in the JS console

Offline tests

Repeat the test steps above, then turn the network off.
With required 2FA still active, verify the trial reminder does not cover Enable.
Clear the required-2FA flags, return to Home, and verify the reminder can still appear offline.
Turn the network back on.

QA Steps

// TODO: These must be filled out, or the issue title must include "[No QA]."

Sign in as a workspace owner on a free trial, with no payment card, on a domain that requires 2FA, before 2FA setup is complete.
Wait for the required 2FA screen.
Verify the "Stay ahead of the deadline" trial reminder does not open over that screen.
Click Enable and verify the click reaches 2FA setup
Complete required 2FA and return to Home.
Verify the trial reminder can appear after 2FA is complete.
Close the reminder and verify it does not immediately reopen.

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Android: Native

Before	After
Screen.Recording.2026-10-03.at.10.52.25.PM.mov	Screen.Recording.2026-10-03.at.10.40.44.PM.mov

Android: mWeb Chrome

Before	After
Screen.Recording.2026-10-03.at.10.52.25.PM.mov	WhatsApp.Video.2026-10-03.at.23.15.14.mp4

iOS: Native

Before	After
Screen.Recording.2026-10-03.at.10.50.53.PM.mov	Screen.Recording.2026-10-03.at.10.26.24.PM.mov

iOS: mWeb Safari

Before	After
Screen.Recording.2026-10-03.at.10.49.57.PM.mov	Screen.Recording.2026-10-03.at.10.30.08.PM.mov

MacOS: Chrome / Safari

Before	After
Screen.Recording.2026-10-03.at.10.56.01.PM.mov	Screen.Recording.2026-10-03.at.10.09.30.PM.mov

The reminder only yielded to real modals, so it opened over the full-screen 2FA overlay and blocked Enable.

melvin-bot · 2026-10-03T17:53:54Z

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

thelullabyy · 2026-10-04T13:32:41Z

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.
If the PR adds or modifies the UI:
- I asked an AI agent to review the changes for accessibility issues and addressed its findings.
- I tested with a screen reader (VoiceOver on macOS) and verified all new/changed elements are reachable with a logical focus order.
- I verified all new/changed elements have meaningful accessible names and roles.
- I verified state changes are announced (e.g. checked/unchecked, expanded/collapsed, selected).
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: mWeb Chrome

iOS: HybridApp

iOS: mWeb Safari

MacOS: Chrome / Safari

Screen.Recording.2026-10-07.at.23.22.59.mov

dylanexpensify

Looks good from a product perspective 👍

thelullabyy · 2026-10-07T16:25:42Z

@neerajbachani Could you please update the PR description to use latest template? Thanks

neerajbachani · 2026-10-07T16:36:07Z

@thelullabyy Updated the PR description, All yours.

OSBotify · 2026-10-07T20:10:08Z

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

github-actions · 2026-10-07T20:34:57Z

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

github-actions · 2026-10-07T20:39:46Z

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

Android 🤖	iOS 🍎
https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-android-Adhoc-6e965a3-a57d040-245dd6fcadf4477f52977b9c9c7da4be5d500f51/index.html	https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-ios-device-AdHoc-6e965a3-a57d040-ccdc075a04f7221062c0b69eb154b58fcff94ca1/index.html

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

👀 View the workflow run that generated this build 👀

OSBotify · 2026-10-08T19:44:46Z

🚀 Deployed to staging by https://github.com/luacmartins in version: 9.5.6-0 🚀

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

MelvinBot · 2026-10-08T19:50:09Z

No help site update needed. This bug fix stops the free trial payment reminder from covering the required 2FA screen, and no help article describes that reminder or its timing.

view run

OSBotify · 2026-10-09T20:30:23Z

🚀 Deployed to production by https://github.com/puneetlath in version: 9.5.6-6 🚀

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

Bundle Size Analysis (Sentry):

Android
iOS

Defer the trial payment reminder while required 2FA is active.

f0798ad

The reminder only yielded to real modals, so it opened over the full-screen 2FA overlay and blocked Enable.

melvin-bot Bot assigned neerajbachani Sep 29, 2026

neerajbachani marked this pull request as ready for review October 3, 2026 17:53

neerajbachani requested review from a team as code owners October 3, 2026 17:53

melvin-bot Bot requested review from a team, dylanexpensify and thelullabyy and removed request for a team October 3, 2026 17:53

melvin-bot Bot removed the request for review from a team October 3, 2026 17:53

dylanexpensify approved these changes Oct 5, 2026

View reviewed changes

thelullabyy approved these changes Oct 7, 2026

View reviewed changes

melvin-bot Bot requested a review from luacmartins October 7, 2026 16:25

luacmartins approved these changes Oct 7, 2026

View reviewed changes

thelullabyy approved these changes Oct 7, 2026

View reviewed changes

melvin-bot Bot requested a review from luacmartins October 7, 2026 16:49

luacmartins approved these changes Oct 7, 2026

View reviewed changes

luacmartins merged commit 6e965a3 into Expensify:main Oct 7, 2026
44 of 49 checks passed

OSBotify mentioned this pull request Oct 8, 2026

Deploy Checklist: New Expensify 2026-10-08 #103502

Closed

90 tasks done

melvin-bot Bot mentioned this pull request Oct 9, 2026

[Due for payment 2026-10-16] 2FA - Trial payment reminder blocks Enable on the required setup screen #102576

Open

7 tasks

Navigation Menu

Repository navigation

Defer the trial payment reminder while required 2FA is active. - #102584

Defer the trial payment reminder while required 2FA is active.#102584
luacmartins merged 1 commit into
Expensify:mainfrom
neerajbachani:102576-defer-trial-reminder-required-2fa

neerajbachani commented Sep 29, 2026 •

edited

Loading

Uh oh!

melvin-bot Bot commented Oct 3, 2026

Uh oh!

thelullabyy commented Oct 4, 2026 •

edited

Loading

Uh oh!

dylanexpensify left a comment

Uh oh!

thelullabyy commented Oct 7, 2026

Uh oh!

neerajbachani commented Oct 7, 2026

Uh oh!

Uh oh!

OSBotify commented Oct 7, 2026

Uh oh!

github-actions Bot commented Oct 7, 2026

Uh oh!

github-actions Bot commented Oct 7, 2026

Uh oh!

OSBotify commented Oct 8, 2026

Uh oh!

MelvinBot commented Oct 8, 2026

Uh oh!

OSBotify commented Oct 9, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

Conversation

neerajbachani commented Sep 29, 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 Oct 3, 2026

Uh oh!

thelullabyy commented Oct 4, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Reviewer Checklist

Screenshots/Videos

Uh oh!

dylanexpensify left a comment

Choose a reason for hiding this comment

Uh oh!

thelullabyy commented Oct 7, 2026

Uh oh!

neerajbachani commented Oct 7, 2026

Uh oh!

Uh oh!

OSBotify commented Oct 7, 2026

Uh oh!

github-actions Bot commented Oct 7, 2026

Uh oh!

github-actions Bot commented Oct 7, 2026

Uh oh!

OSBotify commented Oct 8, 2026

Uh oh!

MelvinBot commented Oct 8, 2026

Uh oh!

OSBotify commented Oct 9, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

neerajbachani commented Sep 29, 2026 •

edited

Loading

thelullabyy commented Oct 4, 2026 •

edited

Loading