Skip to content

Fix stale next step after Submit upgrade + approve#94238

Draft
abzokhattab wants to merge 4 commits into
Expensify:mainfrom
abzokhattab:abzokhattab/fix/93686-submit-stale-next-step
Draft

Fix stale next step after Submit upgrade + approve#94238
abzokhattab wants to merge 4 commits into
Expensify:mainfrom
abzokhattab:abzokhattab/fix/93686-submit-stale-next-step

Conversation

@abzokhattab

@abzokhattab abzokhattab commented Jun 23, 2026

Copy link
Copy Markdown
Contributor

Explanation of Change

When a report on a Submit-tier (submit2026) workspace is approved, approval goes through the new UpgradeSubmit server-side flow. approveMoneyRequest detects this and returns early (navigating to the upgrade page), so it never builds the optimistic approved action or next step. The actual approval happens server-side inside UpgradeSubmit (the reportID is passed so the backend approves the report after upgrading), but that response does not refresh the report's next step. As a result, the Next Steps banner stays stuck on "Waiting for you to approve expenses" until the report is manually reopened (e.g. via openReport).

This PR fills in the previously empty approvalSubmitReport case in the upgrade confirmation handler (WorkspaceUpgradePage) to call openReport once the Submit upgrade succeeds. Because that confirmation only fires after the upgrade completes server-side (the report is already approved by then), refetching the report returns the correct post-approval next step from the server — matching what a manual reopen does today — without fragile optimistic guessing.

Fixed Issues

$ #93686

PROPOSAL: N/A (internal project bug fix — Bottom-Up Submit Plan)

Tests

  1. Use a Submit-tier (submit2026) workspace with the SUBMIT_2026 beta enabled.
  2. As a submitter, submit an expense report on the workspace.
  3. As the approver, open the report and click Approve.
  4. On the upgrade prompt, click Upgrade.
  5. Verify the workspace upgrades to Collect and the report is approved.
  6. Verify the Next Steps banner immediately updates away from "Waiting for you to approve expenses" (e.g. to "Waiting for [admin] to pay") without needing to navigate away or manually reopen the report.
  • Verify that no errors appear in the JS console

Offline tests

Upgrading/approving is an online-only flow (consistent with the rest of the upgrade/downgrade flows), so there is no new offline behavior. While offline, the Upgrade button is disabled and no openReport refresh is triggered.

QA Steps

Same as the Tests section above (requires the SUBMIT_2026 beta and a Submit-tier workspace).

  • 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 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 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 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 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
Android: mWeb Chrome
iOS: Native
iOS: mWeb Safari
MacOS: Chrome / Safari

When a Submit-tier report is approved via the UPGRADE_SUBMIT flow, the
report is approved server-side but the UpgradeSubmit response does not
refresh the report's next step, leaving the banner stuck on "Waiting for
you to approve" until a manual reopen.

Refetch the report via openReport in the approvalSubmitReport upgrade
confirmation case, which fires once the submit upgrade succeeds, so the
next step reflects the approved state immediately.

Fixes Expensify#93686
Replace the openReport refetch workaround with optimistic Onyx updates in
upgradeSubmit. When the upgrade also approves a report (the Submit "Approve
report" flow), it now writes the approved report state and a refreshed next
step optimistically, mirroring ApproveMoneyRequest, so the banner no longer
stays stuck on "Waiting for you to approve" until a manual reopen. Includes
success/failure rollback for the report and NEXT_STEP collection.
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.

1 participant