Remove 'never' type and rename function

Expensify · Oct 29, 2024 · 499a5bf · 499a5bf
1 parent ee1ec6b
commit 499a5bf
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/src/libs/CategoryUtils.ts b/src/libs/CategoryUtils.ts
@@ -68,14 +68,14 @@ function getCategoryDefaultTaxRate(expenseRules: ExpenseRule[], categoryName: st
     return categoryDefaultTaxRate;
 }
 
-function updateCategoryInMccGroups(mccGroups: never[] | Record<string, MccGroup>, oldCategoryName: string, newCategoryName: string): Record<string, MccGroup> {
+function updateCategoryInMccGroup(mccGroups: Record<string, MccGroup>, oldCategoryName: string, newCategoryName: string) {
     const updatedGroups: Record<string, MccGroup> = {};
 
     for (const [key, group] of Object.entries(mccGroups || {})) {
-        updatedGroups[key] = group.category === oldCategoryName ? {...group, category: newCategoryName, pendingAction: 'update'} : group;
+        updatedGroups[key] = group.category === oldCategoryName ? {...group, category: newCategoryName, pendingAction: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE} : group;
     }
 
     return updatedGroups;
 }
 
-export {formatDefaultTaxRateText, formatRequireReceiptsOverText, getCategoryApproverRule, getCategoryExpenseRule, getCategoryDefaultTaxRate, updateCategoryInMccGroups};
+export {formatDefaultTaxRateText, formatRequireReceiptsOverText, getCategoryApproverRule, getCategoryExpenseRule, getCategoryDefaultTaxRate, updateCategoryInMccGroup};
diff --git a/src/libs/actions/Policy/Category.ts b/src/libs/actions/Policy/Category.ts
@@ -542,11 +542,11 @@ function renamePolicyCategory(policyID: string, policyCategory: {oldName: string
     const policyCategoryExpenseRule = CategoryUtils.getCategoryExpenseRule(policy?.rules?.expenseRules ?? [], policyCategory.oldName);
     const approvalRules = policy?.rules?.approvalRules ?? [];
     const expenseRules = policy?.rules?.expenseRules ?? [];
-    const mccGroup = policy?.mccGroup ?? [];
+    const mccGroup = policy?.mccGroup ?? {};
     const updatedApprovalRules: ApprovalRule[] = lodashCloneDeep(approvalRules);
     const updatedExpenseRules: ExpenseRule[] = lodashCloneDeep(expenseRules);
-    const clonedMccGroup: never[] | Record<string, MccGroup> = lodashCloneDeep(mccGroup);
-    const updatedMccGroups = CategoryUtils.updateCategoryInMccGroups(clonedMccGroup, policyCategory.oldName, policyCategory.newName);
+    const clonedMccGroup: Record<string, MccGroup> = lodashCloneDeep(mccGroup);
+    const updatedMccGroup = CategoryUtils.updateCategoryInMccGroup(clonedMccGroup, policyCategory.oldName, policyCategory.newName);
 
     if (policyCategoryExpenseRule) {
         const ruleIndex = updatedExpenseRules.findIndex((rule) => rule.id === policyCategoryExpenseRule.id);
@@ -599,7 +599,7 @@ function renamePolicyCategory(policyID: string, policyCategory: {oldName: string
                         approvalRules: updatedApprovalRules,
                         expenseRules: updatedExpenseRules,
                     },
-                    mccGroup: updatedMccGroups,
+                    mccGroup: updatedMccGroup,
                 },
             },
         ],
@@ -643,7 +643,7 @@ function renamePolicyCategory(policyID: string, policyCategory: {oldName: string
                     rules: {
                         approvalRules,
                     },
-                    mccGroup: updatedMccGroups,
+                    mccGroup: updatedMccGroup,
                 },
             },
         ],