Skip to content

Hide freeze card button for cards not in OPEN state #91802

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
MelvinBot wants to merge 1 commit into
base: main
Choose a base branch
from
+3 −2
Draft

Hide freeze card button for cards not in OPEN state #91802

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/pages/settings/Wallet/ExpensifyCardPage/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -347,7 +347,7 @@ function ExpensifyCardPage({route}: ExpensifyCardPageProps) {
<>
{(!isCardFrozen(currentCard) || !canManageCardFreeze) && (
<CardDetailsActionButtons>
{canManageCardFreeze && !isCardFrozen(currentCard) && (
{canManageCardFreeze && currentCard?.state === CONST.EXPENSIFY_CARD.STATE.OPEN && !isCardFrozen(currentCard) && (
<CardDetailsActionButton
text={translate('cardPage.freezeCard')}
icon={expensifyIcons.FreezeCard}
Expand Down
3 changes: 2 additions & 1 deletion src/pages/workspace/expensifyCard/WorkspaceExpensifyCardDetailsPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,7 @@ function WorkspaceExpensifyCardDetailsPage({route}: WorkspaceExpensifyCardDetail
const remainingLimitHint = remainingLimitHintTranslationKey ? translate(remainingLimitHintTranslationKey, formattedAvailableSpendAmount) : undefined;
const isAdmin = isPolicyAdmin(policy, session?.email);
const isDeactivated = card?.state === CONST.EXPENSIFY_CARD.STATE.STATE_DEACTIVATED;
const isCardOpen = card?.state === CONST.EXPENSIFY_CARD.STATE.OPEN;

const fetchCardDetails = useCallback(() => {
openCardDetailsPage(Number(cardID));
Expand Down Expand Up @@ -316,7 +317,7 @@ function WorkspaceExpensifyCardDetailsPage({route}: WorkspaceExpensifyCardDetail
)}
{(!isCardFrozen(card) || !canManageCardFreeze) && (
<CardDetailsActionButtons>
{canManageCardFreeze && !isDeactivated && !isCardFrozen(card) && (
{canManageCardFreeze && isCardOpen && !isCardFrozen(card) && (
<CardDetailsActionButton
text={translate('cardPage.freezeCard')}
icon={expensifyIcons.FreezeCard}
Expand Down
Loading