Hide freeze card button for cards not in OPEN state by MelvinBot · Pull Request #91802 · Expensify/App

MelvinBot · 2026-05-27T08:15:12Z

Explanation of Change

The backend correctly rejects FreezeCard requests for cards not in the OPEN state (3), but the frontend was still showing the "Freeze card" button for non-OPEN cards (e.g. NOT_ACTIVATED). This adds a card state check so the freeze button only appears when card.state === CONST.EXPENSIFY_CARD.STATE.OPEN, preventing users from triggering a guaranteed backend error.

Two locations are fixed:

Workspace admin view (WorkspaceExpensifyCardDetailsPage.tsx): Replaced !isDeactivated with a stricter isCardOpen check
Cardholder view (ExpensifyCardPage/index.tsx): Added the OPEN state check (previously had no state guard at all)

Fixed Issues

$ #84691
PROPOSAL: #84691 (comment)

Tests

Same as QA

Offline tests

Same as QA

QA Steps

Instance 1: Workspace Admin View (WorkspaceExpensifyCardDetailsPage)

Preconditions: You are a workspace admin with Expensify Card enabled on your workspace.

Test A — Card NOT in OPEN state (e.g. not activated):

Assign a physical card to a member but do not activate it (card state = NOT_ACTIVATED).
Go to Workspace Settings > Expensify Card.
Click on the unactivated physical card.
Expected: The "Freeze card" option should not appear.

Test B — Card in OPEN state:

Use an activated physical card (card state = OPEN).
Go to Workspace Settings > Expensify Card.
Click on the activated card.
Expected: The "Freeze card" option should appear and freezing should work without error.

Test C — Already frozen card:

Freeze a card that is in the OPEN state.
Go back to the card details page.
Expected: The frozen card header / unfreeze option should still appear as before (no regression).

Instance 2: Cardholder View (ExpensifyCardPage)

Preconditions: You are a cardholder with an assigned Expensify Card.

Test A — Card NOT in OPEN state:

Have a physical card assigned to you that is not activated.
Go to Settings > Wallet > [Your Expensify Card].
Expected: The "Freeze card" option should not appear.

Test B — Card in OPEN state:

Have an activated physical card.
Go to Settings > Wallet > [Your Expensify Card].
Expected: The "Freeze card" option should appear and work correctly.

Test C — Already frozen card:

Freeze the card via the cardholder view.
Expected: The frozen card UI / unfreeze path still works as before.

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Android: Native

Android: mWeb Chrome

iOS: Native

iOS: mWeb Safari

MacOS: Chrome / Safari

The backend correctly rejects FreezeCard requests for cards not in the OPEN state, but the frontend was still showing the "Freeze card" button for non-OPEN cards (e.g. NOT_ACTIVATED). This adds a state check so the button only appears for OPEN cards. Co-authored-by: Sahil <thesahindia@users.noreply.github.com>

codecov · 2026-05-27T08:31:24Z

Codecov Report

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

Files with missing lines	Coverage Δ
.../pages/settings/Wallet/ExpensifyCardPage/index.tsx	`73.40% <100.00%> (ø)`
...xpensifyCard/WorkspaceExpensifyCardDetailsPage.tsx	`0.00% <0.00%> (ø)`
... and 9 files with indirect coverage changes

thesahindia · 2026-05-28T04:52:27Z

Instance 1: Workspace Admin View (WorkspaceExpensifyCardDetailsPage)
Preconditions: You are a workspace admin with Expensify Card enabled on your workspace.

Test A — Card NOT in OPEN state (e.g. not activated):

Assign a physical card to a member but do not activate it (card state = NOT_ACTIVATED).
Go to Workspace Settings > Expensify Card.
Click on the unactivated physical card.
Expected: The "Freeze card" option should not appear.

Test B — Card in OPEN state:

Use an activated physical card (card state = OPEN).
Go to Workspace Settings > Expensify Card.
Click on the activated card.
Expected: The "Freeze card" option should appear and freezing should work without error.

