fix: Hide expired virtual Expensify cards from the Expensify Wallet by nkdengineer · Pull Request #84845 · Expensify/App

nkdengineer · 2026-03-11T07:38:31Z

Explanation of Change

fix: Hide expired virtual Expensify cards from the Expensify Wallet

Fixed Issues

$ #84752
PROPOSAL:

Tests

Precondition: Has an virtual Expensify Card which is expired

Go to Account > Wallet
Notice the Assigned cards section
Verify that the expired card is not displayed

Verify that no errors appear in the JS console

Offline tests

QA Steps

Same as test

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
  - 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

Screen.Recording.2026-03-11.at.14.34.05.mov

Android: mWeb Chrome

Screen.Recording.2026-03-11.at.14.20.36.mov

iOS: Native

Screen.Recording.2026-03-11.at.14.34.40.mov

iOS: mWeb Safari

Screen.Recording.2026-03-11.at.14.34.59.mov

MacOS: Chrome / Safari

Screen.Recording.2026-03-11.at.14.13.26.mov

codecov · 2026-03-11T07:46:58Z

Codecov Report

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

Files with missing lines	Coverage Δ
src/libs/CardUtils.ts	`84.34% <100.00%> (+0.16%)`	⬆️
src/pages/settings/Wallet/PaymentMethodList.tsx	`0.00% <0.00%> (ø)`
... and 15 files with indirect coverage changes

melvin-bot · 2026-03-11T08:07:02Z

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

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: ec7a6940df

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

src/pages/settings/Wallet/PaymentMethodList.tsx

joekaufmanexpensify

Good for product

dukenv0307 · 2026-03-12T03:36:00Z

src/libs/CardUtils.ts

+    if (!card.nameValuePairs?.validThru) {
+        return false;
+    }
+    const currentTime = DateUtils.getDBTime();


validThru is stored as YYYY-MM-DD format, while getDBTime() returns YYYY-MM-DD HH:mm:ss format (e.g., 2026-02-25 14:30:00). so a card with validThru: "2026-02-25" would be considered expired at any point on 2026-02-25 itself, even at midnight. For card expiration, typically a card should be valid through the entire day of its validThru date. The comparison should be date-to-date, not date-to-datetime. cc @lakchote

@dukenv0307 validThru is stored with YYYY-MM-DD HH:mm:ss format

@dukenv0307, @nkdengineer is correct

lakchote · 2026-03-12T12:02:42Z

@nkdengineer there are conflicts

nkdengineer · 2026-03-12T12:07:58Z

@lakchote I updated.

dukenv0307 · 2026-03-12T15:26:10Z

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

Screen.Recording.2026-03-12.at.22.30.26.mov

Android: mWeb Chrome

Screen.Recording.2026-03-12.at.22.19.39.mov

iOS: HybridApp

Screen.Recording.2026-03-12.at.22.33.09.mov

iOS: mWeb Safari

Screen.Recording.2026-03-12.at.22.03.25.mov

MacOS: Chrome / Safari

Screen.Recording.2026-03-12.at.22.00.00.mov

dukenv0307 · 2026-03-12T15:33:56Z

@nkdengineer can you please merge main?

nkdengineer · 2026-03-12T15:52:08Z

@dukenv0307 I updated.

dukenv0307 · 2026-03-12T15:57:36Z

the failed test isn't related to our change

lakchote

LGTM

github-actions · 2026-03-12T16:42:02Z

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

github-actions · 2026-03-12T16:45:59Z

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

Android 🤖	iOS 🍎
❌ FAILED ❌	❌ FAILED ❌
The QR code can't be generated, because the Android build failed	The QR code can't be generated, because the iOS build failed

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

👀 View the workflow run that generated this build 👀

OSBotify · 2026-03-12T16:46:51Z

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

m-natarajan · 2026-03-12T23:13:54Z

@lakchote @dukenv0307 @nkdengineer Can this one please be tested internally, How to set expiry for card, By Single use and setting expiry?

OSBotify · 2026-03-12T23:18:56Z

