[CP staging] Fix Not here page when changing approver then opening Expenses from in edit mode by MelvinBot · Pull Request #93733 · Expensify/App

MelvinBot · 2026-06-16T17:19:13Z

Explanation of Change

When editing an existing approval workflow, opening Expenses from from the editor built the backTo route keyed by the current (mutated) draft first approver (approvalWorkflow.approvers[0].email). If the admin had just changed the approver without saving, that draft approver no longer matched any persisted workflow. The edit page resolves its workflow from policy.employeeList by first-approver email, so pressing the RHP back button navigated to a non-existent workflow and rendered the full-page not-found ("Not here") view.

This keys the backTo off the persisted approvalWorkflow.originalApprovers[0].email instead — the same field the sibling WorkspaceWorkflowsApprovalsExpensesFromPage goBack already uses — so back navigation always resolves to the real, persisted workflow.

Fixed Issues

$ #93729
PROPOSAL: #93729 (comment)

Tests

Invite User A and User B to a workspace.
Go to Workspace settings > Workflows > Add approval workflow. Create a workflow where User A submits to User B.
Open the created workflow.
Change the approver to User A.
Click Expenses from.
Click the RHP back button.
Verify the app returns to the workflow confirm/edit page (NOT the "Not here" page).
Repeat without changing the approver and verify back navigation still returns to the confirm page.

Verify that no errors appear in the JS console

Offline tests

Same as Tests.

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

iOS: mWeb Safari

MacOS: Chrome / Safari

CleanShot.2026-06-16.at.13.28.23.mp4

…n edit mode Co-authored-by: Puneet Lath <puneetlath@users.noreply.github.com>

codecov · 2026-06-16T17:24:07Z

Codecov Report

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

Files with missing lines	Coverage Δ
...ace/workflows/approvals/ApprovalWorkflowEditor.tsx	`80.76% <0.00%> (ø)`
... and 16 files with indirect coverage changes

melvin-bot · 2026-06-16T17:24:13Z

@abdulrahuman5196 @youssef-lr One of you needs to 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]

MelvinBot · 2026-06-16T17:28:01Z

⚠️ Claude's API is experiencing issues. Check status.anthropic.com for updates and try again once the incident resolves.

Run details

situchan · 2026-06-16T17:32:56Z

@codex review

situchan · 2026-06-16T17:33:22Z

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
- MacOS: Desktop
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 there are no new alerts related to the canBeMissing param for useOnyx
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/Videos

Android: HybridApp

android.mov

Android: mWeb Chrome

iOS: HybridApp

ios.mov

iOS: mWeb Safari

MacOS: Chrome / Safari

web.mov

web2.mov

MelvinBot · 2026-06-16T17:35:36Z

⚠️ Claude's API is experiencing issues. Check status.anthropic.com for updates and try again once the incident resolves.

Run details

chatgpt-codex-connector · 2026-06-16T17:36:46Z

Codex Review: Didn't find any major issues. Already looking forward to the next diff.

Reviewed commit: 9f7e1b4fd4

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

github-actions · 2026-06-16T18:16:09Z

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

…otHere [CP staging] Fix Not here page when changing approver then opening Expenses from in edit mode (cherry picked from commit 87c7da8) (cherry-picked to staging by puneetlath)

github-actions · 2026-06-16T18:22:20Z

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

Android 🤖	iOS 🍎
https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-android-Adhoc-87c7da80bf3-e46de0d-cafa23dd368424fc5864510a9061cb3df1d411e9/index.html	https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-ios-device-AdHoc-87c7da8-e46de0d-0e7269f8b54019c749c6cc6d23cf606b95b7146c/index.html

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

👀 View the workflow run that generated this build 👀

OSBotify · 2026-06-16T18:22:25Z

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

OSBotify · 2026-06-16T18:47:46Z

🚀 Cherry-picked to staging by https://github.com/puneetlath in version: 9.4.8-3 🚀

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

Bundle Size Analysis (Sentry):

Android
iOS

MelvinBot · 2026-06-16T18:49:51Z

🤖 No help site changes required.

This PR is a pure navigation bug fix: it keys the "Expenses from" backTo route off the persisted first approver (originalApprovers[0].email) instead of the mutated draft, so the RHP back button resolves to the real workflow instead of rendering the not-found ("Not here") page.

It does not add, remove, or rename any feature, tab, setting, button, or user-facing workflow. The behavior documented in the approval-workflow help articles (e.g. Approve-Expenses.md) is unchanged — users set up workflows, pick approvers, and choose "Expenses from" exactly as before. The only difference is that an error page no longer appears when navigating back after an unsaved approver change.

Since there's no change to documented product behavior, no draft docs PR was created.

@puneetlath, since this is a behavior-preserving bug fix with no documented-behavior change, no help site PR was created. Please confirm you agree no docs update is needed — if you'd like one anyway, let me know and I'll open a draft.

