Skip to content

Fix truncated employee labels in spend analysis bar charts - #93463

Merged
roryabraham merged 4 commits into
mainfrom
cmartins-useSameLabels
Jun 18, 2026
Merged

roryabraham merged 4 commits into
mainfrom
cmartins-useSameLabels

Conversation

@luacmartins

@luacmartins luacmartins commented Jun 12, 2026 •

Copy link
Copy Markdown
Contributor

Explanation of Change

Horizontal spend-analysis bar charts truncate employee names in axis labels but use full names in bar data. categories.indexOf(point.x) failed on mismatch, so bars landed on an unlabeled row instead of the labeled one. Match truncated labels to full data names via exact match, then prefix match when the label ends with … or ....

Fixed Issues

$ #93442
PROPOSAL:

Tests

  1. Open report
  2. Add comment
  3. Note reportID and reportActionID
  4. Run code:
const html3 = `<victorychart horizontal="" domain="{y: [0, 258000]}" domainpadding="{x: 44, y: 16}" height="464" width="680" padding="{top: 92, bottom: 84, left: 150, right: 32}" style="{parent: {backgroundColor: '#F7F2EF', borderRadius: 16, width: '100%', maxWidth: 680}}" categories="{x: ['Employee E', 'Employee D', 'Employee C', 'Employee B (Mar…', 'Employee A']}"><victorylabel x="32" y="40" text="Top employees by spend" style="{fill: '#002E22', fontSize: 17, fontWeight: 700, fontFamily: 'Expensify Neue'}"></victorylabel><victorylabel x="32" y="62" text="As of: Jun 12, 2026 at 04:47 AM" style="{fill: '#73857E', fontSize: 11, fontWeight: 400, fontFamily: 'Expensify Neue'}"></victorylabel><victoryaxis tickvalues="[0, 1, 2, 3, 4]" tickformat="['Employee E', 'Employee D', 'Employee C', 'Employee B (Mar…', 'Employee A']" style="{axis: {stroke: 'transparent'}, ticks: {stroke: 'transparent'}, grid: {stroke: 'transparent'}, tickLabels: {fill: '#73857E', fontSize: 11, fontWeight: 500, fontFamily: 'Expensify Neue', padding: 24}}"></victoryaxis><victoryaxis dependentaxis="" tickvalues="[0, 64500, 129000, 193500, 258000]" tickformat="['$0', '$64,500', '$129,000', '$193,500', '$258,000']" style="{axis: {stroke: 'transparent'}, ticks: {stroke: 'transparent'}, grid: {stroke: '#E6E1DA', strokeWidth: 1}, tickLabels: {fill: '#73857E', fontSize: 11, fontWeight: 500, fontFamily: 'Expensify Neue', padding: 8}}"></victoryaxis><victorygroup horizontal="" offset="18"><victorybar barwidth="16" cornerradius="{top: 8, bottom: 0}" style="{data: {fill: '#13C96B'}}" data="[{x: 'Employee E', y: 8565}, {x: 'Employee D', y: 14501}, {x: 'Employee C', y: 20112}, {x: 'Employee B (Marketing/PR)', y: 28558}, {x: 'Employee A', y: 257938}]"></victorybar><victorybar barwidth="16" cornerradius="{top: 8, bottom: 0}" style="{data: {fill: '#1E90F2'}}" data="[{x: 'Employee E', y: 6188}, {x: 'Employee D', y: 26358}, {x: 'Employee C', y: 317}, {x: 'Employee B (Marketing/PR)', y: 5548}, {x: 'Employee A', y: 301088}]"></victorybar></victorygroup><victorylegend x="250" y="416" orientation="horizontal" gutter="42" symbolspacer="10" style="{labels: {fill: '#002E22', fontSize: 13, fontWeight: 500, fontFamily: 'Expensify Neue'}}" data="[{name: 'This month', symbol: {type: 'circle', fill: '#13C96B', size: 6}}, {name: 'Last month', symbol: {type: 'circle', fill: '#1E90F2', size: 6}}]"></victorylegend></victorychart>`;

Onyx.merge("reportActions_[report ID]", {
    "[report action ID]": { message: [{ html: html3, type: "COMMENT" }] },
});
  1. Verify the chart looks same as follow
Screenshot 2026-06-12 at 1 13 26 PM
  • Verify that no errors appear in the JS console

Offline tests

N/A

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 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 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)
  • 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
  • I verified that if a function's arguments changed that all usages have also been updated correctly
  • 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 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.
  • 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.
  • 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

@luacmartins luacmartins self-assigned this Jun 12, 2026
@github-actions

Copy link
Copy Markdown
Contributor

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

@codecov

codecov Bot commented Jun 12, 2026 •

Copy link
Copy Markdown

Codecov Report

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

