Reorder getCompanyCardDescription params: translate first, rest optional

Author: blimpich

src/components/EReceipt.tsx

@@ -99,7 +99,7 @@ function EReceipt({transactionID, transactionItem, onLoad, isThumbnail = false,
     const currency = getCurrencySymbol(transactionCurrency ?? '');
     const amount = currency ? formattedAmount.replace(currency, '') : formattedAmount;
     const cardDescription =
-        getCompanyCardDescription(transactionCardName, transactionCardID, cardList, translate) ?? (transactionCardID ? getCardDescription(cardList?.[transactionCardID], translate) : '');
+        getCompanyCardDescription(translate, transactionCardName, transactionCardID, cardList) ?? (transactionCardID ? getCardDescription(cardList?.[transactionCardID], translate) : '');
     const secondaryBgcolorStyle = secondaryColor ? StyleUtils.getBackgroundColorStyle(secondaryColor) : undefined;
     const primaryTextColorStyle = primaryColor ? StyleUtils.getColorStyle(primaryColor) : undefined;
     const titleTextColorStyle = titleColor ? StyleUtils.getColorStyle(titleColor) : undefined;

src/components/ReportActionItem/MoneyRequestView.tsx

@@ -298,7 +298,7 @@ function MoneyRequestView({
     const transactionOriginalAmount = transaction && getOriginalAmountForDisplay(transaction, isExpenseReport(moneyRequestReport));
     const formattedOriginalAmount = transactionOriginalAmount && transactionOriginalCurrency && convertToDisplayString(transactionOriginalAmount, transactionOriginalCurrency);
     const isFromCardImport = isCardTransactionTransactionUtils(transaction);
-    const cardProgramName = getCompanyCardDescription(transaction?.cardName, transaction?.cardID, nonPersonalAndWorkspaceCards, translate);
+    const cardProgramName = getCompanyCardDescription(translate, transaction?.cardName, transaction?.cardID, nonPersonalAndWorkspaceCards);
     const shouldShowCard = isFromCardImport && cardProgramName;
 
     const taxRates = policy?.taxRates;

src/libs/CardUtils.ts

@@ -196,13 +196,13 @@ function getCardDescriptionForSearchTable(card: Card, translate: LocalizedTransl
 }
 
 /**
+ * @param translate
  * @param transactionCardName
  * @param cardID
  * @param cards
- * @param translate
  * @returns company card name
  */
-function getCompanyCardDescription(transactionCardName: string | undefined, cardID: number | undefined, cards: CardList | undefined, translate: LocalizedTranslate) {
+function getCompanyCardDescription(translate: LocalizedTranslate, transactionCardName?: string, cardID?: number, cards?: CardList) {
     if (!cardID || !cards?.[cardID]) {
         return transactionCardName;
     }

tests/unit/CardUtilsTest.ts

@@ -2947,12 +2947,12 @@ describe('CardUtils', () => {
             },
         };
         it('should return the correct description for a company card', () => {
-            const description = getCompanyCardDescription('Test', 21310091, cardList, mockTranslate);
+            const description = getCompanyCardDescription(mockTranslate, 'Test', 21310091, cardList);
             expect(description).toBe('480801XXXXXX2554');
         });
 
         it('should return the correct description for an Expensify card', () => {
-            const description = getCompanyCardDescription('Test', 21570657, cardList, mockTranslate);
+            const description = getCompanyCardDescription(mockTranslate, 'Test', 21570657, cardList);
             expect(description).toBe('Test');
         });
 
@@ -2966,7 +2966,7 @@ describe('CardUtils', () => {
                     },
                 },
             } as unknown as CardList;
-            const description = getCompanyCardDescription('Expensify Card - 6909', 99999, travelCardList, mockTranslate);
+            const description = getCompanyCardDescription(mockTranslate, 'Expensify Card - 6909', 99999, travelCardList);
             expect(description).toBe('Central invoicing');
         });
     });