Skip to content

[Due for payment 2026-10-07] [$250] Required 2FA setup screen is unresponsive, blocking new-domain login and account merge #91985

Closed

Description

@m-natarajan

If you haven’t already, check out our contributing guidelines for onboarding and email contributors@expensify.com to request to join our Slack channel!


Version Number: v9.3.83-3
Reproducible in staging?: Needs Reproduction (Unable to reproduce with regular 2FA authentication)
Reproducible in production?: Needs Reproduction
If this was caught during regression testing, add the test name, ID and link from BrowserStack:
Email or phone of affected tester (no customers):
Logs: https://stackoverflow.com/c/expensify/questions/4856
Expensify/Expensify Issue URL:
Issue reported by: @Tmjarnesk1
Slack conversation (hyperlinked to channel name): #Expeisify Bugs

Action Performed:

  1. User attempts to log in with new-domain email
  2. User is routed to the onboarding page with the message “Two-factor authentication required.”
  3. User selects “Enable two-factor authentication.”
  4. Nothing happens; the button does not respond.
  5. User tries clearing cache, using a different browser, and using a mobile device.
  6. User remains blocked from completing 2FA setup and cannot access the new-domain account.
  7. Because the user cannot access the new-domain account, they also cannot complete the required account merge after domain migration.

Expected Result:

User should be able to click “Enable two-factor authentication,” complete 2FA setup, log in with the new-domain account, and merge the old email/account via Settings > Account > Profile > Merge Accounts.

Actual Result:

The “Enable two-factor authentication” button is unresponsive. User cannot complete 2FA setup, cannot access the new-domain account, cannot merge accounts, and cannot forward receipts from the new-domain email.

Workaround:

Unknown

Additional Context:

  • Domain migration was completed.
  • Migration note stated that user already had an Expensify account using the new-domain email.
  • User was instructed to log in with the new-domain email, then go to Settings > Account > Profile > Merge Accounts to merge the old email into the new account.
  • Issue only occurs when logging in with the new-domain email.
  • User can access the old-domain login.
  • Domain settings require 2FA, so the user is correctly prompted for 2FA, but the setup flow is blocked.
  • This does not appear to be a standard 2FA reset case unless the new-domain account is in a partially enabled/broken 2FA state.

Platforms:

Select the officially supported platforms where the issue was reproduced:

  • Android: App
  • Android: mWeb Chrome
  • iOS: App
  • iOS: mWeb Safari
  • iOS: mWeb Chrome
  • Windows: Chrome
  • MacOS: Chrome / Safari

Screenshots/Videos

The screenshot with the console log is in Slack thread

View all open jobs on GitHub

Upwork Automation - Do Not Edit
Issue OwnerCurrent Issue Owner: @thelullabyy