IuliiaHerets · 2026-06-16T19:23:05Z

CP was passed by QA team, Chrome / v9.4.8-3

REC-20260616221815.mp4

OSBotify · 2026-06-16T19:46:14Z

🚀 Deployed to production by https://github.com/puneetlath in version: 9.4.8-3 🚀

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

OSBotify · 2026-06-16T20:11:17Z

🚀 Cherry-picked to staging by https://github.com/puneetlath in version: 9.4.9-0 🚀

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

Bundle Size Analysis (Sentry):

Android
iOS

MelvinBot · 2026-06-16T20:13:50Z

Help site review: no docs changes required

I reviewed this PR against the help site files under App/docs/articles and no help site updates are required.

Why: This is a navigation bug fix only. It changes the backTo route built when opening Expenses from in the approval workflow editor — keying it off the persisted first approver (originalApprovers[0].email) instead of the mutated draft — so the RHP back button resolves to the real, persisted workflow rather than rendering the full-page not-found ("Not here") view.

It introduces no new feature, UI label, tab, setting, button, or user-facing workflow step. The existing approval-workflow articles (Add-Approvals.md, Workspace-Workflows.md) describe how to set up approval workflows; they don't document back-button navigation or this not-found edge case, so none of their content becomes inaccurate as a result of this change.

Since no docs changes are needed, I did not create a help site draft PR.

cc @puneetlath — let me know if you'd still like a docs PR opened for any reason.

OSBotify · 2026-06-17T18:13:59Z

🚀 Deployed to production by https://github.com/puneetlath in version: 9.4.9-0 🚀

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

Fix Not here page when changing approver then opening Expenses from i…

9f7e1b4

…n edit mode Co-authored-by: Puneet Lath <puneetlath@users.noreply.github.com>

MelvinBot assigned puneetlath Jun 16, 2026

MelvinBot requested a review from a team June 16, 2026 17:19

MelvinBot mentioned this pull request Jun 16, 2026

[Due for payment 2026-06-24] [Due for payment 2026-06-23] [$250] Workflows - Not here page opens after changing approver and returning from Expenses from #93729

Open

7 tasks

puneetlath requested a review from situchan June 16, 2026 17:24

puneetlath marked this pull request as ready for review June 16, 2026 17:24

puneetlath requested a review from a team as a code owner June 16, 2026 17:24

melvin-bot Bot requested review from abdulrahuman5196, trjExpensify and youssef-lr and removed request for a team June 16, 2026 17:24

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

puneetlath removed the request for review from abdulrahuman5196 June 16, 2026 17:25

puneetlath changed the title ~~Fix Not here page when changing approver then opening Expenses from in edit mode~~ [CP staging] Fix Not here page when changing approver then opening Expenses from in edit mode Jun 16, 2026

situchan approved these changes Jun 16, 2026

View reviewed changes

JS00001 approved these changes Jun 16, 2026

View reviewed changes

puneetlath merged commit 87c7da8 into main Jun 16, 2026
41 of 43 checks passed

puneetlath deleted the claude-workflowEditApproverNotHere branch June 16, 2026 18:14

OSBotify added the CP Staging marks PRs that have been CP'd to staging label Jun 16, 2026

OSBotify mentioned this pull request Jun 16, 2026

Deploy Checklist: New Expensify 2026-06-15 #93604

Closed

62 tasks

Conversation

MelvinBot commented Jun 16, 2026 • edited by puneetlath 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!

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

melvin-bot Bot commented Jun 16, 2026

Uh oh!

MelvinBot commented Jun 16, 2026

Uh oh!

situchan commented Jun 16, 2026

Uh oh!

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

Uh oh!

Reviewer Checklist

Screenshots/Videos

Uh oh!

MelvinBot commented Jun 16, 2026

Uh oh!

chatgpt-codex-connector Bot commented Jun 16, 2026

Uh oh!

Uh oh!

github-actions Bot commented Jun 16, 2026

Uh oh!

github-actions Bot commented Jun 16, 2026

Uh oh!

OSBotify commented Jun 16, 2026

Uh oh!

OSBotify commented Jun 16, 2026

Uh oh!

MelvinBot commented Jun 16, 2026

Uh oh!

IuliiaHerets commented Jun 16, 2026

Uh oh!

OSBotify commented Jun 16, 2026

Uh oh!

OSBotify commented Jun 16, 2026

Uh oh!

MelvinBot commented Jun 16, 2026

Help site review: no docs changes required

Uh oh!

OSBotify commented Jun 17, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

MelvinBot commented Jun 16, 2026 •

edited by puneetlath

Loading

codecov Bot commented Jun 16, 2026 •

edited by github-actions Bot

Loading

situchan commented Jun 16, 2026 •

edited

Loading