Skip to content

Fix/import categories correct count#81548

Merged
grgia merged 23 commits intoExpensify:mainfrom
ahmedelshaikh20:fix/import-categories-correct-count
Apr 1, 2026
Merged

Fix/import categories correct count#81548
grgia merged 23 commits intoExpensify:mainfrom
ahmedelshaikh20:fix/import-categories-correct-count

Conversation

@ahmedelshaikh20
Copy link
Copy Markdown
Contributor

@ahmedelshaikh20 ahmedelshaikh20 commented Feb 5, 2026

Explanation of Change

This change fixes an incorrect success message shown after importing a categories CSV.

Previously, the import flow displayed the total number of categories found in the CSV, even when most of those categories already existed in the workspace. This resulted in misleading messages such as “21 categories have been added” when only 2 new categories were actually created.

The update aligns the categories import behavior with the existing members import logic by:

  • Passing existing policy categories into importPolicyCategories
  • Comparing imported categories against existing ones to determine whether each category is new or updated
  • Tracking accurate added and updated counts
  • Updating translations and updateImportSpreadsheetData to use these counts instead of the CSV length

Fixed Issues

$ #79217
PROPOSAL: $#79217 (comment)

Tests

  1. Log in as a workspace admin on staging.
  2. Navigate to Workspace Settings → Categories.
  3. Export the categories CSV.
  4. Modify the CSV by:
    • Adding at least one new category
    • Modifying an existing category
  5. Re-import the CSV via More → Import spreadsheet.
  6. Verify the success message:
    • Shows the correct number of categories added
    • Shows the correct number of categories updated
  7. Import a CSV with no changes.
  8. Verify the message indicates that no categories were added or updated.
  • Verify that no errors appear in the JS console

Offline tests

same

QA Steps

same

  • 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 verified there are no new alerts related to the canBeMissing param for useOnyx
  • 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
      • If any non-english text was added/modified, I used JaimeGPT to get English > Spanish translation. I then posted it in #expensify-open-source and it was approved by an internal Expensify engineer. Link to Slack message:
    • 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
Testing_Android.webm
Android: mWeb Chrome
Testing_Android_Web.webm
iOS: Native
Simulator.Screen.Recording.-.iPhone.15.Pro.-.2026-02-05.at.13.58.30.mp4
iOS: mWeb Safari
Testing_IOS_WEB.mp4
MacOS: Chrome / Safari
Testing_Safari.mp4

@melvin-bot
Copy link
Copy Markdown

melvin-bot bot commented Feb 5, 2026

Hey, I noticed you changed src/languages/en.ts in a PR from a fork. For security reasons, translations are not generated automatically for PRs from forks.

If you want to automatically generate translations for other locales, an Expensify employee will have to:

  1. Look at the code and make sure there are no malicious changes.
  2. Run the Generate static translations GitHub workflow. If you have write access and the K2 extension, you can simply click: [this button]

Alternatively, if you are an external contributor, you can run the translation script locally with your own OpenAI API key. To learn more, try running:

npx ts-node ./scripts/generateTranslations.ts --help

Typically, you'd want to translate only what you changed by running npx ts-node ./scripts/generateTranslations.ts --compare-ref main

@melvin-bot melvin-bot bot requested review from a team and removed request for a team February 5, 2026 14:53
@melvin-bot
Copy link
Copy Markdown

melvin-bot bot commented Feb 5, 2026

@abzokhattab 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 requested review from grgia and removed request for a team February 5, 2026 14:54
@melvin-bot
Copy link
Copy Markdown

melvin-bot bot commented Feb 5, 2026

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

@ahmedelshaikh20 ahmedelshaikh20 force-pushed the fix/import-categories-correct-count branch from 8311061 to e71601d Compare February 5, 2026 15:08
Copy link
Copy Markdown

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

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: 831106118c

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

@abzokhattab
Copy link
Copy Markdown
Contributor

abzokhattab commented Feb 5, 2026

There’s an issue with the Prettier pipeline failing locally. Could you run npm run prettier and push again?

@abzokhattab
Copy link
Copy Markdown
Contributor

I think we should also add test cases at the PolicyCategoryTest.tsfile to ensure test coverage.

