fix: enable report fields when impoing xero tracking categories by daledah · Pull Request #65332 · Expensify/App

daledah · 2025-07-02T11:34:58Z

Explanation of Change

Fixed Issues

$ #64288
PROPOSAL: #64288 (comment)

Tests

Precondition: WS connected to Xero with Tracking Categories

Go to WS -> Accounting
Go to Import > Tracking Categories > Map Xero Cost Centres to > Report Fields
Go to WS > Reports
Verify that: The Report fields is enabled and locked. There's report fields imported from Xero.

Verify that no errors appear in the JS console

Offline tests

QA Steps

Precondition: WS connected to Xero with Tracking Categories

Go to WS -> Accounting
Go to Import > Tracking Categories > Map Xero Cost Centres to > Report Fields
Go to WS > Reports
Verify that: The Report fields is enabled and locked. There's report fields imported from Xero.

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Android: Native

Screen.Recording.2025-07-03.at.00.11.15.mov

Android: mWeb Chrome

Screen.Recording.2025-07-03.at.00.11.42.mov

iOS: Native

Screen.Recording.2025-07-03.at.00.12.30.mov

iOS: mWeb Safari

Screen.Recording.2025-07-03.at.00.13.10.mov

MacOS: Chrome / Safari

Screen.Recording.2025-07-03.at.00.15.03.mov

MacOS: Desktop

Screen.Recording.2025-07-03.at.00.15.40.mov

melvin-bot · 2025-07-02T17:18:46Z

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

ahmedGaber93 · 2025-07-07T11:07:52Z

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
- MacOS: Desktop
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 there are no new alerts related to the canBeMissing param for useOnyx
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

a.mp4

Android: mWeb Chrome

aw.mp4

iOS: HybridApp

i.mp4

iOS: mWeb Safari

iw.mp4

MacOS: Chrome / Safari

w.mp4

w2.mp4

MacOS: Desktop

d.mp4

ahmedGaber93 · 2025-07-08T09:39:40Z

@daledah could you please check this?

when I set Tracking categories > "Map Xero Cost Centres to" only to "Report fields" option
- Reports > reports fields toggle is OFF, and no imported option is displayed.
when I set both of "Map Xero Cost Centres to" and "Map Xero Region to" to "Report fields" option
- Reports > reports fields toggle is ON, and imported option is displayed.

I think on both cases: toggle should be ON and imported option should be displayed.

20250708122634947.mp4

ahmedGaber93 · 2025-07-10T08:31:07Z

@daledah any updates?

daledah · 2025-07-10T08:32:26Z

@ahmedGaber93 I'm taking a look right now, will update soon 👀.

daledah · 2025-07-10T15:03:03Z

@ahmedGaber93 The issue you mentioned is pretty complicated if we continue with current solution, as such I suggest we swap to my alternative solution 1 with some modifications and also include a BE fix. This way we can reduce an unnecessary API call while make the app more responsive (also fixes the tag not enabled as well)

ahmedGaber93 · 2025-07-10T15:12:23Z

The issue you mentioned is pretty complicated if we continue with current solution

@daledah, can you explain it?

daledah · 2025-07-10T15:21:30Z

@ahmedGaber93

With current solution, we only check for current option, if it's report field, then we enable report field and vice versa. I didn't account for other fields available as I'm not aware of this case is even possible. For it to work well we'll need to check for all tracking category fields if there's any report fields, then perform toggling, which IMO is excessive and a bit overkill for a single API call.

For my alternative solution, we can remove enablePolicyReportFields call, move every logics needed inside updateXeroMappings while still have the same effect as the current solution.

ahmedGaber93 · 2025-07-10T17:05:27Z

With current solution, we only check for current option

I think the issue is the video is different from the issue you talk about.
In the video when select first item "Map Xero Cost Centres to" the current option is true and this should make toggle ON not OFF.

