[Payment due @marufsharifi] Set member work arrangement by fedirjh · Pull Request #101876 · Expensify/App

fedirjh · 2026-09-22T13:10:05Z

Important

On Hold for Auth and web-E PRs
https://github.com/Expensify/Auth/pull/24741
https://github.com/Expensify/Web-Expensify/pull/56373

Explanation of Change

Adds a per-member work arrangement setting (Office-based / No regular workspace) for homeAndOffice workspaces: PolicyEmployee.hasOfficeWorkArrangement type, setEmployeeWorkArrangement action with offline optimistic/success/failure handling plus per-member optimistic changelog entries, rendered changelog messages, a Work arrangement row on the member details page, and a new WorkArrangementPage radio selector.

Fixed Issues

$ https://github.com/Expensify/Expensify/issues/642612
PROPOSAL:

Tests

On a homeAndOffice workspace, open Members → a member's detail page and verify the Work arrangement row reads the current value (defaults to Remote or mobile).
Tap the row, select Office-based, and verify you're navigated back with the row updated, plus one changed 's work arrangement to office-based… entry in the #admins room thread.
Reopen the selector and verify Office-based is pre-selected (per-member value beats the workspace default).
On a fixedDistance (or unset) workspace, verify the row is absent;
as a non-admin, verify direct navigation to .../members//work-arrangement is blocked.

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

CleanShot.2026-09-22.at.17.24.27.mp4

melvin-bot · 2026-09-22T13:10:24Z

Hey, I noticed you changed src/languages/en.ts in a PR from a fork. For security reasons, translations are not generated automatically for PRs from forks.

If you want to automatically generate translations for other locales, an Expensify employee will have to:

Look at the code and make sure there are no malicious changes.
Run the Generate static translations GitHub workflow. If you have write access and the K2 extension, you can simply click: [this button]

Alternatively, if you are an external contributor, you can run the translation script locally with your own OpenAI API key. To learn more, try running:

npx bun ./scripts/generateTranslations.ts --help

Typically, you'd want to translate only what you changed by running npx bun ./scripts/generateTranslations.ts --compare-ref main

…rrangement

melvin-bot · 2026-09-22T16:30:05Z

I could not review this diff, so I did not approve the workflow runs. An Expensify employee will review it and approve them manually.

codecov · 2026-09-22T18:19:12Z

Codecov Report

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

Files with missing lines	Coverage Δ
src/CONST/index.ts	`95.79% <ø> (ø)`
src/ROUTES.ts	`31.00% <100.00%> (+0.05%)`	⬆️
src/SCREENS.ts	`100.00% <ø> (ø)`
src/libs/API/types.ts	`100.00% <ø> (ø)`
...gation/AppNavigator/ModalStackNavigators/index.tsx	`7.78% <100.00%> (+0.09%)`	⬆️
...gation/linkingConfig/RELATIONS/WORKSPACE_TO_RHP.ts	`100.00% <ø> (ø)`
src/libs/Navigation/linkingConfig/config.ts	`62.50% <ø> (ø)`
src/libs/PolicyUtils.ts	`89.04% <100.00%> (+0.01%)`	⬆️
src/libs/ReportActionsUtils.ts	`82.50% <100.00%> (+0.08%)`	⬆️
src/libs/WorkArrangementUtils.ts	`100.00% <100.00%> (ø)`
... and 7 more
... and 11 files with indirect coverage changes

…rrangement

melvin-bot · 2026-09-24T07:17:00Z

I could not review this diff, so I did not approve the workflow runs. An Expensify employee will review it and approve them manually.

fedirjh · 2026-09-29T20:43:12Z

@marufsharifi Can you please prioritize the review on this? it should unblock the next PRs.

marufsharifi · 2026-09-30T03:41:38Z

@fedirjh, sure i will update here in a few hours. thanks.

marufsharifi

LGTM, Just a Typo

melvin-bot · 2026-09-30T11:41:58Z

🎯 @marufsharifi, thanks for reviewing and testing this PR! 🎉

A payment issue will be created for your review once this PR is deployed to production.
E/E issue linked to the PR - https://www.github.com/Expensify/Expensify/issues/642612.

If payment is not needed (e.g., regression PR review fix etc), react with 👎 to this comment to prevent the payment issue from being created.

marufsharifi · 2026-09-30T11:42:49Z

@fedirjh, could you please check the last feedback as well. thanks.

Gonals · 2026-09-30T12:46:56Z

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

OSBotify · 2026-09-30T12:52:58Z

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

github-actions · 2026-09-30T13:02:29Z

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

github-actions · 2026-09-30T13:06:52Z

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

Android 🤖	iOS 🍎
https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-android-Adhoc-86d1cf7-a5dc5a1-d9464f47cee126203259c998491f741b8573f51e/index.html	https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-ios-device-AdHoc-86d1cf7-a5dc5a1-c8c4fefbe4506b848fcf619907e010ef97a60352/index.html

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

👀 View the workflow run that generated this build 👀

OSBotify · 2026-10-01T00:02:16Z

🚀 Deployed to staging by https://github.com/Gonals in version: 9.5.0-0 🚀

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

MelvinBot · 2026-10-01T00:06:58Z

No help site update is needed: the new Work arrangement row and selector are only shown when the COMMUTER_EXCLUSIONS_ARRANGEMENTS beta is enabled, so most users can't see this feature yet.

kavimuru · 2026-10-01T00:33:19Z

@fedirjh can you help with "homeAndOffice workspace" ?

fedirjh · 2026-10-01T09:16:14Z

can you help with "homeAndOffice workspace" ?

@kavimuru workspace with commuter exclusion settings set as homeAndOffice :

