Skip to content

[Payment due @DylanDylann] Parse two-digit CSV years in the current century and reject years before 1900 - #103201

Merged
marcochavezf merged 4 commits into
mainfrom
nicolas-fixCSVTwoDigitYears
Oct 8, 2026
Merged

marcochavezf merged 4 commits into
mainfrom
nicolas-fixCSVTwoDigitYears

Conversation

@NicolasBonet

@NicolasBonet NicolasBonet commented Oct 6, 2026 •

Copy link
Copy Markdown
Contributor

Explanation of Change

CSV dates with two-digit years were being imported as years 1-99. date-fns' yyyy token accepts 1-4 digits, so a value like 9/22/26 matched MM/dd/yyyy as AD 26 and was normalized to 0026-09-22. CompanyCards.ts writes that value back into the CSV row before upload. Auth then rejects it as Malformed created date: '00260922120000' and silently skips the row, while the import still reports success. The user never gets the expense.

parseCSVDate now:

  • Rejects any parsed date with a year before 1900. This applies to the explicit formats, the Excel serial branch, and both native new Date() fallbacks (new Date('0026-09-22') also produces year 26).
  • Tries two-digit-year formats (MM/dd/yy, dd/MM/yy, MM-dd-yy, dd-MM-yy, MMM d, yy, d MMM yy) after the four-digit ones. The yyyy formats still match short years first, so these are reached only because those results are now rejected. date-fns' yy token maps the year into the century closest to today, so 26 becomes 2026.

A row whose date still can't be parsed now returns null, and CompanyCards.ts already skips such rows, so an implausible year no longer reaches the backend. The same parser is used by the expense CSV import (ImportTransactions.ts), which gets the same fix.

A backstop check in the scraper is in https://github.com/Expensify/Server-Scraper/pull/4443.

Fixed Issues

$ https://github.com/Expensify/Expensify/issues/689145
PROPOSAL: N/A

Tests

  1. Run npm test -- tests/unit/CSVDateUtils.test.ts tests/unit/ImportTransactions and verify all tests pass.
  2. Create a CSV with columns Card, Date, Merchant, Amount, Currency and a row such as Test Card,9/22/26,Coffee,4.50,USD.
  3. Open a Control workspace, go to Company cards, and add a new feed using the CSV upload option.
  4. Upload the CSV and map the columns.
  5. Finish the import and wait for the card to sync.
  6. Verify the expense appears on the card with the date Sep 22, 2026, not year 0026.
  7. Repeat with dates 22/09/26 and Sep 22, 26 and verify both import as Sep 22, 2026.
  8. Repeat with a four-digit date 09/22/2026 and verify it still imports as Sep 22, 2026.
  • Verify that no errors appear in the JS console

Offline tests

N/A. This only changes how dates are parsed from the CSV file before the upload request is made.

QA Steps

  1. Create a CSV with columns Card, Date, Merchant, Amount, Currency and a row such as Test Card,9/22/26,Coffee,4.50,USD.
  2. Open a Control workspace, go to Company cards, and add a new feed using the CSV upload option.
  3. Upload the CSV and map the columns.
  4. Finish the import and wait for the card to sync.
  5. Verify the expense appears on the card with the date Sep 22, 2026.
  6. Repeat with a four-digit date 09/22/2026 and verify it still imports as Sep 22, 2026.
  • 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.
  • 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).
  • 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

Imported a CSV through Settings > Wallet > Import transactions (same parseCSVDate as the company card CSV feed) with four rows dated 9/22/26, 22/09/26, Sep 22, 26 and 09/22/2026.

Before: the import reports 4 transactions, but only the four-digit-year row shows up. The three short-year rows are silently dropped.

Column mapping showing the four dates
Before: import reports 4 transactions imported
Before: only the four-digit-year expense appears

After: all 4 expenses are imported, and 9/22/26 is dated 2026-09-22.

After: import reports 4 transactions imported
After: all four expenses appear
After: 9/22/26 expense dated 2026-09-22

@NicolasBonet
NicolasBonet marked this pull request as ready for review October 6, 2026 23:31
@NicolasBonet
NicolasBonet requested review from a team as code owners October 6, 2026 23:31
@melvin-bot
melvin-bot Bot requested review from DylanDylann and removed request for a team October 6, 2026 23:31
@melvin-bot

melvin-bot Bot commented Oct 6, 2026