And related to the issue you talk about, I don't get how the new ONYX data will help, we already have trackingCategories list, and can check all of them instead of checking the current option only. WDYT?

App/src/pages/workspace/accounting/xero/XeroMapTrackingCategoryConfigurationPage.tsx

Lines 34 to 38 in 7ea0933

    
           const {trackingCategories} = policy?.connections?.xero?.data ?? {}; 
        
           const {mappings} = policy?.connections?.xero?.config ?? {}; 
        
           const currentTrackingCategory = trackingCategories?.find((category) => category.id === categoryId); 
        
           const currentTrackingCategoryValue = currentTrackingCategory ? (mappings?.[`${CONST.XERO_CONFIG.TRACKING_CATEGORY_PREFIX}${currentTrackingCategory.id}`] ?? '') : '';

ahmedGaber93 · 2025-07-14T14:19:18Z

@daledah Bump ^

daledah · 2025-07-14T14:36:25Z

I'll update soon 👀

daledah · 2025-07-14T15:10:39Z

@ahmedGaber93 I updated.

ahmedGaber93 · 2025-07-14T16:24:13Z

-        getRoute: (policyID: string) => `workspaces/${policyID}/accounting/xero/import/tracking-categories` as const,
+        getRoute: (policyID?: string) => {
+            if (!policyID) {
+                Log.warn('Invalid policyID is used to build the POLICY_ACCOUNTING_XERO_TRACKING_CATEGORIES route');
+            }
+            return `settings/workspaces/${policyID}/accounting/xero/import/tracking-categories` as const;
+        },


@daledah Could you please explain why this change? It looks to me, it was added by mistake.

This change is to handle undefined policyID, the implementation is pretty common in ROUTE.

Why do you add settings/ prefix to the route?

App/src/ROUTES.ts

Line 2125 in 73e2b18

getRoute: (policyID: string) => `workspaces/${policyID}/accounting/xero/import/tracking-categories` as const,

@daledah we only need this point to get this done, let me know WDYT when you have a chance? thanks!

I see it now, we recently refactored navigation logics so I missed this. I updated.

ahmedGaber93 · 2025-07-14T16:25:58Z

@daledah are you face the same issue here #65332 (comment)?

daledah · 2025-07-14T16:39:17Z

@ahmedGaber93 The latest update fixed the issue you mentioned.

ahmedGaber93 · 2025-07-15T08:06:12Z

