[Payment due @nkdengineer] Set user-level office arrangements by Gonals · Pull Request #104344 · Expensify/App

Gonals · 2026-10-19T11:18:06Z

Explanation of Change

Fixed Issues

$ https://github.com/Expensify/Expensify/issues/642622
$ https://github.com/Expensify/Expensify/issues/693979
$ https://github.com/Expensify/Expensify/issues/694433
PROPOSAL:

Tests

In an account with the commuterExclusionsArrangements on (let's say expensifail):

Create (if needed) a WS with you and another 2-3 users
Go to Workspace -> Overview and add a company address.
Below, add an office. Keep the company address as default:

Go to Workspace > Members and open member A.
Verify there is an "Office location" row showing the default:

Tap the row and select the other office. Confirm it swaps correctly:
\
Confirm the update is posted to the admins chat:

Go back to the members section and select members B and C, then open the "2 selected" dropdown. Verify "Change office location" is listed, and select it.
9 . Change their offices. Confirm it works and the messages are posted to the admins chat
Go to Workspace > Distance rates > Settings > Exclude commutes, select "Exclude usual commute" and save. Choose Office-based.
Back in Members, select B and C and open the dropdown. Verify "Change work arrangement" is listed, and select it.
Select "Remote or mobile" and press "Confirm".
Verify B's and C's member details show the new "Work arrangement", and #admins logs the change for each.
In Workspace > Overview > Office locations, delete the new office
15 Confirm the people in that office are now back to the primary

Verify that no errors appear in the JS console

Offline tests

None

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

codecov · 2026-10-19T11:23:34Z

Codecov Report

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

Files with missing lines	Coverage Δ
src/CONST/index.ts	`95.90% <ø> (ø)`
src/CONST/runtimeConfigured.ts	`100.00% <ø> (ø)`
src/ONYXKEYS.ts	`100.00% <ø> (ø)`
src/SCREENS.ts	`100.00% <ø> (ø)`
...WorkspaceMembersTable/WorkspaceMembersTableRow.tsx	`92.85% <100.00%> (+0.54%)`	⬆️
src/libs/API/types.ts	`100.00% <ø> (ø)`
src/libs/ExportOnyxState/masking.ts	`80.95% <ø> (ø)`
...gation/linkingConfig/RELATIONS/WORKSPACE_TO_RHP.ts	`100.00% <ø> (ø)`
src/libs/Navigation/linkingConfig/config.ts	`62.50% <ø> (ø)`
src/libs/OfficeLocationUtils.ts	`100.00% <100.00%> (ø)`
... and 22 more
... and 8 files with indirect coverage changes

melvin-bot · 2026-10-19T13:38:28Z

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

chatgpt-codex-connector · 2026-10-19T13:38:33Z

Codex Review Summary

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

Review	Status	Commit	Review trigger
📝 Code Review	✅ Completed 2026-10-19T13:45:05.949978Z	`b393cf0`	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.

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: b393cf0dfc

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

trjExpensify · 2026-10-19T14:07:59Z

@JmillsExpensify's project, re-assigned product review.

nkdengineer · 2026-10-21T15:41:21Z

Bug: The Confirm button is missing on the member work arrangement page.

Screen.Recording.2026-10-21.at.22.40.34.mov

nkdengineer · 2026-10-21T15:45:55Z

@Gonals Some new bugs while testing need to address.

Gonals · 2026-10-21T16:04:23Z

Bug: The Confirm button is missing on the member work arrangement page.

Screen.Recording.2026-10-21.at.22.40.34.mov

Not part of this PR and it matches the design, but I agree it is inconsistent

cc @JmillsExpensify

Gonals · 2026-10-21T16:10:56Z

Not sure if it's a bug or not.

Repo:

Set the default WS arrangement from distance rate setting to Office-based

Go to Member and change WS arrangement of member A to Remote or mobile

Change the default WS arrangement from distance rate setting to Remote or mobile and then Office-based again

The current result is: Member A's WS arrangement is also changed to Office-based

Screen.Recording.2026-10-21.at.22.27.11.mov

Good catch. Fixing it in Auth. No need to wait for it

Gonals · 2026-10-21T16:18:51Z

@Gonals Some new bugs while testing need to address.

Addressed. Waiting on the button thing, but it is not part of this PR, so let's not block on it

nkdengineer · 2026-10-21T16:52:47Z

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

Screen.Recording.2026-10-21.at.23.44.43.mov

Android: mWeb Chrome

Screen.Recording.2026-10-21.at.23.32.23.mov

iOS: HybridApp

Screen.Recording.2026-10-21.at.23.49.59.mov

iOS: mWeb Safari

Screen.Recording.2026-10-21.at.23.34.31.mov

MacOS: Chrome / Safari

Screen.Recording.2026-10-21.at.23.29.44.mov

nkdengineer

LGTM!

melvin-bot · 2026-10-21T16:56:21Z

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

melvin-bot · 2026-10-21T16:56:23Z

🎯 @nkdengineer, 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/642622.

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.

nkdengineer · 2026-10-21T16:56:50Z

@Gonals We can do this in a follow-up: the update location change log is not translated in LHN, copy to clipboard and thread header view. The same for remove office location and update work arrangement change log

Screen.Recording.2026-10-21.at.23.54.43.mov

JmillsExpensify · 2026-10-21T17:43:49Z

Bug: The Confirm button is missing on the member work arrangement page.
Screen.Recording.2026-10-21.at.22.40.34.mov

Not part of this PR and it matches the design, but I agree it is inconsistent

cc @JmillsExpensify

Yes, agreed. Good catch. Should I create a separate issue for it?

Gonals · 2026-10-21T18:08:28Z

Bug: The Confirm button is missing on the member work arrangement page.
Screen.Recording.2026-10-21.at.22.40.34.mov

Not part of this PR and it matches the design, but I agree it is inconsistent
cc @JmillsExpensify

Yes, agreed. Good catch. Should I create a separate issue for it?

Yes, please. Send it my way :)

