83842 migrate workspace xero v2 by huult · Pull Request #87342 · Expensify/App

huult · 2026-04-08T08:30:37Z

Explanation of Change

Fixed Issues

$ #83842
PROPOSAL:

Tests

Same QA step

Verify that no errors appear in the JS console

Offline tests

QA Steps

WORKSPACE_ACCOUNTING_XERO_AUTO_SYNC

Precondition:

A workspace is connected to a Xero accounting account.

Open the Expensify app.
Navigate to the workspace connected to Xero.
Go to Accounting → Advanced.
Open Auto-sync.
Verify that the Auto-sync screen opens correctly.
Navigate back and verify that the Advanced screen is displayed correctly.
Disable Auto-sync.
Navigate back and open Card reconciliation.
Click the "Auto-sync" link.
Verify that the Auto-sync screen opens correctly.
Navigate back and verify that the Card reconciliation screen is displayed correctly.

WORKSPACE_ACCOUNTING_CARD_RECONCILIATION_ACCOUNT

Precondition:

A workspace is connected to a Xero accounting account.

Open the Expensify app.
Navigate to the workspace connected to Xero.
Go to Accounting → Card reconciliation → Reconciliation account.
Click the "Expensify Card settlement account" link.
Verify that the Reconciliation account screen opens correctly.
Navigate back and verify that the previous screen is displayed correctly.

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Android: Native

Android: mWeb Chrome

iOS: Native

Screen.Recording.2026-04-08.at.13.49.44.mov

iOS: mWeb Safari

MacOS: Chrome / Safari

Screen.Recording.2026-04-08.at.15.29.16.mov

melvin-bot · 2026-04-08T08:30:48Z

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

codecov · 2026-04-08T08:39:08Z

Codecov Report

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

Files with missing lines	Coverage Δ
src/ROUTES.ts	`16.10% <ø> (+0.11%)`	⬆️
src/SCREENS.ts	`100.00% <ø> (ø)`
...gation/linkingConfig/RELATIONS/WORKSPACE_TO_RHP.ts	`100.00% <ø> (ø)`
src/libs/Navigation/linkingConfig/config.ts	`76.92% <ø> (ø)`
...counting/xero/advanced/DynamicXeroAutoSyncPage.tsx	`0.00% <ø> (ø)`
...pace/accounting/xero/advanced/XeroAdvancedPage.tsx	`0.00% <ø> (ø)`
...e/expensifyCard/WorkspaceSettlementAccountPage.tsx	`0.00% <ø> (ø)`
...counting/reconciliation/CardReconciliationPage.tsx	`0.00% <0.00%> (ø)`
...ation/DynamicReconciliationAccountSettingsPage.tsx	`0.00% <0.00%> (ø)`
...gation/AppNavigator/ModalStackNavigators/index.tsx	`6.93% <0.00%> (ø)`
... and 15 files with indirect coverage changes

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: 7dddf46557

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

If Codex has suggestions, it will comment; otherwise it will react with 👍.

Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".

chatgpt-codex-connector · 2026-04-08T08:41:29Z

                return `${environmentURL}/${ROUTES.WORKSPACE_ACCOUNTING_QUICKBOOKS_ONLINE_AUTO_SYNC.getRoute(policyID, backTo)}`;
            case CONST.POLICY.CONNECTIONS.ROUTE.XERO:
-                return `${environmentURL}/${ROUTES.POLICY_ACCOUNTING_XERO_AUTO_SYNC.getRoute(policyID, backTo)}`;
+                return `${environmentURL}/${ROUTES.WORKSPACE_ACCOUNTING_CARD_RECONCILIATION.getRoute(policyID)}/${DYNAMIC_ROUTES.POLICY_ACCOUNTING_XERO_AUTO_SYNC.path}`;


Pass Xero connection when building auto-sync deep link

The Xero branch now builds the auto-sync URL from WORKSPACE_ACCOUNTING_CARD_RECONCILIATION.getRoute(policyID) without a connection, so the generated link contains accounting/undefined/card-reconciliation/autosync. This makes the “Auto-sync” link from Card Reconciliation invalid for Xero workspaces and can send users to a not-found/incorrect route.