+    const reportFieldTrackingCategories = Object.entries(mappings ?? {}).filter(
+        ([key, value]) => key.startsWith(CONST.XERO_CONFIG.TRACKING_CATEGORY_PREFIX) && value === CONST.XERO_CONFIG.TRACKING_CATEGORY_OPTIONS.REPORT_FIELD,


Suggested change

const reportFieldTrackingCategories = Object.entries(mappings ?? {}).filter(

([key, value]) => key.startsWith(CONST.XERO_CONFIG.TRACKING_CATEGORY_PREFIX) && value === CONST.XERO_CONFIG.TRACKING_CATEGORY_OPTIONS.REPORT_FIELD,

const reportFieldTrackingCategories = Object.entries(mappings ?? {}).filter(

([key, value]) => key.startsWith(CONST.XERO_CONFIG.TRACKING_CATEGORY_PREFIX) && value === CONST.XERO_CONFIG.TRACKING_CATEGORY_OPTIONS.REPORT_FIELD

This comma looks added by mistake

@ahmedGaber93 I removed the comma, run prettier and it's added again, so maybe it's conventional? Not sure about this.

Interesting, It also looks like that in many places.
CC @srikarparsi if you're familiar with this.

yeah it looks like it's for style, going to merge this

ahmedGaber93

LGTM! Just small minor change request we still need to addressed here

@daledah Sorry for discovering this late 🙏, let's finish it.

OSBotify · 2025-07-17T06:38:57Z

✋ 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 · 2025-07-18T05:13:22Z

🚀 Deployed to staging by https://github.com/srikarparsi in version: 9.1.83-0 🚀

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

github-actions · 2025-07-21T16:37:15Z

🚀 Deployed to production by https://github.com/cristipaval in version: 9.1.83-5 🚀

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

daledah added 2 commits July 2, 2025 18:29

fix: enable report fields when impoing xero tracking categories

b5e20ea

fix: lint

acc1821

daledah marked this pull request as ready for review July 2, 2025 17:18

daledah requested a review from a team as a code owner July 2, 2025 17:18

melvin-bot Bot requested review from ahmedGaber93 and removed request for a team July 2, 2025 17:18

daledah mentioned this pull request Jul 2, 2025

[Due for payment 2025-07-28] [$250] Xero - Report fields locked despite workspace upgrade #64288

Closed

1 of 8 tasks

Merge branch 'main' into fix/64288

27cdfa8

daledah added 2 commits July 14, 2025 21:40

Merge branch 'main' into fix/64288

100dfa7

fix: more precise logics to enable/disable report fields

496f478

ahmedGaber93 reviewed Jul 14, 2025

View reviewed changes

daledah added 2 commits July 15, 2025 09:47

Merge branch 'main' into fix/64288

bc76904

fix: incorrect route

d51bc6b

ahmedGaber93 reviewed Jul 15, 2025

View reviewed changes

ahmedGaber93 approved these changes Jul 15, 2025

View reviewed changes

melvin-bot Bot requested a review from srikarparsi July 15, 2025 15:39

srikarparsi approved these changes Jul 17, 2025

View reviewed changes

srikarparsi merged commit 538e440 into Expensify:main Jul 17, 2025

github-actions Bot mentioned this pull request Jul 18, 2025

Deploy Checklist: New Expensify 2025-07-18 #66687

Closed

72 tasks done

		const reportFieldTrackingCategories = Object.entries(mappings ?? {}).filter(
		([key, value]) => key.startsWith(CONST.XERO_CONFIG.TRACKING_CATEGORY_PREFIX) && value === CONST.XERO_CONFIG.TRACKING_CATEGORY_OPTIONS.REPORT_FIELD,

Conversation

daledah commented Jul 2, 2025 • 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 Jul 2, 2025

Uh oh!

ahmedGaber93 commented Jul 7, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Reviewer Checklist

Screenshots/Videos

Uh oh!

ahmedGaber93 commented Jul 8, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

ahmedGaber93 commented Jul 10, 2025

Uh oh!

daledah commented Jul 10, 2025

Uh oh!

daledah commented Jul 10, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

ahmedGaber93 commented Jul 10, 2025

Uh oh!

daledah commented Jul 10, 2025

Uh oh!

ahmedGaber93 commented Jul 10, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

ahmedGaber93 commented Jul 14, 2025

Uh oh!

daledah commented Jul 14, 2025

Uh oh!

daledah commented Jul 14, 2025

Uh oh!

ahmedGaber93 Jul 14, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

ahmedGaber93 Jul 14, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

ahmedGaber93 commented Jul 14, 2025

Uh oh!

daledah commented Jul 14, 2025

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

ahmedGaber93 left a comment

Choose a reason for hiding this comment

Uh oh!

OSBotify commented Jul 17, 2025

Uh oh!

github-actions Bot commented Jul 18, 2025

Uh oh!

github-actions Bot commented Jul 21, 2025

Uh oh!

Reviewers

Assignees

daledah commented Jul 2, 2025 •

edited

Loading

ahmedGaber93 commented Jul 7, 2025 •

edited

Loading

ahmedGaber93 commented Jul 8, 2025 •

edited

Loading

daledah commented Jul 10, 2025 •

edited

Loading

ahmedGaber93 commented Jul 10, 2025 •

edited

Loading

ahmedGaber93 Jul 14, 2025 •

edited

Loading

ahmedGaber93 Jul 14, 2025 •

edited

Loading