🍒 Cherry pick PR #106154 to staging 🍒 by os-botify[bot] · Pull Request #106160 · Expensify/App

os-botify · 2026-11-06T01:15:48Z

🍒 Cherry pick #106154 to staging 🍒

This PR had conflicts when we tried to cherry-pick it to staging. You'll need to manually perform the cherry-pick, using the following steps:

git fetch
git checkout cherry-pick-staging-106154-42140447065-1
git cherry-pick -S -x --mainline 1 786ab3996952dd81bb5a59247f5124c347534d43

Then manually resolve conflicts, and commit the change with git cherry-pick --continue. Lastly, please run:

git commit --amend -m "$(git log -1 --pretty=%B)" -m "(cherry-picked to staging by mountiny)"

This last part is important. It will help us keep track of who triggered this CP, and will ensure that version bumps are tracked correctly. Once all that's done, push your changes with git push origin cherry-pick-staging-106154-42140447065-1, and then open this PR for review.

Note that you must test this PR, and both the author and reviewer checklist should be completed, just as if you were merging the PR to main.

Important

This PR should ideally be merged by a member of the mobile-deployers team. If it is merged by someone who is not a deployer, the staging deploy triggered by the merge will fail and will need to be manually re-triggered (not just retried) via the deploy workflow.

Pro-tip: If this PR appears to have conflicts against the staging base, it means that the version on staging has been updated. The easiest thing to do if you see this is to close the PR and re-run the CP.

PR Author Checklist

Screenshots/Videos

Android: Native

Android: mWeb Chrome

iOS: Native

iOS: mWeb Safari

MacOS: Chrome / Safari

(cherry picked from commit 2c6455a) (cherry-picked to staging by mountiny)

chatgpt-codex-connector · 2026-11-06T01:16:00Z

Codex Review Summary

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

Review	Status	Commit	Review trigger
📝 Code Review	✅ Completed 2026-11-06T01:18:16.393975Z	`8c74c62`	PR opened

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

melvin-bot · 2026-11-06T01:16:27Z

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

@Krishna2323

[Payment due @Krishna2323] Patch to prevent policies with overLimitApprovesTo from migrating to rule-based approvals (cherry picked from commit 786ab39) (cherry-picked to staging by mountiny)

mountiny · 2026-11-06T02:19:48Z

@MelvinBot can you review the cities resolution done here?

codecov · 2026-11-06T02:20:06Z

Codecov Report

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

Files with missing lines	Coverage Δ
src/hooks/useApprovalWorkflows.ts	`100.00% <100.00%> (ø)`
src/hooks/useShouldUseApprovalWorkflowRules.ts	`100.00% <100.00%> (ø)`
src/libs/WorkflowUtils.ts	`94.38% <100.00%> (ø)`
src/libs/actions/Workflow.ts	`88.36% <100.00%> (ø)`
src/pages/workspace/WorkspaceMembersPage.tsx	`79.36% <100.00%> (ø)`
...kspace/members/WorkspaceInviteMessageComponent.tsx	`89.42% <100.00%> (ø)`
...rkspace/workflows/WorkspaceWorkflowsPageRevamp.tsx	`89.79% <100.00%> (ø)`
...ace/workflows/approvals/ApprovalWorkflowEditor.tsx	`84.54% <100.00%> (ø)`
...micWorkspaceWorkflowsApprovalsExpensesFromPage.tsx	`84.55% <100.00%> (ø)`
...rovals/WorkspaceWorkflowsApprovalsApproverPage.tsx	`84.48% <100.00%> (ø)`
... and 4 more

mountiny · 2026-11-06T02:54:15Z

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 proper code patterns were followed (see Reviewing the code)
- 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 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)
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 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 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

mountiny

Changes looks good to me

mountiny · 2026-11-06T02:56:34Z

+ *
+ * @param hasRules whether approval workflow rules route the policy's reports, see `hasApprovalWorkflowRules`
+ */
+function shouldUseApprovalWorkflowRules(policy: OnyxEntry<Policy>, hasRules: boolean, isMultipleApproversBetaEnabled: boolean): boolean {


Can you also add unit test specific for this utils method please

OSBotify · 2026-11-06T09:11:25Z

🚀 Deployed to production by https://github.com/lakchote in version: 9.5.32-7 🚀

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

OSBotify added 2 commits November 6, 2026 01:15

Update version to 9.5.32-6

cb78cae

(cherry picked from commit 2c6455a) (cherry-picked to staging by mountiny)

Update Mobile-Expensify submodule version to 9.5.32-6

8c74c62

os-botify Bot requested a review from a team as a code owner November 6, 2026 01:15

os-botify Bot added Engineering Hourly KSv2 CP Staging marks PRs that have been CP'd to staging labels Nov 6, 2026

os-botify Bot assigned mountiny and Gonals Nov 6, 2026

melvin-bot Bot requested review from NicolasBonet and removed request for a team November 6, 2026 01:16

Merge pull request #106154 from Expensify/alberto-blockRules

d8d0ab0

[Payment due @Krishna2323] Patch to prevent policies with overLimitApprovesTo from migrating to rule-based approvals (cherry picked from commit 786ab39) (cherry-picked to staging by mountiny)

Gonals requested a review from a team as a code owner November 6, 2026 02:09

melvin-bot Bot requested review from garrettmknight and removed request for a team November 6, 2026 02:10

mountiny approved these changes Nov 6, 2026

View reviewed changes

Gonals approved these changes Nov 6, 2026

View reviewed changes

mountiny merged commit 1fa44ff into staging Nov 6, 2026
40 of 41 checks passed

mountiny deleted the cherry-pick-staging-106154-42140447065-1 branch November 6, 2026 03:01

OSBotify mentioned this pull request Nov 6, 2026

Deploy Checklist: New Expensify 2026-11-04 #105971

Closed

88 tasks done

Navigation Menu

Repository navigation

🍒 Cherry pick PR #106154 to staging 🍒 - #106160

🍒 Cherry pick PR #106154 to staging 🍒#106160
mountiny merged 3 commits into
stagingfrom
cherry-pick-staging-106154-42140447065-1

os-botify Bot commented Nov 6, 2026

Uh oh!

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

edited

Loading

Uh oh!

melvin-bot Bot commented Nov 6, 2026

Uh oh!

mountiny commented Nov 6, 2026

Uh oh!

codecov Bot commented Nov 6, 2026 •

edited by github-actions Bot

Loading

Uh oh!

mountiny commented Nov 6, 2026

Uh oh!

mountiny left a comment

Uh oh!

mountiny Nov 6, 2026

Uh oh!

Uh oh!

OSBotify commented Nov 6, 2026

Uh oh!

Reviewers

Uh oh!

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

Conversation

os-botify Bot commented Nov 6, 2026

PR Author Checklist

Screenshots/Videos

Uh oh!

chatgpt-codex-connector Bot commented Nov 6, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codex Review Summary

Uh oh!

melvin-bot Bot commented Nov 6, 2026

Uh oh!

mountiny commented Nov 6, 2026

Uh oh!

codecov Bot commented Nov 6, 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!

mountiny commented Nov 6, 2026

Reviewer Checklist

Screenshots/Videos

Uh oh!

mountiny left a comment

Choose a reason for hiding this comment

Uh oh!

mountiny Nov 6, 2026

Choose a reason for hiding this comment

Uh oh!

Uh oh!

OSBotify commented Nov 6, 2026

Uh oh!

Reviewers

Uh oh!

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

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

edited

Loading

codecov Bot commented Nov 6, 2026 •

edited by github-actions Bot

Loading