From 177bd399efa0960749e6151573cf5609071ab93c Mon Sep 17 00:00:00 2001
From: Georgia Monahan <georgia@expensify.com>
Date: Thu, 21 Mar 2024 14:04:44 +0000
Subject: [PATCH 1/6] update card typescript types

---
 src/types/onyx/Card.ts | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/types/onyx/Card.ts b/src/types/onyx/Card.ts
index 53415690705a..48f51a8759f7 100644
--- a/src/types/onyx/Card.ts
+++ b/src/types/onyx/Card.ts
@@ -8,13 +8,12 @@ type Card = {
     bank: string;
     availableSpend: number;
     domainName: string;
-    maskedPan?: string; // do not reference, removing as part of Expensify/App#27943
     lastFourPAN?: string;
-    cardName: string;
-    cardTitle: string; // used only for virtual limit cards
+    cardDisplayName: string;
     limitType: ValueOf<typeof CONST.EXPENSIFY_CARD.LIMIT_TYPES>;
     isAdminIssuedVirtualCard: boolean;
     isVirtual: boolean;
+    isExpensifyCard: boolean;
     fraud: ValueOf<typeof CONST.EXPENSIFY_CARD.FRAUD_TYPES>;
     cardholderFirstName: string;
     cardholderLastName: string;

From a641c83f49a1f2cad18df04a02b930ee537abf74 Mon Sep 17 00:00:00 2001
From: Georgia Monahan <georgia@expensify.com>
Date: Fri, 22 Mar 2024 18:56:48 +0000
Subject: [PATCH 2/6] nameValuePairs

---
 src/types/onyx/Card.ts | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/types/onyx/Card.ts b/src/types/onyx/Card.ts
index 48f51a8759f7..c5cc467e12af 100644
--- a/src/types/onyx/Card.ts
+++ b/src/types/onyx/Card.ts
@@ -9,16 +9,17 @@ type Card = {
     availableSpend: number;
     domainName: string;
     lastFourPAN?: string;
-    cardDisplayName: string;
-    limitType: ValueOf<typeof CONST.EXPENSIFY_CARD.LIMIT_TYPES>;
-    isAdminIssuedVirtualCard: boolean;
     isVirtual: boolean;
-    isExpensifyCard: boolean;
     fraud: ValueOf<typeof CONST.EXPENSIFY_CARD.FRAUD_TYPES>;
     cardholderFirstName: string;
     cardholderLastName: string;
     errors?: OnyxCommon.Errors;
     isLoading?: boolean;
+    nameValuePairs?: {
+        limitType?: ValueOf<typeof CONST.EXPENSIFY_CARD.LIMIT_TYPES>;
+        cardTitle?: string; // used only for virtual limit cards
+        issuedBy?: string;
+    }
 };
 
 type TCardDetails = {

From c7516ee5e63696ae6e04ca3dbacb2faf15959e67 Mon Sep 17 00:00:00 2001
From: Georgia Monahan <georgia@expensify.com>
Date: Fri, 22 Mar 2024 19:05:29 +0000
Subject: [PATCH 3/6] add other keys that may be returned

---
 src/types/onyx/Card.ts | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/types/onyx/Card.ts b/src/types/onyx/Card.ts
index c5cc467e12af..34e8c92d7dc7 100644
--- a/src/types/onyx/Card.ts
+++ b/src/types/onyx/Card.ts
@@ -19,7 +19,13 @@ type Card = {
         limitType?: ValueOf<typeof CONST.EXPENSIFY_CARD.LIMIT_TYPES>;
         cardTitle?: string; // used only for virtual limit cards
         issuedBy?: string;
-    }
+        hasCustomUnapprovedExpenseLimit?: string;
+        unapprovedExpenseLimit?: string;
+        feedCountry?: string;
+        isVirtual?: string;
+        previousState?: string;
+        expirationDate?: string;
+    };
 };
 
 type TCardDetails = {

From 35909dc7d62ea1b5869f813db0309ca52877306d Mon Sep 17 00:00:00 2001
From: Georgia Monahan <38015950+grgia@users.noreply.github.com>
Date: Mon, 25 Mar 2024 10:22:30 +0000
Subject: [PATCH 4/6] Fix Types

Co-authored-by: Maria D'Costa <maria@expensify.com>
---
 src/types/onyx/Card.ts | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/types/onyx/Card.ts b/src/types/onyx/Card.ts
index 34e8c92d7dc7..c045d477b9aa 100644
--- a/src/types/onyx/Card.ts
+++ b/src/types/onyx/Card.ts
@@ -18,12 +18,12 @@ type Card = {
     nameValuePairs?: {
         limitType?: ValueOf<typeof CONST.EXPENSIFY_CARD.LIMIT_TYPES>;
         cardTitle?: string; // used only for virtual limit cards
-        issuedBy?: string;
-        hasCustomUnapprovedExpenseLimit?: string;
-        unapprovedExpenseLimit?: string;
+        issuedBy?: number;
+        hasCustomUnapprovedExpenseLimit?: boolean;
+        unapprovedExpenseLimit?: number;
         feedCountry?: string;
-        isVirtual?: string;
-        previousState?: string;
+        isVirtual?: boolean;
+        previousState?: number;
         expirationDate?: string;
     };
 };

From 36bdea88dc89fcfdcc9491011ee7ec04934c4ec9 Mon Sep 17 00:00:00 2001
From: Georgia Monahan <georgia@expensify.com>
Date: Mon, 25 Mar 2024 14:11:45 +0000
Subject: [PATCH 5/6] remove unused keys

---
 src/types/onyx/Card.ts | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/types/onyx/Card.ts b/src/types/onyx/Card.ts
index c045d477b9aa..d9df6513d89f 100644
--- a/src/types/onyx/Card.ts
+++ b/src/types/onyx/Card.ts
@@ -11,8 +11,6 @@ type Card = {
     lastFourPAN?: string;
     isVirtual: boolean;
     fraud: ValueOf<typeof CONST.EXPENSIFY_CARD.FRAUD_TYPES>;
-    cardholderFirstName: string;
-    cardholderLastName: string;
     errors?: OnyxCommon.Errors;
     isLoading?: boolean;
     nameValuePairs?: {

From efce0824765ca52189b1cb23194ba31bc933b510 Mon Sep 17 00:00:00 2001
From: Georgia Monahan <georgia@expensify.com>
Date: Tue, 2 Apr 2024 12:47:28 +0100
Subject: [PATCH 6/6] fix comments

---
 src/types/onyx/Card.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/types/onyx/Card.ts b/src/types/onyx/Card.ts
index d9df6513d89f..11cc8dc26b4c 100644
--- a/src/types/onyx/Card.ts
+++ b/src/types/onyx/Card.ts
@@ -9,13 +9,13 @@ type Card = {
     availableSpend: number;
     domainName: string;
     lastFourPAN?: string;
-    isVirtual: boolean;
+    isVirtual: boolean; // Deprecating, use nameValuePairs.isVirtual
     fraud: ValueOf<typeof CONST.EXPENSIFY_CARD.FRAUD_TYPES>;
     errors?: OnyxCommon.Errors;
     isLoading?: boolean;
     nameValuePairs?: {
         limitType?: ValueOf<typeof CONST.EXPENSIFY_CARD.LIMIT_TYPES>;
-        cardTitle?: string; // used only for virtual limit cards
+        cardTitle?: string; // Used only for admin-issued virtual cards
         issuedBy?: number;
         hasCustomUnapprovedExpenseLimit?: boolean;
         unapprovedExpenseLimit?: number;