Skip to content

[CP Staging] Speed up building approval workflows from rules - #107398

Merged
mountiny merged 2 commits into
Expensify:mainfrom
callstack-internal:perf/workflow-rules-by-submitter
Nov 19, 2026
Merged

mountiny merged 2 commits into
Expensify:mainfrom
callstack-internal:perf/workflow-rules-by-submitter

Conversation

@TMisiukiewicz

@TMisiukiewicz TMisiukiewicz commented Nov 19, 2026 •

Copy link
Copy Markdown
Contributor

Explanation of Change

On accounts with the Multiple Approvers beta, rebuilding approval workflows from rules was slow on large workspaces. For each member, every step of the approval chain scanned all of the workspace's rules and re-read each rule's submitter list, even though only the rules that list that member can apply.

This runs every time the Workspaces tab red dot is recalculated. In a profile on a large account, one report open merged ~115 policies and spent ~1.5s blocking the JS thread in this code. About 1.07s of that was re-reading rule submitter lists.

  • convertApprovalWorkflowRulesToWorkflows already loops over every rule once to collect submitters. It now also groups the rules by submitter in that same loop.
  • Each member's chain is built from only their own rules instead of all rules. The rules each step skips are the same ones it skipped before, and they stay in the same order, so the workflows that come out are identical. It's just much less work.

Fixed Issues

$ #107403
PROPOSAL:

Tests

  1. Sign in with an account that has the Multiple Approvers beta and a workspace with several approval workflows (at least one with 2+ approvers and an approval limit).
  2. Go to Workspaces > the workspace > Workflows.
  3. Verify every workflow shows the same members and approvers, in the same order, as on main.
  4. In a dev build on web, point a member at a non-member by running Onyx.merge('policy_<policyID>', {approvalMode: 'ADVANCED', employeeList: {'<member email>': {submitsTo: 'removed-approver@example.com'}}}) in the browser console, then open Workflows. Verify that approver is flagged as no longer a member, and the Workspaces tab shows a red dot.
  5. Switch between tabs and open a few reports. Verify the app stays responsive.
  • Verify that no errors appear in the JS console

Offline tests

Same as tests, but with the network connection turned off. Verify the app behaves the same and no errors appear.

QA Steps

  1. Sign in with an account that has the Multiple Approvers beta and a workspace with several approval workflows (at least one with 2+ approvers and an approval limit).
  2. Go to Workspaces > the workspace > Workflows.
  3. Verify every workflow shows the members and approvers you expect, in the right order.
  4. Add a workflow where member A submits to member B, then remove B from the workspace.
  5. Verify A's approver is now the workspace owner and no red dot shows on the Workspaces tab.
  6. Switch between tabs and open a few reports. Verify the app stays responsive.
  • 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 verified any copy / text that was added to the app 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 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 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.
  • 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).
  • 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

🤖 Generated with Claude Code

@expensify-chore-bot

Copy link
Copy Markdown

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

@expensify-chore-bot
expensify-chore-bot Bot requested review from JmillsExpensify and removed request for a team November 19, 2026 13:44
@chatgpt-codex-connector

chatgpt-codex-connector Bot commented Nov 19, 2026 •

Copy link
Copy Markdown
Codex Review Summary: ✅ Completed

This comment shows the latest Codex review activity on this pull request.

Review Status Commit Review trigger
📝 Code Review ✅ Completed 2026-11-19T13:58:56.175245Z 840fa7c Draft marked ready
ℹ️ About Codex in GitHub

Your team has set up Codex to 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" or "@codex security review".

Codex reacts with 👀 while any review is running, comments if it has suggestions, and reacts with 👍 once all reviews finish with no findings.

@situchan

situchan commented Nov 19, 2026 •

Copy link
Copy Markdown
Contributor

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 any copy / text that was added to the app 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 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 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
test1.mov
web.mov

Comment thread src/libs/WorkflowUtils.ts
Comment on lines +2030 to +2032
const submitterRules = rulesBySubmitter.get(submitter) ?? {};
submitterRules[ruleID] = rule;
rulesBySubmitter.set(submitter, submitterRules);

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

NAB: redundant Map.set on every iteration

rulesBySubmitter.set runs for every rule and submitter pair, even when the submitter's entry already exists.

let submitterRules = rulesBySubmitter.get(submitter);
if (!submitterRules) {
    submitterRules = {};
    rulesBySubmitter.set(submitter, submitterRules);
}
submitterRules[ruleID] = rule;

Comment thread src/libs/WorkflowUtils.ts
Comment on lines +2064 to +2070
const submitterRules = rulesBySubmitter.get(email) ?? {};
const hasInitialRule = !!resolveFirstApprover(email, submitterRules, {});
if (!hasInitialRule && !submitsTo) {
continue;
}

