Skip to content

Allow creation and management of multiple offices - #103368

Merged
chuckdries merged 18 commits into
mainfrom
alberto-commuteR4
Oct 14, 2026
Merged

chuckdries merged 18 commits into
mainfrom
alberto-commuteR4

Conversation

@Gonals

@Gonals Gonals commented Oct 7, 2026 •

Copy link
Copy Markdown
Contributor

Explanation of Change

Fixed Issues

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

Tests

  1. In Newdot, create a new workspace.
  2. Add a company address:
Screenshot 2026-10-07 at 20 14 58
  1. Confirm it shows in the office locations section and is marked as the primary one
Screenshot 2026-10-07 at 20 25 08
  1. Confirm you can't edit it from Office locations.
  2. Confirm that, if you edit it from above, it gets updated in the office locations.
  3. Add a second office location
  4. Confirm it displays:
Screenshot 2026-10-07 at 20 25 29
  1. Confirm is is added to the policy in the DB/Onyx (in officeLocations):
Screenshot 2026-10-07 at 20 20 01
  1. Edit it. Confirm the changes are reflected.
  2. Set it as primary. Confirm it works:
Screenshot 2026-10-07 at 20 03 38
  1. With another office set as primary, you should be able to click on the Company address office to set it as primary:
Screenshot 2026-10-07 at 20 03 47
  1. Delete an office and confirm it works:
Screenshot 2026-10-07 at 20 03 56
  • Verify that no errors appear in the JS console

Offline tests

Same

QA Steps