🚀 Deployed to staging by https://github.com/lakchote in version: 9.3.37-0 🚀

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

mitarachim · 2026-03-13T06:04:43Z

Deploy Blocker #85184 was identified to be related to this PR.

nkdengineer · 2026-03-13T06:22:32Z

My PR only change in the wallet page which is not related to the blocker.

m-natarajan · 2026-03-13T13:26:06Z

@lakchote @dukenv0307 @nkdengineer Can this one please be tested internally, This requires having an expired card to test.

nkdengineer · 2026-03-13T13:27:12Z

@lakchote I think we can ask the internal who reported this issue to test this one.

fix: Hide expired virtual Expensify cards from the Expensify Wallet

ec7a694

melvin-bot bot assigned nkdengineer Mar 11, 2026

nkdengineer marked this pull request as ready for review March 11, 2026 08:06

nkdengineer requested review from a team as code owners March 11, 2026 08:06

melvin-bot bot requested a review from dukenv0307 March 11, 2026 08:07

melvin-bot bot requested review from joekaufmanexpensify and removed request for a team March 11, 2026 08:07

chatgpt-codex-connector bot reviewed Mar 11, 2026

View reviewed changes

src/pages/settings/Wallet/PaymentMethodList.tsx Show resolved Hide resolved

update hasDisplayableAssignedCards

09fd29e

lakchote self-requested a review March 11, 2026 17:51

joekaufmanexpensify previously approved these changes Mar 11, 2026

View reviewed changes

dukenv0307 reviewed Mar 12, 2026

View reviewed changes

resolve conflict

75c3fd7

nkdengineer dismissed joekaufmanexpensify’s stale review via 75c3fd7 March 12, 2026 12:05

dukenv0307 approved these changes Mar 12, 2026

View reviewed changes

Merge branch 'main' into fix/84752

3251d94

lakchote approved these changes Mar 12, 2026

View reviewed changes

lakchote merged commit 6db09f2 into Expensify:main Mar 12, 2026
37 of 38 checks passed

OSBotify mentioned this pull request Mar 12, 2026

Deploy Checklist: New Expensify 2026-03-12 #85146

Open

85 tasks

Conversation

nkdengineer commented Mar 11, 2026

Explanation of Change

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

Uh oh!

codecov bot commented Mar 11, 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!

melvin-bot bot commented Mar 11, 2026

Uh oh!

chatgpt-codex-connector bot left a comment

Choose a reason for hiding this comment

💡 Codex Review

Uh oh!

Uh oh!

joekaufmanexpensify left a comment

Choose a reason for hiding this comment

Uh oh!

dukenv0307 Mar 12, 2026

Choose a reason for hiding this comment

Uh oh!

nkdengineer Mar 12, 2026

Choose a reason for hiding this comment

Uh oh!

lakchote Mar 12, 2026

Choose a reason for hiding this comment

Uh oh!

lakchote commented Mar 12, 2026

Uh oh!

nkdengineer commented Mar 12, 2026

Uh oh!

dukenv0307 commented Mar 12, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Reviewer Checklist

Screenshots/Videos

Uh oh!

dukenv0307 commented Mar 12, 2026

Uh oh!

nkdengineer commented Mar 12, 2026

Uh oh!

dukenv0307 commented Mar 12, 2026

Uh oh!

lakchote left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

github-actions bot commented Mar 12, 2026

Uh oh!

github-actions bot commented Mar 12, 2026

Uh oh!

OSBotify commented Mar 12, 2026

Uh oh!

m-natarajan commented Mar 12, 2026

Uh oh!

OSBotify commented Mar 12, 2026

Uh oh!

mitarachim commented Mar 13, 2026

Uh oh!

nkdengineer commented Mar 13, 2026

Uh oh!

m-natarajan commented Mar 13, 2026

Uh oh!

nkdengineer commented Mar 13, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

7 participants

codecov bot commented Mar 11, 2026 •

edited by github-actions bot

Loading

dukenv0307 commented Mar 12, 2026 •

edited

Loading