Test C — Already frozen card:

Freeze a card that is in the OPEN state.
Go back to the card details page.
Expected: The frozen card header / unfreeze option should still appear as before (no regression).
Instance 2: Cardholder View (ExpensifyCardPage)

Preconditions: You are a cardholder with an assigned Expensify Card.

Test A — Card NOT in OPEN state:

Have a physical card assigned to you that is not activated.
Go to Settings > Wallet > [Your Expensify Card].
Expected: The "Freeze card" option should not appear.

Test B — Card in OPEN state:

Have an activated physical card.
Go to Settings > Wallet > [Your Expensify Card].
Expected: The "Freeze card" option should appear and work correctly.

Test C — Already frozen card:

Freeze the card via the cardholder view.
Expected: The frozen card UI / unfreeze path still works as before.

@MelvinBot, add this to QA steps and add "same as qa" in Tests and offline Tests section

MelvinBot · 2026-05-28T04:55:09Z

Updated the PR description: added the QA steps and set Tests and Offline Tests to "Same as QA".

thesahindia · 2026-05-28T04:57:24Z

@MelvinBot, mark off all items of author checklist. I have verified them but I don't have access to edit.

MelvinBot · 2026-05-28T04:59:44Z

All PR Author Checklist items have been marked as checked, as requested by thesahindia.

thesahindia · 2026-05-28T05:01:19Z

@MelvinBot mark the PR as ready for review

MelvinBot · 2026-05-28T05:02:38Z

Marked this PR as ready for review.

melvin-bot · 2026-05-28T05:02:40Z

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

thesahindia · 2026-05-28T05:08:33Z

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

Android: mWeb Chrome

iOS: HybridApp

iOS: mWeb Safari

MacOS: Chrome / Safari

thesahindia

LGTM!

thesahindia · 2026-05-28T05:10:48Z

Test B — Card in OPEN state:

Use an activated physical card (card state = OPEN).

Go to Workspace Settings > Expensify Card.

Click on the activated card.

Expected: The "Freeze card" option should appear and freezing should work without error.

@MariaHCD, I don't think I can test this case. I think it will need an activated physical card. Is it possible for the QA to test?

trjExpensify

Makes sense. 👍

MariaHCD · 2026-05-29T12:22:06Z

@thesahindia - regarding the test case for a physical card in the OPEN state, I agree it would require having a physical card issued and activated. Since this PR doesn't actually touch the freeze logic, it should still work as expected. And QA should be able to test that case.

Could you also merge main here and resolve the merge conflict? Thanks!

thesahindia · 2026-05-29T15:12:18Z

@MelvinBot merge main

…orNonOpenCards Co-authored-by: Sahil <thesahindia@users.noreply.github.com> # Conflicts: # src/pages/settings/Wallet/ExpensifyCardPage/index.tsx

melvin-bot · 2026-05-29T15:22:00Z

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

MelvinBot · 2026-05-29T15:22:01Z

Merged main into this branch. Resolved a conflict in src/pages/settings/Wallet/ExpensifyCardPage/index.tsx by combining both changes:

This PR's currentCard?.state === CONST.EXPENSIFY_CARD.STATE.OPEN guard on the freeze button.
main's style={styles.mb0} prop on CardDetailsActionButtons.

Please re-test to confirm the resolution looks correct.

MariaHCD · 2026-06-02T10:20:50Z

@MelvinBot merge main here

MelvinBot · 2026-06-02T10:23:00Z

🤖 I wasn't able to merge main into this branch.

I can only make code changes (including merging main, which pushes a commit to the branch) when directed by the PR author, an assignee, or an existing co-author. The assignee/co-author here is thesahindia, and you're not currently listed on the PR.

To have me do this, either thesahindia should reply with the request tagging me, or add yourself as an assignee on this PR and retry.