Copy link
Copy Markdown

@DylanDylann 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 dylanexpensify and removed request for a team October 6, 2026 23:31
@chatgpt-codex-connector

chatgpt-codex-connector Bot commented Oct 6, 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-06T23:46:17.894839Z b35655d 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.

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

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

Comment thread tests/unit/CSVDateUtils.test.ts

@dylanexpensify dylanexpensify 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 from a product perspective 👍

@DylanDylann

DylanDylann commented Oct 8, 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 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 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 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)
  • 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.
  • 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

Used file: pr103201-two-digit-years.csv

Screen.Recording.2026-10-08.at.16.39.16.mov
Android: HybridApp
Android: mWeb Chrome
iOS: HybridApp
iOS: mWeb Safari
MacOS: Chrome / Safari

@DylanDylann DylanDylann 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 marcochavezf October 8, 2026 09:41
@melvin-bot

melvin-bot Bot commented Oct 8, 2026

Copy link
Copy Markdown

@marcochavezf 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 changed the title Parse two-digit CSV years in the current century and reject years before 1900 [Payment due @DylanDylann] Parse two-digit CSV years in the current century and reject years before 1900 Oct 8, 2026
@melvin-bot

melvin-bot Bot commented Oct 8, 2026

Copy link
Copy Markdown

🎯 @DylanDylann, thanks for reviewing and testing this PR! 🎉

A payment issue will be created for your review once this PR is deployed to production.
E/E issue linked to the PR - https://www.github.com/Expensify/Expensify/issues/689145.

If payment is not needed (e.g., regression PR review fix etc), react with 👎 to this comment to prevent the payment issue from being created.

@marcochavezf
marcochavezf merged commit d417a97 into main Oct 8, 2026
45 of 47 checks passed
@marcochavezf
marcochavezf deleted the nicolas-fixCSVTwoDigitYears branch October 8, 2026 18:33
@github-actions

github-actions Bot commented Oct 8, 2026

Copy link
Copy Markdown
Contributor

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

@OSBotify

OSBotify commented Oct 8, 2026

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.

@OSBotify OSBotify mentioned this pull request Oct 8, 2026
90 tasks done
@OSBotify

OSBotify commented Oct 8, 2026

Copy link
Copy Markdown
Contributor

🚀 Deployed to staging by https://github.com/marcochavezf in version: 9.5.6-0 🚀

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

@MelvinBot

Copy link
Copy Markdown
Contributor

No help site update needed. This is a bug fix: CSV dates with two-digit years (for example, 9/22/26) now import as 2026, which is what users already expect, and no existing article says two-digit years are unsupported.


view run

@IuliiaHerets

Copy link
Copy Markdown

Hi @NicolasBonet. Imported card expenses are not shown on the Spend tab, seems that's expected according to this comment

bandicam.2026-10-09.10-46-13-951.mp4

Did we miss something? Or need to use some preconditions?

cc @dylanexpensify @marcochavezf @DylanDylann

@NicolasBonet

Copy link
Copy Markdown
Contributor Author

Thanks @IuliiaHerets! The expense not showing up is expected staging behaviour and isn't caused by this PR.

On staging, company card scrapes import nothing for accounts that aren't @expensify.com. That's the same thing this comment describes. Your CSV row did get through: the backend parsed the transaction and then threw it away because this was a staging scrape. So the date was parsed correctly, but this flow can't show an expense on staging with an Applause account.

To verify the fix, please try one of these:

  1. Settings > Wallet > Import transactions (easiest): import a CSV with one row each for 9/22/26, 22/09/26 and Sep 22, 26. This uses the same date parser and doesn't go through card scraping. All three should import dated Sep 22, 2026.
  2. Company cards CSV feed: repeat the original QA steps with an @expensify.com account, which isn't affected by the staging rule.

Also, please write the amount as 4.50 rather than 4,5 so the decimal comma doesn't affect the result.

If neither option is possible, we can check the company card flow on production after deploy.

@OSBotify

OSBotify commented Oct 9, 2026

Copy link
Copy Markdown
Contributor

🚀 Deployed to production by https://github.com/puneetlath in version: 9.5.6-6 🚀

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

Bundle Size Analysis (Sentry):

@melvin-bot

melvin-bot Bot commented Oct 9, 2026

Copy link
Copy Markdown

🤖 Payment issue created: #103660

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