kavimuru · 2026-10-01T12:19:19Z

@fedirjh We "Remote or mobile" instead of "No regular workspace", is this expected?

fedirjh · 2026-10-01T12:21:47Z

We "Remote or mobile" instead of "No regular workspace", is this expected?

@kavimuru Yes expected. Updated the steps.

melvin-bot · 2026-10-01T22:47:15Z

🤖 Payment issue created: #102816

OSBotify · 2026-10-01T22:47:52Z

🚀 Deployed to production by https://github.com/Julesssss in version: 9.5.0-5 🚀

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

Bundle Size Analysis (Sentry):

Android

fedirjh added 14 commits September 22, 2026 14:02

Add hasOfficeWorkArrangement to PolicyEmployee

415dc37

Add workspace default work arrangement type

448347f

Add accountID to policy changelog message

3235d4c

Add work arrangement changelog action type

52a724a

Register SetEmployeeWorkArrangement API command

7cb6cbe

Add setEmployeeWorkArrangement action

48fc2da

Render work arrangement changelog entries

cb2e099

Add work arrangement strings

a7239a8

Add WorkArrangementPage

57d7d46

Register WorkArrangementPage route

5a5af7d

Add work arrangement row to member details

739fc30

Stabilize members page refresh trigger

e0f47e4

Add setEmployeeWorkArrangement tests

bffb227

Generate work arrangement translations

8f07d4f

melvin-bot Bot assigned fedirjh Sep 22, 2026

fedirjh requested a review from Gonals September 22, 2026 15:54

Merge remote-tracking branch 'upstream' into fedy/set-employee-work-a…

172674d

…rrangement

fedirjh added 3 commits September 22, 2026 19:13

Take policy param in work arrangement action

a3f9e13

Pass policy to work arrangement action

e361f97

Update work arrangement tests for policy param

6ca5f8d

fedirjh added 3 commits September 22, 2026 20:55

Fix work arrangement typecheck errors

5085c65

Merge remote-tracking branch 'upstream' into fedy/set-employee-work-a…

1ee11f0

…rrangement

Gate work arrangement behind beta

ab732de

Add work arrangement coverage tests

4023946

fedirjh marked this pull request as ready for review September 24, 2026 08:33

fedirjh requested a review from a team as a code owner September 24, 2026 08:34

fedirjh added 2 commits September 29, 2026 15:04

docs(workspaces): explain work arrangement update fields

4eb074e

docs(workspaces): describe work arrangement options

c043a55

fedirjh requested a review from marufsharifi September 29, 2026 14:05

fedirjh mentioned this pull request Sep 30, 2026

[Payment due @marufsharifi] Add work arrangement to workspace member invites #102642

Merged

45 tasks done

marufsharifi approved these changes Sep 30, 2026

View reviewed changes

Comment thread src/pages/workspace/members/WorkArrangementPage.tsx Resolved

melvin-bot Bot changed the title ~~Set member work arrangement~~ [Payment due @marufsharifi] Set member work arrangement Sep 30, 2026

fedirjh added 2 commits September 30, 2026 13:19

Merge branch 'Expensify:main' into fedy/set-employee-work-arrangement

caa4e4c

Merge branch 'Expensify:main' into fedy/set-employee-work-arrangement

21a107a

Gonals approved these changes Sep 30, 2026

View reviewed changes

Gonals merged commit 86d1cf7 into Expensify:main Sep 30, 2026
35 of 37 checks passed

fedirjh deleted the fedy/set-employee-work-arrangement branch September 30, 2026 12:52

OSBotify mentioned this pull request Sep 30, 2026

Deploy Checklist: New Expensify 2026-09-30 #102701

Closed

70 tasks done

fedirjh mentioned this pull request Oct 1, 2026

Introduce flow to set work arrangement #100716

Merged

40 tasks done

melvin-bot Bot mentioned this pull request Oct 1, 2026

[Due for payment 2026-10-08] Payment issue for E/App PR#101876 #102816

Closed

Conversation

fedirjh commented Sep 22, 2026 • edited 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!

melvin-bot Bot commented Sep 22, 2026

Uh oh!

melvin-bot Bot commented Sep 22, 2026

Uh oh!

codecov Bot commented Sep 22, 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 Sep 24, 2026

Uh oh!

fedirjh commented Sep 29, 2026

Uh oh!

marufsharifi commented Sep 30, 2026

Uh oh!

marufsharifi left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

melvin-bot Bot commented Sep 30, 2026

Uh oh!

marufsharifi commented Sep 30, 2026

Uh oh!

Gonals commented Sep 30, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Reviewer Checklist

Screenshots/Videos

Uh oh!

Uh oh!

OSBotify commented Sep 30, 2026

Uh oh!

github-actions Bot commented Sep 30, 2026

Uh oh!

github-actions Bot commented Sep 30, 2026

Uh oh!

OSBotify commented Oct 1, 2026

Uh oh!

MelvinBot commented Oct 1, 2026

Uh oh!

kavimuru commented Oct 1, 2026

Uh oh!

fedirjh commented Oct 1, 2026

Uh oh!

kavimuru commented Oct 1, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

fedirjh commented Oct 1, 2026

Uh oh!

melvin-bot Bot commented Oct 1, 2026

Uh oh!

OSBotify commented Oct 1, 2026

Uh oh!

Reviewers

Uh oh!

Assignees

Labels

Projects

Milestone

Development

Uh oh!

7 participants

fedirjh commented Sep 22, 2026 •

edited

Loading

codecov Bot commented Sep 22, 2026 •

edited by github-actions Bot

Loading

Gonals commented Sep 30, 2026 •

edited

Loading

kavimuru commented Oct 1, 2026 •

edited

Loading