Skip to content

[CP staging] Fix Not here page when changing approver then opening Expenses from in edit mode #93733

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
puneetlath merged 1 commit into from
Jun 16, 2026
+5 −2
Merged

[CP staging] Fix Not here page when changing approver then opening Expenses from in edit mode #93733

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions src/pages/workspace/workflows/approvals/ApprovalWorkflowEditor.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,10 @@ function ApprovalWorkflowEditor({approvalWorkflow, removeApprovalWorkflow, polic
);

const handleExpensesFromPress = useCallback(() => {
const firstApproverEmail = approvalWorkflow.approvers?.at(0)?.email ?? '';
// Key the EDIT backTo off the persisted first approver, not the mutated draft. The edit page
// resolves its workflow from policy.employeeList by first-approver email, so an unsaved approver
// change would point backTo at a non-existent workflow and render the not-found ("Not here") view.
const firstApproverEmail = approvalWorkflow.originalApprovers?.at(0)?.email ?? '';
// Always pass a backTo so that after editing expenses-from (including the invite-a-member detour),
// we return to the page we came from. For EDIT that's the edit page; for CREATE we're on the
// confirm (new) page, so return there instead of falling through to the Approver step.
Expand All @@ -144,7 +147,7 @@ function ApprovalWorkflowEditor({approvalWorkflow, removeApprovalWorkflow, polic
? ROUTES.WORKSPACE_WORKFLOWS_APPROVALS_EDIT.getRoute(policyID, firstApproverEmail)
: ROUTES.WORKSPACE_WORKFLOWS_APPROVALS_NEW.getRoute(policyID);
Navigation.navigate(ROUTES.WORKSPACE_WORKFLOWS_APPROVALS_EXPENSES_FROM.getRoute(policyID, backTo));
}, [approvalWorkflow.action, approvalWorkflow.approvers, policyID]);
}, [approvalWorkflow.action, approvalWorkflow.originalApprovers, policyID]);

// User should be allowed to add additional approver only if they upgraded to Control Plan, otherwise redirected to the Upgrade Page
const addAdditionalApprover = useCallback(() => {
Expand Down
Loading