MariaHCD · 2026-06-02T10:31:30Z

@MelvinBot merge main

MelvinBot · 2026-06-02T11:01:54Z

⏱️ Ran out of time before I could finish. This usually means the task was too complex or I got stuck exploring. Please try again with a more specific request or post in #melvinbot-ai.

Run details

…orNonOpenCards

github-actions · 2026-06-02T11:52:01Z

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

github-actions · 2026-06-02T11:57:07Z

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

Android 🤖	iOS 🍎
https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-android-Adhoc-437fc7cfd7e-7fcb96b-afcd85a4b060e3ac61cdca31c4ff2b7e506c3a03/index.html	https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-ios-device-AdHoc-437fc7c-7fcb96b-a3b70678a6ed914899c4718f44ed28f795276830/index.html

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

👀 View the workflow run that generated this build 👀

OSBotify · 2026-06-02T11:58: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.

OSBotify · 2026-06-03T00:18:35Z

🚀 Deployed to staging by https://github.com/MariaHCD in version: 9.3.97-0 🚀

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

Bundle Size Analysis (Sentry):

Android
iOS

MelvinBot · 2026-06-03T00:21:15Z

🤖 No help site changes required.

This PR is a defensive UI fix: it hides the Freeze card button when a card is not in the OPEN state (e.g. NOT_ACTIVATED), so users can no longer trigger a freeze request that the backend was already guaranteed to reject. It changes when the button appears, not how freezing works.

The two help articles that document freezing remain accurate for the actual user-facing flow:

Cardholder-Settings-and-Features.md#L99-L119 — describes freezing/unfreezing an active card.
Set-Up-and-Manage-the-Expensify-Card.md#L131-L152 — admin freeze/unfreeze steps.

Why no update is needed

The documented happy path — freezing an activated (OPEN) card to pause spending — is unchanged. The button still appears and works exactly as described.
The only cards that lose the button are those not yet in the OPEN state. An unactivated card has no active spending to pause, so "freeze to pause spending" is moot for it — and the docs never instructed users to freeze an unactivated card.
Neither article documents card-state edge cases for the freeze action, so there is no inaccurate statement to correct. Adding an edge-case note about "you can't freeze a card that isn't activated" would add noise without helping a real user task.

Since no docs changes are needed, I did not open a help site PR.

@MariaHCD, please confirm you agree that no help site updates are required for this change. If you'd like a docs note added anyway (e.g. clarifying that freeze is only available for activated cards), let me know with @MelvinBot and I'll draft one.

kavimuru · 2026-06-03T00:26:54Z

@thesahindia @trjExpensify @lakchote This PR requires a physical card, Applause can't test this one, Could this be verified internally?

thesahindia · 2026-06-03T06:51:13Z

@kavimuru, QA can test the steps mentioned below. This doesn't require physical card, card won't be activated by default.

Instance 1: Workspace Admin View (WorkspaceExpensifyCardDetailsPage)

Preconditions: You are a workspace admin with Expensify Card enabled on your workspace

Test A — Card NOT in OPEN state (e.g. not activated):

Assign a physical card to a member but do not activate it (card state = NOT_ACTIVATED).

Go to Workspace Settings > Expensify Card.

Click on the unactivated physical card.

Expected: The "Freeze card" option should not appear.

Instance 2: Cardholder View (ExpensifyCardPage)

Preconditions: You are a cardholder with an assigned Expensify Card.

Test A — Card NOT in OPEN state:

Have a physical card assigned to you that is not activated.

Go to Settings > Wallet > [Your Expensify Card].

Expected: The "Freeze card" option should not appear.

OSBotify · 2026-06-03T12:31:27Z

🚀 Deployed to production by https://github.com/lakchote in version: 9.3.97-1 🚀

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

MelvinBot assigned thesahindia May 27, 2026

MelvinBot requested a review from a team May 27, 2026 08:15

MelvinBot mentioned this pull request May 27, 2026

