Merge pull request #28296 from Expensify/yuwen-removeCatBeta

Remove the categories beta
Expensify · Oct 26, 2023 · 8c76d2a · 8c76d2a
2 parents a67253b + f3d70cc
commit 8c76d2a
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 10 deletions.
diff --git a/src/CONST.ts b/src/CONST.ts
@@ -254,7 +254,6 @@ const CONST = {
         TASKS: 'tasks',
         THREADS: 'threads',
         CUSTOM_STATUS: 'customStatus',
-        NEW_DOT_CATEGORIES: 'newDotCategories',
         NEW_DOT_TAGS: 'newDotTags',
         NEW_DOT_SAML: 'newDotSAML',
     },

diff --git a/src/components/MoneyRequestConfirmationList.js b/src/components/MoneyRequestConfirmationList.js
@@ -225,8 +225,7 @@ function MoneyRequestConfirmationList(props) {
     const shouldCalculateDistanceAmount = props.isDistanceRequest && props.iouAmount === 0;
 
     // A flag for showing the categories field
-    const shouldShowCategories =
-        props.isPolicyExpenseChat && Permissions.canUseCategories(props.betas) && (props.iouCategory || OptionsListUtils.hasEnabledOptions(_.values(props.policyCategories)));
+    const shouldShowCategories = props.isPolicyExpenseChat && (props.iouCategory || OptionsListUtils.hasEnabledOptions(_.values(props.policyCategories)));
 
     // A flag and a toggler for showing the rest of the form fields
     const [shouldExpandFields, toggleShouldExpandFields] = useReducer((state) => !state, false);

diff --git a/src/components/ReportActionItem/MoneyRequestView.js b/src/components/ReportActionItem/MoneyRequestView.js
@@ -118,7 +118,7 @@ function MoneyRequestView({report, betas, parentReport, policyCategories, should
     const policyTagsList = lodashGet(policyTag, 'tags', {});
 
     // Flags for showing categories and tags
-    const shouldShowCategory = isPolicyExpenseChat && Permissions.canUseCategories(betas) && (transactionCategory || OptionsListUtils.hasEnabledOptions(lodashValues(policyCategories)));
+    const shouldShowCategory = isPolicyExpenseChat && (transactionCategory || OptionsListUtils.hasEnabledOptions(lodashValues(policyCategories)));
     const shouldShowTag = isPolicyExpenseChat && Permissions.canUseTags(betas) && (transactionTag || OptionsListUtils.hasEnabledOptions(lodashValues(policyTagsList)));
     const shouldShowBillable = isPolicyExpenseChat && Permissions.canUseTags(betas) && (transactionBillable || !lodashGet(policy, 'disabledFields.defaultBillable', true));
 

diff --git a/src/libs/Permissions.ts b/src/libs/Permissions.ts
@@ -42,10 +42,6 @@ function canUseCustomStatus(betas: Beta[]): boolean {
     return betas?.includes(CONST.BETAS.CUSTOM_STATUS) || canUseAllBetas(betas);
 }
 
-function canUseCategories(betas: Beta[]): boolean {
-    return betas?.includes(CONST.BETAS.NEW_DOT_CATEGORIES) || canUseAllBetas(betas);
-}
-
 function canUseTags(betas: Beta[]): boolean {
     return betas?.includes(CONST.BETAS.NEW_DOT_TAGS) || canUseAllBetas(betas);
 }
@@ -66,7 +62,6 @@ export default {
     canUsePolicyRooms,
     canUseTasks,
     canUseCustomStatus,
-    canUseCategories,
     canUseTags,
     canUseLinkPreviews,
 };
diff --git a/src/pages/EditRequestPage.js b/src/pages/EditRequestPage.js
@@ -104,7 +104,7 @@ function EditRequestPage({betas, report, route, parentReport, policyCategories,
     const isPolicyExpenseChat = useMemo(() => ReportUtils.isPolicyExpenseChat(ReportUtils.getRootParentReport(report)), [report]);
 
     // A flag for showing the categories page
-    const shouldShowCategories = isPolicyExpenseChat && Permissions.canUseCategories(betas) && (transactionCategory || OptionsListUtils.hasEnabledOptions(lodashValues(policyCategories)));
+    const shouldShowCategories = isPolicyExpenseChat && (transactionCategory || OptionsListUtils.hasEnabledOptions(lodashValues(policyCategories)));
 
     // A flag for showing the tags page
     const shouldShowTags = isPolicyExpenseChat && Permissions.canUseTags(betas) && (transactionTag || OptionsListUtils.hasEnabledOptions(lodashValues(policyTagList)));