Useful? React with 👍 / 👎.

chatgpt-codex-connector · 2026-04-08T08:41:29Z

                                'workspace.expensifyCard.settlementAccountInfo',
-                                `${environmentURL}/${ROUTES.WORKSPACE_ACCOUNTING_RECONCILIATION_ACCOUNT_SETTINGS.getRoute(policyID, connectionParam, Navigation.getActiveRoute())}`,
+                                `${environmentURL}/${ROUTES.WORKSPACE_ACCOUNTING_CARD_RECONCILIATION.getRoute(policyID, connectionParam)}/${DYNAMIC_ROUTES.WORKSPACE_ACCOUNTING_RECONCILIATION_ACCOUNT_SETTINGS.path}`,
                                `${CONST.MASKED_PAN_PREFIX}${getLastFourDigits(paymentBankAccountNumber)}`,


Preserve caller back path in settlement info link

This link no longer carries the current route as backTo, and the migrated settings page now derives back navigation by stripping the dynamic suffix, so opening Reconciliation Account from Settlement Account always backs to Card Reconciliation instead of returning to Settlement Account. Users who follow this cross-link lose their original context and cannot navigate back to where they started with a single back action.

Useful? React with 👍 / 👎.

…pace-xero-v2

mananjadhav · 2026-04-08T19:09:48Z

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 any callback methods that were added or modified are named for what the method does and never what callback they handle (i.e. toggleReport and not onIconClick).
- 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 shown in the product is localized by adding it to src/languages/* files and using the translation method
- I verified all numbers, amounts, dates and phone numbers shown in the product are using the localization methods
- 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)
- I verified proper file naming conventions were followed for any new files or renamed files. All non-platform specific files are named after what they export and are not named "index.js". All platform-specific files are named for the platform the code supports as outlined in the README.
- I verified the JSDocs style guidelines (in STYLE.md) were followed
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)
I verified all code is DRY (the PR doesn't include any logic written more than once, with the exception of tests)
I verified any variables that can be defined as constants (ie. in CONST.ts or at the top of the file that uses the constant) are defined as such
If a new component is created I verified that:
- A similar component doesn't exist in the codebase
- All props are defined accurately and each prop has a /** comment above it */
- The file is named correctly
- 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
- For Class Components, any internal methods passed to components event handlers are bound to this properly so there are no scoping issues (i.e. for onClick={this.submit} the method this.submit should be bound to this in the constructor)
- Any internal methods bound to this are necessary to be bound (i.e. avoid this.submit = this.submit.bind(this); if this.submit is never passed to a component event handler like onClick)
- All JSX used for rendering exists in the render method
- 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 any new file was added I verified that:
- The file has a description of what it does and/or why is needed at the top of the file if the code is not self explanatory
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 a new page is added, I verified it's using the ScrollView component to make it scrollable when more elements are added to the page.
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-bt-xero-adv.mov

Android: mWeb Chrome

mweb-chrome-bt-xero-adv.mov

iOS: HybridApp

ios-bt-xero-adv.mov

iOS: mWeb Safari

mweb-safari-bt-xero-adv.mov

MacOS: Chrome / Safari

web-bt-xero-auto-sync.mov

mananjadhav

Took a bit longer than expected as I needed the card feeds. LGTM.

huult · 2026-04-09T09:51:47Z

@mjasikowski all yours

github-actions · 2026-04-09T10:02:05Z

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

github-actions · 2026-04-09T10:07:03Z

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

Android 🤖	iOS 🍎
https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-android-Adhoc-2f8e65f-b0990c7-6d19a789025720ce9b279fd461cca7e90674add1/index.html	https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-ios-device-AdHoc-2f8e65f-b0990c7-7769e75afc832ceb494d147f4334bb187b08273c/index.html

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

👀 View the workflow run that generated this build 👀

OSBotify · 2026-04-09T10:10:07Z

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

OSBotify · 2026-04-10T08:26:16Z

🚀 Deployed to staging by https://github.com/mjasikowski in version: 9.3.58-0 🚀

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

Bundle Size Analysis (Sentry):