Same as tests

  • 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 followed proper code patterns (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 followed the guidelines as stated in the Review Guidelines
  • 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 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 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.
  • 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

@Gonals Gonals self-assigned this Oct 7, 2026
@melvin-bot

melvin-bot Bot commented Oct 7, 2026

Copy link
Copy Markdown

Hey! I see that you made changes to our Form component. Make sure to update the docs in FORMS.md accordingly. Cheers!

@OSBotify

This comment has been minimized.

@codecov

codecov Bot commented Oct 7, 2026 •

Copy link
Copy Markdown

Codecov Report

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

Files with missing lines Coverage Δ
src/CONST/index.ts 95.90% <ø> (ø)
src/ONYXKEYS.ts 100.00% <ø> (ø)
src/SCREENS.ts 100.00% <ø> (ø)
src/components/CheckboxWithLabel.tsx 100.00% <100.00%> (ø)
src/libs/API/types.ts 100.00% <ø> (ø)
...gation/linkingConfig/RELATIONS/WORKSPACE_TO_RHP.ts 100.00% <ø> (ø)
src/libs/Navigation/linkingConfig/config.ts 62.50% <ø> (ø)
src/libs/PolicyUtils/index.ts 88.19% <100.00%> (+0.02%) ⬆️
src/libs/ReportAlternateTextUtils.ts 92.24% <100.00%> (+0.05%) ⬆️
src/libs/actions/Policy/DistanceRate.ts 62.04% <100.00%> (+7.85%) ⬆️
... and 12 more
... and 7 files with indirect coverage changes

@OSBotify

This comment has been minimized.

@Gonals
Gonals marked this pull request as ready for review October 9, 2026 13:55
@Gonals
Gonals requested review from a team as code owners October 9, 2026 13:55
@melvin-bot
melvin-bot Bot requested review from eVoloshchak and trjExpensify and removed request for a team October 9, 2026 13:55
@melvin-bot

melvin-bot Bot commented Oct 9, 2026

Copy link
Copy Markdown

@eVoloshchak 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
melvin-bot Bot removed the request for review from a team October 9, 2026 13:55
@chatgpt-codex-connector

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

Copy link
Copy Markdown

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-09T14:02:30.835787Z 3fbafa7 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.

Comment thread src/components/AddressForm.tsx Resolved

@chatgpt-codex-connector chatgpt-codex-connector Bot left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: 3fbafa7313

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

Comment thread src/libs/actions/Policy/DistanceRate.ts Resolved
@Gonals Gonals changed the title [HOLD] Allow creation and management of multiple offices Allow creation and management of multiple offices Oct 13, 2026
@OSBotify

This comment has been minimized.

@trjExpensify

Copy link
Copy Markdown
Contributor

Reassigning to @JmillsExpensify for product review as the project owner.

@trjExpensify
trjExpensify requested review from JmillsExpensify and removed request for trjExpensify October 13, 2026 22:18

@fedirjh fedirjh 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.

Looks good so far. Left small review.

Comment thread src/languages/en.ts Resolved
Comment thread src/languages/en.ts Resolved
Comment thread src/components/AddressForm.tsx Resolved
@OSBotify

This comment has been minimized.

@Gonals
Gonals requested a review from fedirjh October 14, 2026 10:55
@fedirjh

fedirjh commented Oct 14, 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

iOS: HybridApp Screenshot 2026-10-14 at 12 06 51 PM Screenshot 2026-10-14 at 12 07 01 PM Screenshot 2026-10-14 at 12 07 04 PM Screenshot 2026-10-14 at 12 07 09 PM Screenshot 2026-10-14 at 12 07 24 PM
MacOS: Chrome / Safari
CleanShot.2026-10-14.at.11.42.43.mp4
Screenshot 2026-10-14 at 11 41 34 AM Screenshot 2026-10-14 at 11 41 48 AM Screenshot 2026-10-14 at 11 41 58 AM Screenshot 2026-10-14 at 11 42 08 AM Screenshot 2026-10-14 at 11 42 26 AM Screenshot 2026-10-14 at 11 42 30 AM Screenshot 2026-10-14 at 11 43 21 AM

@Gonals
Gonals requested a review from chuckdries October 14, 2026 14:16
@chuckdries
chuckdries merged commit 419d840 into main Oct 14, 2026
44 of 46 checks passed
@chuckdries
chuckdries deleted the alberto-commuteR4 branch October 14, 2026 15:01
@github-actions

Copy link
Copy Markdown
Contributor

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

@OSBotify

Copy link
Copy Markdown
Contributor

🚀 Deployed to staging by https://github.com/chuckdries in version: 9.5.10-0 🚀

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

@MelvinBot

Copy link
Copy Markdown
Contributor

No help site update needed: the new Office locations section and its add and edit pages only show when the COMMUTER_EXCLUSIONS_ARRANGEMENTS beta is on, and the AddressForm changes are a refactor that doesn't change behavior.

Details
  • The section only shows when isBetaEnabled(CONST.BETAS.COMMUTER_EXCLUSIONS_ARRANGEMENTS) is true (WorkspaceOverviewPage.tsx).
  • WorkspaceOfficeLocationAddPage.tsx and WorkspaceOfficeLocationEditPage.tsx are blocked when that beta is off.
  • The new workspace change-log messages only appear after someone uses those beta-gated actions.
  • AddressForm.tsx and CheckboxWithLabel.tsx were only refactored. The existing address forms work the same way.

Once the beta is removed, we can document this feature in the workspace overview article.

@jponikarchuk

Copy link
Copy Markdown

Deploy Blocker #104130 was identified to be related to this PR.

@OSBotify

Copy link
Copy Markdown
Contributor

🚀 Deployed to staging by https://github.com/chuckdries in version: 9.5.12-0 🚀

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

@MelvinBot

Copy link
Copy Markdown
Contributor

No help site update needed: the Office locations section is still behind the COMMUTER_EXCLUSIONS_ARRANGEMENTS beta on main, so most users can't see it yet.

Details
  • WorkspaceOverviewPage.tsx on main still shows the section only when isBetaEnabled(CONST.BETAS.COMMUTER_EXCLUSIONS_ARRANGEMENTS) is true.
  • The related deploy blocker, Workspace - Not here page opens briefly after deleting office location, also lists that beta as a precondition and says the feature doesn't exist in production.
  • The AddressForm changes are a refactor. Existing address forms work the same way.

Once the beta is removed, we can document the feature.

@OSBotify

Copy link
Copy Markdown
Contributor

🚀 Deployed to production by https://github.com/cristipaval in version: 9.5.12-1 🚀

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

Bundle Size Analysis (Sentry):

@situchan

situchan commented Nov 2, 2026

Copy link
Copy Markdown
Contributor

This PR added the edit page's shouldBeBlocked check on pendingAction === DELETE together with an optimistic delete that runs before going back.
Later, this caused Workspace - Not here page opens briefly after deleting office location

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

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

8 participants