Files with missing lines Coverage Δ
...ictoryChartRenderer/parsers/victorySeriesParser.ts 84.61% <0.00%> (ø)
...VictoryChartRenderer/utils/resolveCategoryIndex.ts 7.14% <7.14%> (ø)
... and 20 files with indirect coverage changes

@github-actions

This comment has been minimized.

@luacmartins luacmartins changed the title Use same label keys Fix truncated employee labels in spend analysis bar charts Jun 12, 2026
@luacmartins
luacmartins marked this pull request as ready for review June 12, 2026 19:35
@luacmartins
luacmartins requested review from a team as code owners June 12, 2026 19:35
@melvin-bot
melvin-bot Bot requested review from jayeshmangwani and joekaufmanexpensify and removed request for a team June 12, 2026 19:35
@melvin-bot

melvin-bot Bot commented Jun 12, 2026

Copy link
Copy Markdown

@jayeshmangwani 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 June 12, 2026 19:35

@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: a7cbd5ed56

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

@luacmartins

Copy link
Copy Markdown
Contributor Author

Bump for review @jayeshmangwani

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

Good for product 👍

@jayeshmangwani

Copy link
Copy Markdown
Contributor

@luacmartins , I followed the test steps, but I'm seeing a doughnut chart instead of the expected Horizontal Bar Chart. Is this the expected behavior, or am I missing something?
Screenshot 2026-06-16 at 11 45 42 AM

@luacmartins

Copy link
Copy Markdown
Contributor Author

Oh sorry, I must have pasted the wrong chart. I updated the OP, please check again.

@jayeshmangwani

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 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
Android: mWeb Chrome mweb-chrome
iOS: HybridApp
iOS: mWeb Safari mweb-safari
MacOS: Chrome / Safari web

@jayeshmangwani

Copy link
Copy Markdown
Contributor

Oh sorry, I must have pasted the wrong chart. I updated the OP, please check again.

Yes, thanks, that worked.

Although we can still see the square border radius on the second line, I think that's unrelated to these changes, since the same behavior is happening on the staging chat as well.
web

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

LGTM 🚀

@melvin-bot
melvin-bot Bot requested a review from neil-marcellini June 16, 2026 18:49
@melvin-bot

melvin-bot Bot commented Jun 16, 2026

Copy link
Copy Markdown

@neil-marcellini 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]

@luacmartins

Copy link
Copy Markdown
Contributor Author

@neil-marcellini bump for review

@luacmartins
luacmartins requested a review from roryabraham June 18, 2026 19:41

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

Also, @luacmartins maybe you want to add your fixture to server/victory-chart-renderer/tests/fixtures, generate a new golden png for it in server/victory-chart-renderer/tests/__golden__, and then add it to the render tests.

That's a convenient way to create automated test coverage for something like this that comes with an obvious visual (the golden PNG) to communicate intent.

Also, you probably want to merge main into this branch since we added PR checks for the server tests. I checked and they were passing after merging main, but still good to have them running in CI.

@luacmartins

Copy link
Copy Markdown
Contributor Author

Updated

@roryabraham
roryabraham merged commit 0548a0c into main Jun 18, 2026
37 of 39 checks passed
@roryabraham
roryabraham deleted the cmartins-useSameLabels branch June 18, 2026 22:35
@OSBotify

Copy link
Copy Markdown
Contributor

✋ 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

Copy link
Copy Markdown
Contributor

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

@OSBotify OSBotify mentioned this pull request Jun 19, 2026
48 tasks done
@OSBotify

Copy link
Copy Markdown
Contributor

🚀 Deployed to staging by https://github.com/roryabraham in version: 9.4.16-1 🚀

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

Bundle Size Analysis (Sentry):

@MelvinBot

Copy link
Copy Markdown
Contributor

🤖 I reviewed the changes in this PR against the help site files under App/docs/articles.

Conclusion: No help site changes are required.

This PR is a purely internal rendering correctness fix. It adds a resolveCategoryIndex helper so that when an employee name in a horizontal spend-analysis bar chart is truncated with an ellipsis (e.g. Employee B (Mar…), the bar data still maps to the correct axis row instead of an unlabeled one. The change is limited to:

  • Chart parsing/rendering logic (VictoryChartRenderer)
  • A new test fixture and golden image

There are no new or changed features, settings, tab names, button labels, or user-facing flows. The existing help articles that mention these charts (e.g. How Concierge Analyzes Spend and View the Top Categories report) describe them at a usage level only — they don't document internal label-matching behavior. This fix simply makes the charts render correctly as those articles already depict them, so no documentation updates are needed.

No draft docs PR was created.

@luacmartins, please confirm you agree no help site changes are needed. If you'd like documentation added or adjusted, let me know and I'll open a draft PR.

@OSBotify

Copy link
Copy Markdown
Contributor

🚀 Deployed to production by https://github.com/blimpich in version: 9.4.16-5 🚀

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

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.

7 participants