OSBotify · 2026-10-22T11:33:38Z

✋ 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-10-22T11:34:16Z

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

github-actions · 2026-10-22T11:38:55Z

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

Android 🤖	iOS 🍎
https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-android-Adhoc-32253ff-ffba434-88d01f279a44a99479c199f23fb80ba9242a95bb/index.html	https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-ios-device-AdHoc-32253ff-ffba434-c0b27f139d6283d49531df03511fe8e27888980e/index.html

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

👀 View the workflow run that generated this build 👀

JmillsExpensify · 2026-10-22T11:53:06Z

Add set on the App issue: #104719. I added the same people.

Gonals added 7 commits October 8, 2026 15:08

Add handling of user-level offices

8cf0051

right beta

001087d

fix display

e660b23

merge branch

cfa2de2

simplify

5743054

cleaner movement

a40e8fc

fix tree

c0e6f90

Gonals self-assigned this Oct 19, 2026

This comment has been minimized.

Sign in to view

parrot

b393cf0

Gonals marked this pull request as ready for review October 19, 2026 13:38

Gonals requested review from a team as code owners October 19, 2026 13:38

melvin-bot Bot requested review from nkdengineer and removed request for a team October 19, 2026 13:38

melvin-bot Bot requested review from trjExpensify and removed request for a team October 19, 2026 13:38

github-actions Bot reviewed Oct 19, 2026

View reviewed changes

Comment thread src/libs/OfficeLocationUtils.ts Outdated

chatgpt-codex-connector Bot reviewed Oct 19, 2026

View reviewed changes

Comment thread src/pages/workspace/members/WorkspaceMembersChangeOfficeLocationPage.tsx Outdated

Comment thread src/pages/workspace/members/WorkspaceMembersChangeWorkArrangementPage.tsx Outdated

Comment thread src/libs/actions/Policy/Member.ts Outdated

Gonals added 3 commits October 19, 2026 15:53

clarify comment

3de87a1

only update members that change

0ca59f0

scope bulk selection to its workspace

c3db609

trjExpensify requested review from JmillsExpensify and removed request for trjExpensify October 19, 2026 14:07

Gonals added 2 commits October 19, 2026 16:13

remove unused type export

6d8e057

lint

648eb41

remove optimistic change logs

ade5ef2

Gonals requested a review from nkdengineer October 21, 2026 16:45

nkdengineer approved these changes Oct 21, 2026

View reviewed changes

melvin-bot Bot requested a review from mjasikowski October 21, 2026 16:56

melvin-bot Bot changed the title ~~Set user-level office arrangements~~ [Payment due @nkdengineer] Set user-level office arrangements Oct 21, 2026

translate office and work arrangement change logs outside the chat

2906b7e

nkdengineer approved these changes Oct 21, 2026

View reviewed changes

merge main

c6171c4

Gonals added 3 commits October 22, 2026 11:26

psalm

5b95a06

check office locations, not just company address

5cec1bc

properly check adress for default office

5305b7e

mjasikowski approved these changes Oct 22, 2026

View reviewed changes

mjasikowski merged commit 32253ff into main Oct 22, 2026
52 of 54 checks passed

mjasikowski deleted the alberto-commuteR4Users branch October 22, 2026 11:29

JmillsExpensify mentioned this pull request Oct 22, 2026

Add Confirm button to workspace arrangement #104719

Open

Conversation

Gonals commented Oct 19, 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!

This comment has been minimized.

codecov Bot commented Oct 19, 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 Oct 19, 2026

Uh oh!

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

Uh oh!

Codex Review Summary

Uh oh!

Uh oh!

chatgpt-codex-connector Bot left a comment

Choose a reason for hiding this comment

💡 Codex Review

Uh oh!

Uh oh!

Uh oh!

Uh oh!

trjExpensify commented Oct 19, 2026

Uh oh!

nkdengineer commented Oct 21, 2026

Uh oh!

nkdengineer commented Oct 21, 2026

Uh oh!

Gonals commented Oct 21, 2026

Uh oh!

Gonals commented Oct 21, 2026

Uh oh!

Gonals commented Oct 21, 2026

Uh oh!

nkdengineer commented Oct 21, 2026

Reviewer Checklist

Screenshots/Videos

Uh oh!

nkdengineer left a comment

Choose a reason for hiding this comment

Uh oh!

melvin-bot Bot commented Oct 21, 2026

Uh oh!

melvin-bot Bot commented Oct 21, 2026

Uh oh!

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

Uh oh!

Uh oh!

JmillsExpensify commented Oct 21, 2026

Uh oh!

Gonals commented Oct 21, 2026

Uh oh!

Uh oh!

OSBotify commented Oct 22, 2026

Uh oh!

github-actions Bot commented Oct 22, 2026

Uh oh!

github-actions Bot commented Oct 22, 2026

Uh oh!

JmillsExpensify commented Oct 22, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

8 participants

Gonals commented Oct 19, 2026 •

edited

Loading

codecov Bot commented Oct 19, 2026 •

edited by github-actions Bot

Loading

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

edited

Loading

nkdengineer commented Oct 21, 2026 •

edited

Loading