Merge pull request #44592 from nkdengineer/fix/44111-regression

Expensify · Jul 2, 2024 · 7f3f120 · 7f3f120
2 parents 22bcc98 + adda93b
commit 7f3f120
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 3 deletions.
diff --git a/src/libs/CardUtils.ts b/src/libs/CardUtils.ts
@@ -139,6 +139,10 @@ function hasDetectedFraud(cardList: Record<string, Card>): boolean {
     return Object.values(cardList).some((card) => card.fraud !== CONST.EXPENSIFY_CARD.FRAUD_TYPES.NONE);
 }
 
+function getMCardNumberString(cardNumber: string): string {
+    return cardNumber.replace(/\s/g, '');
+}
+
 export {
     isExpensifyCard,
     isCorporateCard,
@@ -150,4 +154,5 @@ export {
     getCardDescription,
     findPhysicalCard,
     hasDetectedFraud,
+    getMCardNumberString,
 };
diff --git a/src/libs/actions/PaymentMethods.ts b/src/libs/actions/PaymentMethods.ts
@@ -162,7 +162,7 @@ function addPaymentCard(params: PaymentCardParams) {
     const cardYear = CardUtils.getYearFromExpirationDateString(params.expirationDate);
 
     const parameters: AddPaymentCardParams = {
-        cardNumber: params.cardNumber,
+        cardNumber: CardUtils.getMCardNumberString(params.cardNumber),
         cardYear,
         cardMonth,
         cardCVV: params.securityCode,

diff --git a/src/pages/settings/Subscription/PaymentCard/index.tsx b/src/pages/settings/Subscription/PaymentCard/index.tsx
@@ -56,7 +56,7 @@ function AddPaymentCard() {
 
     const addPaymentCard = useCallback((values: FormOnyxValues<typeof ONYXKEYS.FORMS.ADD_PAYMENT_CARD_FORM>) => {
         const cardData = {
-            cardNumber: values.cardNumber,
+            cardNumber: CardUtils.getMCardNumberString(values.cardNumber),
             cardMonth: CardUtils.getMonthFromExpirationDateString(values.expirationDate),
             cardYear: CardUtils.getYearFromExpirationDateString(values.expirationDate),
             cardCVV: values.securityCode,

diff --git a/src/pages/workspace/members/WorkspaceOwnerPaymentCardForm.tsx b/src/pages/workspace/members/WorkspaceOwnerPaymentCardForm.tsx
@@ -61,7 +61,7 @@ function WorkspaceOwnerPaymentCardForm({policy}: WorkspaceOwnerPaymentCardFormPr
     const addPaymentCard = useCallback(
         (values: FormOnyxValues<typeof ONYXKEYS.FORMS.ADD_PAYMENT_CARD_FORM>) => {
             const cardData = {
-                cardNumber: values.cardNumber,
+                cardNumber: CardUtils.getMCardNumberString(values.cardNumber),
                 cardMonth: CardUtils.getMonthFromExpirationDateString(values.expirationDate),
                 cardYear: CardUtils.getYearFromExpirationDateString(values.expirationDate),
                 cardCVV: values.securityCode,