From 4ddfc0a2b7b703fa4d05c130c1ac18cf58d2dfd8 Mon Sep 17 00:00:00 2001
From: mkzie2 <mkzie2@gmail.com>
Date: Sun, 4 May 2025 00:32:22 +0700
Subject: [PATCH 1/2] fix: error in set card limit page after entering wrong
 magic code

---
 src/libs/actions/Card.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/libs/actions/Card.ts b/src/libs/actions/Card.ts
index 7c340a042e2fb..e00f5e40addb8 100644
--- a/src/libs/actions/Card.ts
+++ b/src/libs/actions/Card.ts
@@ -772,6 +772,7 @@ function issueExpensifyCard(domainAccountID: number, policyID: string | undefine
         cardTitle,
         validateCode,
         domainAccountID,
+        policyID,
     };
 
     if (cardType === CONST.EXPENSIFY_CARD.CARD_TYPE.PHYSICAL) {

From 37a9aeb8385906cc9111db541474842c95bc3e5b Mon Sep 17 00:00:00 2001
From: mkzie2 <mkzie2@gmail.com>
Date: Mon, 5 May 2025 15:22:44 +0700
Subject: [PATCH 2/2] pass policyID for virtual card creation only

---
 src/libs/API/parameters/CreateExpensifyCardParams.ts | 1 +
 src/libs/actions/Card.ts                             | 3 +--
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/libs/API/parameters/CreateExpensifyCardParams.ts b/src/libs/API/parameters/CreateExpensifyCardParams.ts
index 5dfe6641798d4..4cfd552cb2259 100644
--- a/src/libs/API/parameters/CreateExpensifyCardParams.ts
+++ b/src/libs/API/parameters/CreateExpensifyCardParams.ts
@@ -5,6 +5,7 @@ type CreateExpensifyCardParams = {
     cardTitle: string;
     feedCountry: string;
     domainAccountID: number;
+    policyID?: string;
 };
 
 export default CreateExpensifyCardParams;
diff --git a/src/libs/actions/Card.ts b/src/libs/actions/Card.ts
index e00f5e40addb8..b380d1c9e153b 100644
--- a/src/libs/actions/Card.ts
+++ b/src/libs/actions/Card.ts
@@ -772,7 +772,6 @@ function issueExpensifyCard(domainAccountID: number, policyID: string | undefine
         cardTitle,
         validateCode,
         domainAccountID,
-        policyID,
     };
 
     if (cardType === CONST.EXPENSIFY_CARD.CARD_TYPE.PHYSICAL) {
@@ -791,7 +790,7 @@ function issueExpensifyCard(domainAccountID: number, policyID: string | undefine
     // eslint-disable-next-line rulesdir/no-multiple-api-calls
     API.write(
         WRITE_COMMANDS.CREATE_ADMIN_ISSUED_VIRTUAL_CARD,
-        {...parameters},
+        {...parameters, policyID},
         {
             optimisticData,
             successData,