[Due for payment 2026-06-10] [$250] Expensify Card - Error shows up when freezing physical card #84691

Closed

7 tasks

MelvinBot marked this pull request as ready for review May 28, 2026 05:02

MelvinBot requested a review from a team as a code owner May 28, 2026 05:02

melvin-bot Bot requested review from thesahindia and trjExpensify and removed request for a team May 28, 2026 05:02

melvin-bot Bot removed the request for review from a team May 28, 2026 05:02

thesahindia approved these changes May 28, 2026

View reviewed changes

melvin-bot Bot requested a review from MariaHCD May 28, 2026 05:08

trjExpensify previously approved these changes May 28, 2026

View reviewed changes

Merge remote-tracking branch 'origin/main' into claude-hideFreezeBtnF…

170cb17

…orNonOpenCards Co-authored-by: Sahil <thesahindia@users.noreply.github.com> # Conflicts: # src/pages/settings/Wallet/ExpensifyCardPage/index.tsx

MelvinBot dismissed trjExpensify’s stale review via 170cb17 May 29, 2026 15:21

MelvinBot requested a review from a team as a code owner May 29, 2026 15:21

melvin-bot Bot requested review from thesahindia and removed request for a team May 29, 2026 15:21

MariaHCD approved these changes Jun 2, 2026

View reviewed changes

MariaHCD self-assigned this Jun 2, 2026

Merge remote-tracking branch 'origin/main' into claude-hideFreezeBtnF…

ba0241e

…orNonOpenCards

MariaHCD merged commit 437fc7c into main Jun 2, 2026
35 checks passed

MariaHCD deleted the claude-hideFreezeBtnForNonOpenCards branch June 2, 2026 11:50

OSBotify mentioned this pull request Jun 2, 2026

Deploy Checklist: New Expensify 2026-06-02 #92450

Closed

39 tasks

Conversation

MelvinBot commented May 27, 2026 • 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!

codecov Bot commented May 27, 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!

thesahindia commented May 28, 2026

Uh oh!

MelvinBot commented May 28, 2026

Uh oh!

thesahindia commented May 28, 2026

Uh oh!

MelvinBot commented May 28, 2026

Uh oh!

thesahindia commented May 28, 2026

Uh oh!

MelvinBot commented May 28, 2026

Uh oh!

melvin-bot Bot commented May 28, 2026

Uh oh!

thesahindia commented May 28, 2026

Reviewer Checklist

Screenshots/Videos

Uh oh!

thesahindia left a comment

Choose a reason for hiding this comment

Uh oh!

thesahindia commented May 28, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

trjExpensify left a comment

Choose a reason for hiding this comment

Uh oh!

MariaHCD commented May 29, 2026

Uh oh!

thesahindia commented May 29, 2026

Uh oh!

melvin-bot Bot commented May 29, 2026

Uh oh!

MelvinBot commented May 29, 2026

Uh oh!

MariaHCD commented Jun 2, 2026

Uh oh!

MelvinBot commented Jun 2, 2026

Uh oh!

MariaHCD commented Jun 2, 2026

Uh oh!

MelvinBot commented Jun 2, 2026

Uh oh!

Uh oh!

github-actions Bot commented Jun 2, 2026

Uh oh!

github-actions Bot commented Jun 2, 2026

Uh oh!

OSBotify commented Jun 2, 2026

Uh oh!

OSBotify commented Jun 3, 2026

Uh oh!

MelvinBot commented Jun 3, 2026

Uh oh!

kavimuru commented Jun 3, 2026

Uh oh!

thesahindia commented Jun 3, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

OSBotify commented Jun 3, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

MelvinBot commented May 27, 2026 •

edited

Loading

codecov Bot commented May 27, 2026 •

edited by github-actions Bot

Loading

thesahindia commented May 28, 2026 •

edited

Loading

thesahindia commented Jun 3, 2026 •

edited

Loading