grgia
grgia previously approved these changes Feb 6, 2026
@grgia grgia self-requested a review February 6, 2026 16:58
@grgia
Copy link
Copy Markdown
Contributor

grgia commented Feb 6, 2026

Oops was trying to trigger workflow with a review comment

@abzokhattab
Copy link
Copy Markdown
Contributor

Please let me know when it's ready for review @ahmedelshaikh20

Copy link
Copy Markdown
Contributor

@grgia grgia left a comment

Choose a reason for hiding this comment

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

@ahmedelshaikh20 would you please update this PR/merge main?

@ahmedelshaikh20
Copy link
Copy Markdown
Contributor Author

@grgia I am working on it right now.

@codecov
Copy link
Copy Markdown

codecov bot commented Feb 13, 2026

Codecov Report

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

Files with missing lines Coverage Δ
...es/workspace/categories/ImportedCategoriesPage.tsx 0.00% <ø> (ø)
src/libs/actions/Policy/Category.ts 53.33% <76.19%> (+4.96%) ⬆️
... and 12 files with indirect coverage changes

@ahmedelshaikh20
Copy link
Copy Markdown
Contributor Author

@grgia Can you help generating the translations for other languages as per this comment. #81548 (comment)

@ahmedelshaikh20
Copy link
Copy Markdown
Contributor Author

@grgia the Pr is ready

@grgia
Copy link
Copy Markdown
Contributor

grgia commented Mar 12, 2026

@ahmedelshaikh20 would you fix conflicts? Thanks for your patience, I've been working on a customer fire.

@ahmedelshaikh20 ahmedelshaikh20 force-pushed the fix/import-categories-correct-count branch from 7ea558f to b7d583b Compare March 23, 2026 15:33
@github-actions
Copy link
Copy Markdown
Contributor

⚠️ This PR is possibly changing native code and/or updating libraries, it may cause problems with HybridApp. Please check if any patch updates are required in the HybridApp repo and run an AdHoc build to verify that HybridApp will not break. Ask Contributor Plus for help if you are not sure how to handle this. ⚠️

@ahmedelshaikh20 ahmedelshaikh20 force-pushed the fix/import-categories-correct-count branch from b7d583b to 7ea558f Compare March 23, 2026 15:36
@ahmedelshaikh20 ahmedelshaikh20 force-pushed the fix/import-categories-correct-count branch from 05a8e5f to d0b15ae Compare March 23, 2026 15:44
@stephanieelliott stephanieelliott removed their request for review March 23, 2026 20:29
@abzokhattab
Copy link
Copy Markdown
Contributor

@ahmedelshaikh20 Could you please merge to main one more time to retrigger the pipeline as the performance test is failing

@ahmedelshaikh20 ahmedelshaikh20 force-pushed the fix/import-categories-correct-count branch from cb51085 to 6f66b89 Compare April 1, 2026 05:44
@ahmedelshaikh20
Copy link
Copy Markdown
Contributor Author

Hello @grgia , the Pr is ready.

@grgia grgia merged commit a6800cc into Expensify:main Apr 1, 2026
33 checks passed
@github-actions
Copy link
Copy Markdown
Contributor

github-actions bot commented Apr 1, 2026

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

@OSBotify
Copy link
Copy Markdown
Contributor

OSBotify commented Apr 1, 2026

✋ 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
Copy link
Copy Markdown
Contributor

OSBotify commented Apr 2, 2026

🚀 Deployed to staging by https://github.com/grgia in version: 9.3.52-0 🚀

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

Bundle Size Analysis (Sentry):

@MelvinBot
Copy link
Copy Markdown
Contributor

I reviewed the PR changes against the help site articles and no documentation updates are needed.

The two relevant articles are:

  • docs/articles/new-expensify/workspaces/Create-expense-categories.md (lines 34–43)
  • docs/articles/expensify-classic/workspaces/Create-categories.md (lines 34–51)

Both describe the CSV import workflow steps but neither documents the specific success message text. This PR only changes the toast/confirmation message shown after import (from total count to accurate added/updated counts), which is not referenced in any help site article.

@OSBotify
Copy link
Copy Markdown
Contributor

OSBotify commented Apr 7, 2026

🚀 Deployed to production by https://github.com/roryabraham in version: 9.3.52-9 🚀

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.

6 participants