Activity

  1. added
    BugSomething is broken. Auto assigns a BugZero manager.
    on May 28, 2026
  2. MelvinBot commented on May 28, 2026

    @MelvinBot
    Contributor

    Proposal

    What is the root cause of that problem?

    When a domain-migration user logs in and hasn't completed onboarding, the RequireTwoFactorAuthenticationOverlay renders on top of the onboarding screens. Pressing "Enable two-factor authentication" calls Navigation.navigate(getTwoFactorAuthRoute()), which builds a dynamic route via createDynamicRoute.

    The navigation is silently blocked by the OnboardingGuard.shouldPreventReset. Here's how:

    1. linkTo parses the dynamic route. When getActionFromState returns null for the generated path, it falls back to navigation.resetRoot(stateFromPath), dispatching a RESET action.
    2. OnboardingGuard.shouldPreventReset sees the user is on an onboarding screen and the target is a non-onboarding screen (the 2FA setup page), so it blocks the RESET and sets an error message on the onboarding screen — which is hidden behind the overlay. The user sees nothing.
    3. Since navigation never reaches the 2FA screen, isIn2FASetupFlow stays false, the overlay remains visible, and every subsequent tap is blocked the same way.

    What changes do you think we should make in order to solve the problem?

    The OnboardingGuard.shouldPreventReset function should allow RESET actions that target 2FA setup screens. The fix should check whether the target focused route is a 2FA setup screen (using the existing isTwoFactorSetupScreen helper from Navigation.ts) and, if so, allow the reset instead of blocking it.

    The change is in OnboardingGuard.ts:shouldPreventReset: before returning true to block the reset, add a check — if the target route is a 2FA setup screen, return false (allow it).

    What alternative solutions did you explore? (Optional)

    An alternative would be to modify the overlay's handleOnPress to bypass the normal Navigation.navigate path (e.g., using navigation.dispatch with a custom action that skips guards). However, this would be fragile and circumvent the guard system rather than fixing the actual conflict. Teaching the guard to recognize 2FA navigation as legitimate is cleaner and more maintainable.

    Supporting evidence

    Key files:

    Data flow:

    1. Server sets account.needsTwoFactorAuthSetup=true for domain-migration user
    2. useShouldShowRequire2FAPage → overlay renders on top of onboarding
    3. Button press → Navigation.navigate(dynamicRoute)
    4. linkTo → getActionFromState returns null → resetRoot dispatched
    5. OnboardingGuard.shouldPreventReset → blocked (onboarding → non-onboarding)
    6. Error message sent to hidden onboarding screen → user sees nothing

    Possibly related issue: #86194 covers a similar area (2FA + onboarding interaction) but focuses on showing a descriptive error rather than fixing the blocked navigation.


    Next Steps for Contributor+ team:
    To accept: @MelvinBot implement [this](https://github.com/Expensify/App/issues/91985#issuecomment-new) to create a draft PR.
    To refine: @MelvinBot <your feedback>
    To reject: Explain why you are rejecting Melvin's proposal.

  3. added
    ExternalAdded to denote the issue can be worked on by a contributor
    on May 28, 2026
  4. added
    Help WantedApply this label when an issue is open to proposals by contributors
    on May 28, 2026
  5. yusufdeveloper2903 commented on May 28, 2026

    @yusufdeveloper2903
    Contributor

    Please re-state the problem that we are trying to solve in this issue.

    On a domain that enforces 2FA, a user logging in with the new-domain email lands on the full‑screen "Two-factor authentication required" gate, but tapping Enable two-factor authentication does nothing — the 2FA setup flow never opens, so the user can't complete setup, log in, or merge accounts. It is not reproducible with a "regular" already-onboarded 2FA account.

    What is the root cause of that problem?

    The required-2FA gate was rewritten in #90680 (merged 2026-05-25, three days before this report) as the full-screen RequireTwoFactorAuthenticationOverlay.

    Its button handler computes the target route with no backTo argument:

    https://github.com/Expensify/App/blob/d93353fd47faf/src/pages/RequireTwoFactorAuthenticationOverlay.tsx#L55-L57

    const handleOnPress = () => {
        Navigation.navigate(getTwoFactorAuthRoute());
    };

    getTwoFactorAuthRoute() builds the 2FA target as a dynamic route for the not-yet-enabled cases:

    https://github.com/Expensify/App/blob/d93353fd47faf/src/hooks/useTwoFactorAuthRoute.ts#L26-L36

    if (!account?.validated) {
        return createDynamicRoute(DYNAMIC_ROUTES.TWO_FACTOR_AUTH_VERIFY_ACCOUNT.path, backTo);
    }
    return createDynamicRoute(DYNAMIC_ROUTES.TWO_FACTOR_AUTH_ROOT.path, backTo);

    A dynamic route is a suffix appended to a base path. When backTo is undefined, createDynamicRoute falls back to Navigation.getActiveRoute() as that base:

    https://github.com/Expensify/App/blob/d93353fd47faf/src/libs/Navigation/helpers/dynamicRoutesUtils/createDynamicRoute.ts#L62-L71

    const routePath = basePath ?? Navigation.getActiveRoute();
    return combinePathAndSuffix(routePath, dynamicRouteSuffixWithParams);

    The overlay is rendered as an absolute-fill sibling on top of the whole RootStack, so the base is simply whatever screen happens to sit behind it:

    https://github.com/Expensify/App/blob/d93353fd47faf/src/libs/Navigation/AppNavigator/AuthScreens.tsx#L378-L379

    So the navigation target is <screen-behind-the-overlay>/two-factor-auth/verify-account. For a brand-new / just-migrated account being walked through onboarding, the screen behind the overlay is the onboarding flow (or a transitional, report-less Home), and that base does not host the dynamic 2FA suffix — getStateFromPath can't resolve <onboarding>/two-factor-auth/verify-account into a valid 2FA state, so Navigation.navigate no-ops and the press is logged but visibly "does nothing" (matching the console-log screenshot in Slack).

    For a regular 2FA prompt (e.g. the still-used ConnectToXeroFlow, or an already-onboarded admin), the active route is a normal resolvable screen — settings/report — so the very same Navigation.navigate(getTwoFactorAuthRoute()) resolves and works. That is exactly why this is "Unable to reproduce with regular 2FA authentication": the bug is in the base the dynamic route is anchored to, which only goes wrong when the gate floats over the onboarding/empty-account context.

    What changes do you think we should make in order to solve the problem?

    Anchor the 2FA dynamic route to a stable, always-resolvable base instead of the transient screen behind the overlay, by passing an explicit backTo to getTwoFactorAuthRoute.

    In src/pages/RequireTwoFactorAuthenticationOverlay.tsx:

     const handleOnPress = () => {
    -    Navigation.navigate(getTwoFactorAuthRoute());
    +    Navigation.navigate(getTwoFactorAuthRoute(ROUTES.SETTINGS_SECURITY));
     };

    (ROUTES.SETTINGS_SECURITY = settings/security, so the target becomes settings/security/two-factor-auth/verify-account — the screen 2FA naturally lives under, guaranteed to resolve regardless of what is behind the overlay, and giving the setup flow a sane return target.)

    • File changed: src/pages/RequireTwoFactorAuthenticationOverlay.tsx only (add ROUTES import).
    • No changes to useTwoFactorAuthRoute (its backTo param already exists and is used by ConnectToXeroFlow), the dynamic-route machinery, or the validated/requiresTwoFactorAuth branching — the regular/Xero path stays byte-for-byte identical.
    • Works for both branches (verify-account for unvalidated accounts and two-factor-auth root for validated ones) since both go through the same createDynamicRoute(path, backTo).

    Once navigation succeeds, the overlay auto-hides because the focused screen becomes a SET_UP_2FA_SCREENS member, so isIn2FASetupFlow flips true (existing logic, no change needed).

    Test: Log in to a domain-enforced-2FA account that still needs setup while in the onboarding/new-account context, tap Enable two-factor authentication, and confirm the 2FA setup flow opens and can be completed.

    What alternative solutions did you explore? (Optional)

    • Capture a snapshot of Navigation.getActiveRoute() when the overlay first mounts and pass that as backTo. Rejected because the active route during onboarding is itself the broken base — snapshotting it doesn't make it a valid host for the 2FA suffix.
    • Make the overlay a real navigated screen (push it as a route) instead of an absolute-fill sibling of RootStack.Navigator. Correct long-term, but a much larger navigation change for what is a one-line anchoring bug; out of scope for the regression fix.
    • Special-case the parse failure inside getStateFromPath/createDynamicRoute to fall back to a default base. Rejected — it hides the real issue (the caller passing an unsuitable base) and risks masking other dynamic-route callers; fixing it at the call site is the surgical fix.
  6. David-2002065 commented on May 28, 2026

    @David-2002065
    Contributor

    Proposal

    Please re-state the problem that we are trying to solve in this issue.

    When a user is forced onto the "Two-factor authentication required" screen, clicking Enable two-factor authentication does nothing — the button is unresponsive and the user cannot complete 2FA setup, which blocks the new-domain login and account merge after domain migration.

    What is the root cause of that problem?

    The "Two-factor authentication required" screen is RequireTwoFactorAuthenticationOverlay. The button calls handleOnPress, which navigates to whatever getTwoFactorAuthRoute() returns:

    https://github.com/Expensify/App/blob/main/src/pages/RequireTwoFactorAuthenticationOverlay.tsx#L55-L57

    The overlay itself is a full-screen StyleSheet.absoluteFill that only un-mounts when shouldShowRequire2FAPage becomes false or the focused screen is in the 2FA setup flow:

    https://github.com/Expensify/App/blob/main/src/pages/RequireTwoFactorAuthenticationOverlay.tsx#L59-L70

    shouldShowRequire2FAPage is true under either of two conditions:

    https://github.com/Expensify/App/blob/main/src/hooks/useShouldShowRequire2FAPage.ts#L10-L15

    return (!!account?.needsTwoFactorAuthSetup && !account?.requiresTwoFactorAuth)
        || (!!account?.twoFactorAuthSetupInProgress && !hasCompletedGuidedSetupFlow);

    So the overlay can be visible even when requiresTwoFactorAuth is true — via the second clause (twoFactorAuthSetupInProgress && !hasCompletedGuidedSetupFlow), which is exactly the "partially enabled / broken 2FA state" the bug description calls out for a new-domain account whose backend record says 2FA is required but the guided setup never completed.

    Now look at useTwoFactorAuthRoute:

    https://github.com/Expensify/App/blob/main/src/hooks/useTwoFactorAuthRoute.ts#L21-L39

    const is2FAEnabled = !!account?.requiresTwoFactorAuth;
    const getTwoFactorAuthRoute = (backTo?: Route): Route => {
        if (is2FAEnabled) {
            return ROUTES.SETTINGS_2FA_ENABLED;   // ← maps to SCREENS.TWO_FACTOR_AUTH.ENABLED
        }
        if (!account?.validated) {
            return createDynamicRoute(DYNAMIC_ROUTES.TWO_FACTOR_AUTH_VERIFY_ACCOUNT.path, backTo);
        }
        return createDynamicRoute(DYNAMIC_ROUTES.TWO_FACTOR_AUTH_ROOT.path, backTo);
    };

    When requiresTwoFactorAuth is true, the resolver returns SETTINGS_2FA_ENABLED → SCREENS.TWO_FACTOR_AUTH.ENABLED. But that screen is not in SET_UP_2FA_SCREENS, which is what gates the overlay-dismiss check:

    https://github.com/Expensify/App/blob/main/src/libs/Navigation/Navigation.ts#L70-L79

    So in the broken-state scenario the chain is:

    1. twoFactorAuthSetupInProgress = true and requiresTwoFactorAuth = true → overlay shows.
    2. User clicks the button → getTwoFactorAuthRoute() returns SETTINGS_2FA_ENABLED because is2FAEnabled = true.
    3. Navigation does push to the "2FA Enabled" RHP screen, but because that screen isn't in SET_UP_2FA_SCREENS, isIn2FASetupFlow stays false and the absolute-fill overlay never un-mounts.
    4. From the user's perspective the button is dead — navigation happened, but it's hidden under the overlay, with no path to the setup wizard.

    It's not the underlying contradictory account state that breaks the button — the client-side flaw is that the overlay's own trigger condition admits a state where it routes to a screen that can't dismiss it.

    What changes do you think we should make in order to solve the problem?

    When RequireTwoFactorAuthenticationOverlay is showing, the user — by the overlay's own definition — has not completed 2FA setup, so the requiresTwoFactorAuth shortcut in the resolver is the wrong branch for this caller. I'd let the resolver accept an explicit "I'm forcing setup" hint so the overlay's button always lands on a setup-flow screen that the overlay knows how to dismiss:

     type TwoFactorAuthRouteResult = {
    -    getTwoFactorAuthRoute: (backTo?: Route) => Route;
    +    getTwoFactorAuthRoute: (backTo?: Route, options?: {forceSetup?: boolean}) => Route;
         is2FAEnabled: boolean;
     };
    
     function useTwoFactorAuthRoute(): TwoFactorAuthRouteResult {
         const [account] = useOnyx(ONYXKEYS.ACCOUNT);
         const is2FAEnabled = !!account?.requiresTwoFactorAuth;
    
    -    const getTwoFactorAuthRoute = (backTo?: Route): Route => {
    -        if (is2FAEnabled) {
    +    const getTwoFactorAuthRoute = (backTo?: Route, options?: {forceSetup?: boolean}): Route => {
    +        // Callers that force the user into setup (e.g. the RequireTwoFactorAuthenticationOverlay)
    +        // must bypass the "already enabled" shortcut — the account can be in a partial state where
    +        // `requiresTwoFactorAuth` is true but setup never completed (twoFactorAuthSetupInProgress).
    +        if (is2FAEnabled && !options?.forceSetup) {
                 return ROUTES.SETTINGS_2FA_ENABLED;
             }
             if (!account?.validated) {
                 return createDynamicRoute(DYNAMIC_ROUTES.TWO_FACTOR_AUTH_VERIFY_ACCOUNT.path, backTo);
             }
             return createDynamicRoute(DYNAMIC_ROUTES.TWO_FACTOR_AUTH_ROOT.path, backTo);
         };
         ...
     }

    Then in RequireTwoFactorAuthenticationOverlay.tsx, pass the flag from the only caller that needs it:

    - const handleOnPress = () => {
    -     Navigation.navigate(getTwoFactorAuthRoute());
    - };
    + const handleOnPress = () => {
    +     Navigation.navigate(getTwoFactorAuthRoute(undefined, {forceSetup: true}));
    + };

    This keeps the existing 3-way resolver behavior for the other call sites (SecuritySettingsPage, ConnectToXeroFlow, Enable2FACard, NonUSD/Finish) — they correctly want to land on the "enabled" page when 2FA is already on — and only the overlay opts into the unblocking behavior, where the destination is guaranteed to be in SET_UP_2FA_SCREENS so the overlay un-mounts.

    What alternative solutions did you explore? (Optional)

    1. Tighten is2FAEnabled to require completed setup, e.g. !!requiresTwoFactorAuth && !needsTwoFactorAuthSetup && !twoFactorAuthSetupInProgress. Fixes the overlay path but also reroutes SecuritySettingsPage and the Xero/bank flows for any user briefly in mid-setup, which is a behavior change well outside this bug. Rejected.
    2. Add SCREENS.TWO_FACTOR_AUTH.ENABLED to SET_UP_2FA_SCREENS so the overlay dismisses when navigating to the enabled page. That makes the button feel responsive but lands the user on "2FA already enabled" while they've still failed to complete setup — wrong screen for the user's actual state. Rejected.
    3. Trigger a RequireTwoFactorAuthenticationModal-style imperative open instead of Navigation.navigate. Bigger refactor for the same outcome and doesn't address the underlying mis-routing in the resolver. Rejected.
    4. Directly call createDynamicRoute(...) inside handleOnPress without touching the hook. Works, but duplicates the account?.validated branching that already lives in useTwoFactorAuthRoute; the optional-flag approach keeps that logic in one place.
  7. KJ21-ENG commented on May 28, 2026

    @KJ21-ENG
    Contributor

    Proposal

    What is the root cause of that problem?

    The reopened repro shows that requiresTwoFactorAuth cannot be treated as proof that 2FA setup is finished.

    With this account state:

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

    2FA is already required/enabled at the account level, but the user is still in the setup flow and still has incomplete NewDot onboarding. The client currently treats requiresTwoFactorAuth: true as the completed state in multiple 2FA routing paths:

    • useTwoFactorAuthRoute() returns the static enabled route as soon as requiresTwoFactorAuth is true.
    • DynamicTwoFactorAuthPage redirects to the enabled page when it sees requiresTwoFactorAuth.
    • The required-2FA overlay CTA does not pass a stable backTo, so dynamic 2FA routes can be built relative to the active onboarding route behind the overlay.

    That means the reviewer repro can show the required-2FA overlay, but pressing the CTA does not reliably open the active setup flow. It either targets the enabled page or gets pulled back into onboarding routing instead of continuing setup.

    There is a second routing conflict while guided setup is incomplete. The onboarding router/guard still enforces onboarding as the active modal flow, so 2FA modal navigation can be treated as an attempt to leave onboarding. After setup succeeds, the Settings/Security success path also keeps the user in the settings 2FA flow instead of restoring the unfinished onboarding flow.

    There is also a submit-time handoff issue after the user enters the 2FA verification code. validateTwoFactorAuth() updates the auth token and calls openApp() as soon as the API returns an auth token. In the required-2FA onboarding setup path, that unmounts the dynamic 2FA verify flow and lands the user on /home before the dynamic success page can clear twoFactorAuthSetupInProgress and restart onboarding.

    What changes do you think we should make in order to solve the problem?

    Treat twoFactorAuthSetupInProgress as the source of truth for unfinished 2FA setup, even when requiresTwoFactorAuth is also true.

    Concretely:

    • Update the required-2FA state helper so the overlay and onboarding router share the same condition for required setup: needsTwoFactorAuthSetup && !requiresTwoFactorAuth, or twoFactorAuthSetupInProgress && !hasCompletedGuidedSetupFlow.
    • Pause the automatic onboarding modal router while required 2FA setup is active, so onboarding does not immediately re-open over the 2FA modal.
    • Update useTwoFactorAuthRoute() so requiresTwoFactorAuth && twoFactorAuthSetupInProgress still returns the dynamic setup/verify route instead of SETTINGS_2FA_ENABLED.
    • Update DynamicTwoFactorAuthPage with the same rule, so it does not redirect in-progress setup users to the enabled page.
    • Anchor the required-2FA overlay CTA to ROUTES.SETTINGS_SECURITY when calling getTwoFactorAuthRoute(), instead of deriving the dynamic route from the currently focused onboarding screen.
    • Add a shared isTwoFactorSetupScreen() helper that includes the 2FA right-modal parent route and 2FA setup/replacement leaf routes, then use it both for overlay hiding and onboarding guard checks.
    • Add a narrow exception in OnboardingGuard that allows only required 2FA setup navigation while onboarding is incomplete. Unrelated non-onboarding navigation should still redirect back to onboarding.
    • On the dynamic 2FA success page, when the user came through the Settings/Security 2FA flow while twoFactorAuthSetupInProgress is true and guided setup is incomplete, clear the 2FA setup progress and restart onboarding from the saved onboarding state instead of staying on the enabled settings page.
    • When the verification code is submitted during required 2FA onboarding setup, keep the dynamic 2FA flow open after validateTwoFactorAuth() succeeds: update the auth token, but skip openApp() for this path. Then let DynamicVerifyPage navigate to the success page only after the validation response clears twoFactorAuthSecretKey, so the success page can perform the onboarding handoff.

    This keeps the fix frontend-only. It does not change the 2FA API contract, domain-policy requirements, or normal onboarding completion rules.

    What alternative solutions did you explore? (Optional)

    Only changing the overlay CTA route is not enough because requiresTwoFactorAuth: true would still make useTwoFactorAuthRoute() and DynamicTwoFactorAuthPage choose the enabled page while setup is still in progress.

    Only changing OnboardingGuard is not enough because the app would still classify the reviewer repro as completed 2FA setup and skip the setup screen.

    Only hiding the overlay during 2FA screens is also too narrow because it does not solve the route selection problem or the required return to onboarding after setup success.

  8. melvin-bot commented on May 28, 2026

    @melvin-bot

    Triggered auto assignment to Contributor-plus team member for initial proposal review - @cretadn22 (External)

  9. wildan-m commented on May 28, 2026

    @wildan-m
    Contributor

    🚫 Duplicated proposal withdrawn by 🤖 ProposalPolice.

  10. changed the title [-]Required 2FA setup screen is unresponsive, blocking new-domain login and account merge[/-] [+][$250] Required 2FA setup screen is unresponsive, blocking new-domain login and account merge[/+] on May 28, 2026
  11. melvin-bot commented on May 28, 2026

    @melvin-bot
  12. github-actions commented on May 28, 2026

    @github-actions
    Contributor

    ⚠️ @KJ21-ENG Your proposal is a duplicate of an already existing proposal and has been automatically withdrawn to prevent spam. Please review the existing proposals before submitting a new one.

  13. 141 remaining items

  14. thelullabyy commented on Oct 15, 2026

    @thelullabyy
    Contributor

    Price increase request

    Mandatory

    Proposed amount: $625 total: $375 for #94486 and $250 for #100077.

    Why the work exceeded the issue: The issue asked to unblock the Enable 2FA button, but the implementation required coordinating 2FA routing, onboarding guards, verification, and the return to onboarding after setup. Review also added a Sign out / Leave account option beyond the original expected behavior, delivered in a separate PR with shared sign-out logic and unit tests.

    Regressions caused by this PR:

    Optional

    Scope expansion: The Sign out option was discussed during review and deferred so the original fix could ship sooner. Product subsequently confirmed that the follow-up should remain under this issue. It required handling offline confirmation, active GPS trips, unsaved receipts, copilot Leave account behavior, and repeated presses.

    Files touched:

    • #94486 diff: 20 files covering the overlay, navigation guards, onboarding, session actions, 2FA screens, and tests.
    • #100077 diff: 18 files covering the overlay, shared sign-out hook, Settings integration, GPS data handling, translations, and unit tests.

    Core flow changes: Required 2FA during incomplete onboarding, including verification → success → onboarding resume; and sign-out / leaving a delegated account from the blocking overlay. These changes touch authentication, navigation, and safeguards for unsaved data.

    Test coverage: The PRs document testing across Android native, Android Chrome, iOS native, iOS Safari, and desktop Chrome/Safari. Coverage includes completing required 2FA and resuming onboarding, normal Settings 2FA, overlay sign-out, and offline behavior. Full onboarding passes required fresh accounts; automated coverage includes navigation guards, onboarding, session actions, 2FA routing, and the shared sign-out hook.

    Multiple PRs:

    • #94486: requesting $375 for the original fix because the complete solution required changes across the forced-2FA and onboarding flow.
    • #100077: requesting $250 for the additional Sign out / Leave account functionality requested during review. This added behavior beyond the original requirement to enable 2FA and complete login.
  15. mallenexpensify commented on Oct 16, 2026

    @mallenexpensify
    Contributor

    @iwiznia 👀 on the price increase above plz. I have a Clause project for reviews, they returned the below. _They'_re often a bit stringent when it comes to regressions

    Verdict: Partial approval. Pay
    #100077 as new scope. Decline the +$125 on #94486 and apply the regression penalty.

    Pay, per payee:

    @neerajbachani: $375. That is $125 for #94486 ($250 minus 50%) plus $250 for
    #100077.
    @thelullabyy: $125 for the #94486 review, plus $250 for the
    #100077 review if he reviewed it. His request does not ask for C+ pay.

    Basis:

    #100077 is new scope. @joekaufmanexpensify kept the Sign out PR under this issue.
    The onboarding handoff in #94486 was the root cause of the reported bug. It is not extra scope.

    Regressions:

    #94486 caused #98938 and #98933. Both had one cause and one fix, #98940, and @thelullabyy counted 1. CONTRIBUTING.md applies 50% “for each regression”. If you count 2, #94486 pays $0.
    #100077: #102609 was closed as expected behavior, so there is no penalty.

    Counterargument: The repro needed a fresh account and a 2FA domain, and the first C+ could not run the real path.

  16. neerajbachani commented on Oct 17, 2026

    @neerajbachani
    Contributor

    @mallenexpensify Thanks for reviewing this. I would like to add a few points.

    #100077 as new scope: Agreed. Sign out is not part of the original issue. @joekaufmanexpensify asked for it as a follow-up after we moved it out of #94486 so the first fix could ship sooner.

    On the #94486 regression: The line that caused #98938 and #98933 came from my merge commit 3401261. While resolving a conflict in DynamicSuccessPage, I passed false instead of the real hasCompletedGuidedSetupFlow. It was one condition, so both reports had one cause and one fix, #98940, and @thelullabyy counted it as one regression.

    When the blockers came up, I joined the #expensify-open-source thread the same night. I reviewed MelvinBot's fix and confirmed it matched the fix I had found, with a recording: https://expensify.slack.com/archives/C01GTK53T8Q/p1787165068610639?thread_ts=1787106700.721209&cid=C01GTK53T8Q. @thelullabyy asked me to help test #98933, so I tested it and confirmed that Got it keeps the user on Security with the 2FA page open, which is the expected result. #98940 shipped the next day.

    On testing: Each full pass of #94486 needed a new account, because onboarding shows only on the first login. It also needed a domain that requires 2FA, and the full 2FA setup each time: verify, save the recovery codes, enter the authenticator code, and return to onboarding. This path needed a real domain account, which is why review moved to @thelullabyy. #100077 needed the same domain setup to reach the overlay, plus the copilot, GPS trip, unsaved receipt, and offline cases.

    So I would still like to request $625: $375 for #94486 and $250 for #100077. If the regression rule needs to apply, I would ask that the help with the fix and the retest be considered against the 50% reduction, so that #94486 stays at $250.

    Thank you!

    cc: @iwiznia

  17. iwiznia commented on Oct 20, 2026

    @iwiznia
    Contributor

    Agree that #100077 is new scope and to value that at $250, but I am not convinced of the increase for #94486 mainly because it was in scope and even if it was more work, it indeed caused a regression, so I think that kind of evens out. My recommendation would be $500 in total, what do you guys think?

  18. mallenexpensify commented on Oct 20, 2026

    @mallenexpensify
    Contributor

    Payment Summary

    Contributor: @neerajbachani paid $500 via Upwork
    Contributor+: @thelullabyy due $500 via NewDot

    @neerajbachani can you please accept the job below? Please reply here and tag me once you have.
    https://www.upwork.com/jobs/~022112601723473331661

    You can discuss the price still too, I can raise easily, if we decide to

  19. neerajbachani commented on Oct 20, 2026

    @neerajbachani
    Contributor

    @mallenexpensify I've accepted the job offer, thanks!!

  20. melvin-bot commented on Oct 20, 2026

    @melvin-bot

    @thelullabyy Eep! 4 days overdue now. Issues have feelings too...

  21. mallenexpensify commented on Oct 21, 2026

    @mallenexpensify
    Contributor

    @neerajbachani paid, summary updated above. Thx.

  22. melvin-bot commented on Oct 22, 2026

    @melvin-bot

    @thelullabyy Still overdue 6 days?! Let's take care of this!

  23. laurenreidexpensify commented on Oct 27, 2026

    @laurenreidexpensify
    Contributor

    $500 Approved @thelullabyy New Expensify

  24. Krishna2323 commented on Nov 13, 2026

    @Krishna2323
    Contributor

    Heads up: the fix for this issue (#94486) caused a regression. Admins who had finished onboarding stayed on Account > Security after completing the required 2FA setup, instead of landing on Home. Tracked in #101848 and fixed in #102482.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Metadata

Metadata

Labels

Awaiting PaymentAuto-added when associated PR is deployed to productionBugSomething is broken. Auto assigns a BugZero manager.DailyKSv2ExternalAdded to denote the issue can be worked on by a contributor

Type

No type

Projects

Milestone

No milestone

Relationships

None yet

Development

No branches or pull requests

Issue actions