From f84e03196c500c91e2849f15c22d2744be9d5387 Mon Sep 17 00:00:00 2001
From: shahid <shahidmuffakir@gmail.com>
Date: Sun, 26 Jan 2025 09:32:30 +0530
Subject: [PATCH 1/3] Show 'Report Physical Card Loss/Damage' option for
physical cards, regardless of activation status
---
src/pages/settings/Wallet/ExpensifyCardPage.tsx | 17 ++++++++++-------
1 file changed, 10 insertions(+), 7 deletions(-)
diff --git a/src/pages/settings/Wallet/ExpensifyCardPage.tsx b/src/pages/settings/Wallet/ExpensifyCardPage.tsx
index 32ec1d0f2439..ebdc9b4069d5 100644
--- a/src/pages/settings/Wallet/ExpensifyCardPage.tsx
+++ b/src/pages/settings/Wallet/ExpensifyCardPage.tsx
@@ -253,17 +253,20 @@ function ExpensifyCardPage({
</>
))}
{physicalCards.map((card) => {
- if (card.state !== CONST.EXPENSIFY_CARD.STATE.OPEN) {
+ if (card.state === CONST.EXPENSIFY_CARD.STATE.STATE_NOT_ISSUED) {
return null;
}
+
return (
<>
- <MenuItemWithTopDescription
- description={translate('cardPage.physicalCardNumber')}
- title={maskCard(card?.lastFourPAN)}
- interactive={false}
- titleStyle={styles.walletCardNumber}
- />
+ {card.state === CONST.EXPENSIFY_CARD.STATE.OPEN && (
+ <MenuItemWithTopDescription
+ description={translate('cardPage.physicalCardNumber')}
+ title={maskCard(card?.lastFourPAN)}
+ interactive={false}
+ titleStyle={styles.walletCardNumber}
+ />
+ )}
<MenuItem
title={translate('reportCardLostOrDamaged.report')}
icon={Expensicons.Flag}
From cd55165de1d9273db2c61d87599a2c9b4a3e4e44 Mon Sep 17 00:00:00 2001
From: shahid <shahidmuffakir@gmail.com>
Date: Mon, 27 Jan 2025 20:12:33 +0530
Subject: [PATCH 2/3] don't show the 'Report physical card loss/damage' for
suspended card
---
src/pages/settings/Wallet/ExpensifyCardPage.tsx | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/pages/settings/Wallet/ExpensifyCardPage.tsx b/src/pages/settings/Wallet/ExpensifyCardPage.tsx
index ebdc9b4069d5..5f0c4b855f1a 100644
--- a/src/pages/settings/Wallet/ExpensifyCardPage.tsx
+++ b/src/pages/settings/Wallet/ExpensifyCardPage.tsx
@@ -253,7 +253,7 @@ function ExpensifyCardPage({
</>
))}
{physicalCards.map((card) => {
- if (card.state === CONST.EXPENSIFY_CARD.STATE.STATE_NOT_ISSUED) {
+ if (card.state === CONST.EXPENSIFY_CARD.STATE.STATE_NOT_ISSUED || card.state === CONST.EXPENSIFY_CARD.STATE.STATE_SUSPENDED) {
return null;
}
From d742912642e7c0ba874829ccbae9d88b5ca079eb Mon Sep 17 00:00:00 2001
From: shahid <shahidmuffakir@gmail.com>
Date: Mon, 27 Jan 2025 20:40:50 +0530
Subject: [PATCH 3/3] only show the 'Report physical card loss/damage' option
if the card state is either open or not_activated
---
src/pages/settings/Wallet/ExpensifyCardPage.tsx | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/pages/settings/Wallet/ExpensifyCardPage.tsx b/src/pages/settings/Wallet/ExpensifyCardPage.tsx
index 5f0c4b855f1a..3e51134a6483 100644
--- a/src/pages/settings/Wallet/ExpensifyCardPage.tsx
+++ b/src/pages/settings/Wallet/ExpensifyCardPage.tsx
@@ -253,7 +253,7 @@ function ExpensifyCardPage({
</>
))}
{physicalCards.map((card) => {
- if (card.state === CONST.EXPENSIFY_CARD.STATE.STATE_NOT_ISSUED || card.state === CONST.EXPENSIFY_CARD.STATE.STATE_SUSPENDED) {
+ if (card.state !== CONST.EXPENSIFY_CARD.STATE.OPEN && card.state !== CONST.EXPENSIFY_CARD.STATE.NOT_ACTIVATED) {
return null;
}