Android
iOS

MelvinBot · 2026-04-10T08:28:41Z

No help site changes are required.

This PR is a purely internal navigation refactor — it migrates two Xero-related routes (XERO_AUTO_SYNC and RECONCILIATION_ACCOUNT_SETTINGS) to the dynamic routing pattern. No user-facing feature names, UI labels, or functionality were changed.

The existing help article at Configure-Xero.md accurately describes auto-sync and advanced settings — no updates needed.

OSBotify · 2026-04-13T20:21:12Z

🚀 Deployed to production by https://github.com/AndrewGable in version: 9.3.58-9 🚀

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

OSBotify · 2026-04-13T20:57:03Z

🚀 Deployed to production by https://github.com/AndrewGable in version: 9.3.58-9 🚀

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

huult added 2 commits April 8, 2026 14:45

migrate POLICY_ACCOUNTING_XERO_AUTO_SYNC

a6d818e

migrate WORKSPACE_ACCOUNTING_RECONCILIATION_ACCOUNT_SETTINGS

7dddf46

huult requested review from a team as code owners April 8, 2026 08:30

melvin-bot Bot assigned huult Apr 8, 2026

melvin-bot Bot requested a review from mananjadhav April 8, 2026 08:30

melvin-bot Bot requested review from flaviadefaria and removed request for a team April 8, 2026 08:30

mjasikowski removed the request for review from flaviadefaria April 8, 2026 08:40

chatgpt-codex-connector Bot reviewed Apr 8, 2026

View reviewed changes

huult added 2 commits April 8, 2026 15:51

fix: add missing connectionParam to auto-sync route

2411c22

Merge remote-tracking branch 'upstream/main' into 83842-migrate-works…

b02ce8e

…pace-xero-v2

mananjadhav approved these changes Apr 8, 2026

View reviewed changes

melvin-bot Bot requested a review from mjasikowski April 8, 2026 19:15

mjasikowski approved these changes Apr 9, 2026

View reviewed changes

mjasikowski merged commit 2f8e65f into Expensify:main Apr 9, 2026
30 checks passed

OSBotify mentioned this pull request Apr 10, 2026

Deploy Checklist: New Expensify 2026-04-10 #87562

Closed

87 tasks

huult mentioned this pull request Apr 13, 2026

[BT-114] Migrate Workspace - Xero #83842

Closed

5 tasks

MelvinBot mentioned this pull request Apr 14, 2026

Steph's chat with Melvin #87829

Closed

WojtekBoman mentioned this pull request Apr 29, 2026

Expensify Card - RHP back button on Reconciliation account page is unresponsive #89122

Closed

7 tasks

Conversation

huult commented Apr 8, 2026

Explanation of Change

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

Uh oh!

melvin-bot Bot commented Apr 8, 2026

Uh oh!

codecov Bot commented Apr 8, 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!

chatgpt-codex-connector Bot left a comment

Choose a reason for hiding this comment

💡 Codex Review

Uh oh!

chatgpt-codex-connector Bot Apr 8, 2026

Choose a reason for hiding this comment

Uh oh!

huult Apr 8, 2026

Choose a reason for hiding this comment

Uh oh!

chatgpt-codex-connector Bot Apr 8, 2026

Choose a reason for hiding this comment

Uh oh!

mananjadhav commented Apr 8, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Reviewer Checklist

Screenshots/Videos

Uh oh!

mananjadhav left a comment

Choose a reason for hiding this comment

Uh oh!

huult commented Apr 9, 2026

Uh oh!

Uh oh!

github-actions Bot commented Apr 9, 2026

Uh oh!

github-actions Bot commented Apr 9, 2026

Uh oh!

OSBotify commented Apr 9, 2026

Uh oh!

OSBotify commented Apr 10, 2026

Uh oh!

MelvinBot commented Apr 10, 2026

Uh oh!

OSBotify commented Apr 13, 2026

Uh oh!

OSBotify commented Apr 13, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

codecov Bot commented Apr 8, 2026 •

edited by github-actions Bot

Loading

mananjadhav commented Apr 8, 2026 •

edited

Loading