let chain = buildApproverChainFromRules({submitter: email, rules, employees, personalDetailsByEmail}).map((approver) => ({
let chain = buildApproverChainFromRules({submitter: email, rules: submitterRules, employees, personalDetailsByEmail}).map((approver) => ({

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

NAB: nothing locks in the "only the submitter's rules" assumption

This is only correct while resolveApprovalHop and buildApproverChainFromRules never read rules for other submitters.
If a later change makes a step read an approver's own submit rules, this caller would silently build wrong chains.
Could we add a unit test? Two submitters share approver A, A submits to B through their own rules, and the result must match passing all rules. Or at least note the assumption in the JSDoc on buildApproverChainFromRules.

@situchan

Copy link
Copy Markdown
Contributor

Author Checklist failing

@situchan

Copy link
Copy Markdown
Contributor

@MelvinBot assign me in the linked issue

@MelvinBot

Copy link
Copy Markdown
Contributor

@situchan

Copy link
Copy Markdown
Contributor
  1. Verify the workflow shows that approver flagged as no longer a member, and a red dot shows on the Workspaces tab.
  2. Switch between tabs and open a few reports. Verify the app stays responsive and the red dot doesn't change.

Is this step correct? I don't see red dot but instead approver is replaced with owner

@situchan

Copy link
Copy Markdown
Contributor

Worth follow-up: same full-rules scan left in the two sibling functions

App/src/libs/WorkflowUtils.ts

Lines 1923 to 1955 in 840fa7c

*/
function getRulesSubmitterToFirstApprover(rules: Record<string, ApprovalWorkflowRule>, employees: PolicyEmployeeList = {}, defaultApprover?: string): Record<string, string> {
const submitters = new Set<string>();
const defaultWorkflowSubmitters = new Set<string>();
for (const rule of Object.values(rules)) {
for (const email of extractSubmitterEmails(rule)) {
submitters.add(email);
if (rule.isDefaultApprovalWorkflow) {
defaultWorkflowSubmitters.add(email);
}
}
}
const shouldExcludeDefaultWorkflow = defaultApprover !== undefined;
const canReadDefaultWorkflowFromRules = shouldExcludeDefaultWorkflow && hasRuleBasedDefaultWorkflow(rules);
const result: Record<string, string> = {};
for (const submitter of submitters) {
// Resolving the chain is the expensive part, so skip it for submitters the rules already exclude.
if (canReadDefaultWorkflowFromRules && defaultWorkflowSubmitters.has(submitter)) {
continue;
}
const firstApprover = resolveFirstApprover(submitter, rules, employees);
if (!firstApprover) {
continue;
}
if (shouldExcludeDefaultWorkflow && !canReadDefaultWorkflowFromRules && firstApprover === defaultApprover) {
continue;
}
result[submitter] = firstApprover;
}
return result;

App/src/libs/WorkflowUtils.ts

Lines 1964 to 1981 in 840fa7c

function getRulesSubmitterToWorkflowKey(rules: Record<string, ApprovalWorkflowRule>, employees: PolicyEmployeeList = {}): Record<string, string> {
const submitters = new Set<string>();
for (const rule of Object.values(rules)) {
for (const email of extractSubmitterEmails(rule)) {
submitters.add(email);
}
}
const result: Record<string, string> = {};
for (const submitter of submitters) {
// The key ignores display/avatar fields, so personal details aren't needed here.
const chain = buildApproverChainFromRules({submitter, rules, employees, personalDetailsByEmail: {}});
if (chain.length > 0) {
result[submitter] = getApproverChainKey(chain);
}
}
return result;
}

getRulesSubmitterToFirstApprover and getRulesSubmitterToWorkflowKey run the same submitter loop, then pass the full rules into resolveFirstApprover / buildApproverChainFromRules for each submitter. That's the scan this PR removes. They run on every render of the "Expenses from" page, so large workspaces will still be slow there.
A small groupApprovalWorkflowRulesBySubmitter(rules) helper could replace all three copies of the loop.

@situchan

Copy link
Copy Markdown
Contributor

I found weird bug which also happens on production.
After removing members who are approvers in custom workflow, workflow disappears. And after adding them back, workflow appears but approvers are set to owner.

web2.mov

@JmillsExpensify JmillsExpensify left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No product review required.

@melvin-bot

melvin-bot Bot commented Nov 19, 2026

Copy link
Copy Markdown

We did not find an internal engineer to review this PR, trying to assign a random engineer to #107403 as well as to this PR... Please reach out for help on Slack if no one gets assigned!

@mountiny mountiny left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@MelvinBot can you create issue to address the NAB follow ups and assign @TMisiukiewicz @situchan and @mountiny

@mountiny
mountiny merged commit 504bf8d into Expensify:main Nov 19, 2026
44 of 53 checks passed
@MelvinBot

Copy link
Copy Markdown
Contributor

Created Approval workflow rules: address non-blocking review follow-ups and assigned TMisiukiewicz, situchan, and mountiny.

Includes the redundant map writes, regression coverage, and sibling-function optimization.


view run

@mountiny mountiny changed the title Speed up building approval workflows from rules [CP Staging] Speed up building approval workflows from rules Nov 19, 2026
OSBotify pushed a commit that referenced this pull request Nov 19, 2026
…s-by-submitter

Speed up building approval workflows from rules

(cherry picked from commit 504bf8d)

(cherry-picked to staging by mountiny)
@OSBotify OSBotify added the CP Staging marks PRs that have been CP'd to staging label Nov 19, 2026
@OSBotify

Copy link
Copy Markdown
Contributor

🚀 Cherry-picked to staging by https://github.com/mountiny in version: 9.5.43-2 🚀

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

@MelvinBot

Copy link
Copy Markdown
Contributor

No help site update needed — this PR only optimizes approval workflow calculations without changing user-facing behavior, adding a feature, or removing a beta gate.


view run

@github-actions

Copy link
Copy Markdown
Contributor

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

@github-actions

Copy link
Copy Markdown
Contributor

OSBotify pushed a commit that referenced this pull request Nov 19, 2026
…s-by-submitter

Speed up building approval workflows from rules

(cherry picked from commit 504bf8d)

(cherry-picked to production by mountiny)
@OSBotify

Copy link
Copy Markdown
Contributor

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

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

@OSBotify

Copy link
Copy Markdown
Contributor

🚀 Deployed to production by https://github.com/marcaaron in version: 9.5.45-0 🚀

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

Bundle Size Analysis (Sentry):

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

Labels

CP Production CP Staging marks PRs that have been CP'd to staging

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants