Remove rulesRevamp beta.

src/CONST/index.ts

@@ -1098,7 +1098,6 @@ const CONST = {
         DUALENTRY: 'dualEntry',
         CAMPFIRE: 'campfire',
         BUSINESS_CENTRAL: 'businessCentral',
-        RULES_REVAMP: 'rulesRevamp',
         COMMUTER_EXCLUSIONS: 'commuterExclusions',
         MULTIPLE_APPROVERS: 'multipleApprovers',
         GLOBAL_REIMBURSEMENTS: 'globalReimbursements',

src/components/Search/SearchRouter/useNavigationSuggestions.tsx

@@ -133,7 +133,6 @@ type BuildWorkspaceNavigationItemsParams = {
     /** Whether pending offline state should be considered by Workspace visibility rules. */
     isOffline: boolean;
 
-    isRulesRevampBetaEnabled: boolean;
     isVendorMatchingBetaEnabled: boolean;
 
     /** Whether navigation should use the narrow-layout Workspace flow. */
@@ -271,7 +270,6 @@ function buildWorkspaceNavigationItems({
     currentUserLogin,
     icons,
     isOffline,
-    isRulesRevampBetaEnabled,
     isVendorMatchingBetaEnabled,
     shouldUseNarrowLayout,
     convertToDisplayString,
@@ -290,7 +288,6 @@ function buildWorkspaceNavigationItems({
                 currentUserLogin,
                 icons,
                 policyCategories: policyCategories?.[`${ONYXKEYS.COLLECTION.POLICY_CATEGORIES}${policy.id}`],
-                isRulesRevampBetaEnabled,
                 isVendorMatchingBetaEnabled,
                 convertToDisplayString,
             });
@@ -421,7 +418,6 @@ function useNavigationSuggestions(query: string, shouldWatchForApprovals = true)
         currentUserLogin,
         icons,
         isOffline: !!isOffline,
-        isRulesRevampBetaEnabled: isBetaEnabled(CONST.BETAS.RULES_REVAMP),
         isVendorMatchingBetaEnabled: isBetaEnabled(CONST.BETAS.VENDOR_MATCHING),
         shouldUseNarrowLayout,
         convertToDisplayString,

src/components/Tables/WorkspaceTagsTable/WorkspaceTagsTableRow.tsx

@@ -61,16 +61,15 @@ export default function WorkspaceTagsTableRow({
         item.name,
         tagCountSubtitle,
         enabledStatusLabel,
-        item.showRequiredSwitch && item.required ? translate('common.required') : null,
         shouldShowGLCodeColumn && item.glCode ? `${translate('workspace.tags.glCode')}: ${item.glCode}` : null,
         shouldShowApproverColumn && item.approverDisplayName ? `${translate('common.approver')}: ${item.approverDisplayName}` : null,
     ]
         .filter(Boolean)
         .join(', ');
 
-    const switchValue = item.showRequiredSwitch ? !!item.required : item.enabled;
-    const switchAccessibilityLabel = item.showRequiredSwitch ? translate('workspace.tags.requiresTag') : translate('workspace.tags.enableTag');
-    const handleSwitchToggle = item.showRequiredSwitch ? item.onToggleRequired : item.onToggleEnabled;
+    const switchValue = item.enabled;
+    const switchAccessibilityLabel = translate('workspace.tags.enableTag');
+    const handleSwitchToggle = item.onToggleEnabled;
     const isSwitchControlDisabled = !!item.disabled || !!item.isSwitchDisabled;
 
     return (
@@ -155,7 +154,7 @@ export default function WorkspaceTagsTableRow({
                         </View>
                     )}
 
-                    {(item.showEnabledSwitch || item.showRequiredSwitch) && !!handleSwitchToggle && (
+                    {item.showEnabledSwitch && !!handleSwitchToggle && (
                         <View
                             style={[styles.justifyContentCenter, styles.alignItemsEnd]}
                             {...getCellAccessibilityProps(isTableSemanticsEnabled)}

src/components/Tables/WorkspaceTagsTable/index.tsx

@@ -3,7 +3,6 @@ import Table, {composeTableListHeader} from '@components/Table';
 import type {TableEmptyStateProps} from '@components/Table/TableEmptyStates/TableEmptyState';
 
 import useLocalize from '@hooks/useLocalize';
-import usePermissions from '@hooks/usePermissions';
 import useResponsiveLayout from '@hooks/useResponsiveLayout';
 import useThemeStyles from '@hooks/useThemeStyles';
 
@@ -12,7 +11,6 @@ import type {AvatarSource} from '@libs/UserAvatarUtils';
 
 import variables from '@styles/variables';
 
-import CONST from '@src/CONST';
 import type * as OnyxCommon from '@src/types/onyx/OnyxCommon';
 
 import type {ListRenderItemInfo} from '@shopify/flash-list';
@@ -42,10 +40,8 @@ type WorkspaceTagTableRowData = TableData & {
     isLocked: boolean;
     isSwitchDisabled?: boolean;
     showEnabledSwitch: boolean;
-    showRequiredSwitch: boolean;
     action: () => void;
     onToggleEnabled?: (enabled: boolean) => void;
-    onToggleRequired?: (required: boolean) => void;
     onClose: () => void;
 };
 
@@ -77,13 +73,10 @@ export default function WorkspaceTagsTable({
     const styles = useThemeStyles();
     const {translate, localeCompare} = useLocalize();
     const {shouldUseNarrowLayout, isMediumScreenWidth} = useResponsiveLayout();
-    const {isBetaEnabled} = usePermissions();
 
     const shouldUseNarrowTableLayout = shouldUseNarrowLayout || isMediumScreenWidth;
     const shouldShowTagCountColumn = isMultiLevelTags && !shouldUseNarrowTableLayout;
     const shouldShowEnabledColumn = !isMultiLevelTags;
-    // Required is configured from Rules once the revamp is on, so the rows have no switch to head.
-    const shouldShowRequiredColumn = isMultiLevelTags && !hasDependentTags && !isBetaEnabled(CONST.BETAS.RULES_REVAMP);
 
     const tagTableColumns: Array<TableColumn<WorkspaceTagTableColumnKey>> = [
         {
@@ -132,19 +125,6 @@ export default function WorkspaceTagsTable({
                   },
               ]
             : []),
-        ...(shouldShowRequiredColumn
-            ? [
-                  {
-                      key: 'required' as const,
-                      label: translate('common.required'),
-                      sortable: true,
-                      width: variables.tableSwitchColumnWidth,
-                      styling: {
-                          containerStyles: [styles.justifyContentEnd],
-                      },
-                  },
-              ]
-            : []),
         {
             key: 'actions',
             label: '',

src/hooks/useControlOnlyRuleUpgradeRedirect.ts

@@ -8,7 +8,6 @@ import ROUTES from '@src/ROUTES';
 import {useEffect, useRef} from 'react';
 
 import useOnyx from './useOnyx';
-import usePermissions from './usePermissions';
 import usePolicy from './usePolicy';
 
 /**
@@ -24,13 +23,12 @@ import usePolicy from './usePolicy';
  */
 function useControlOnlyRuleUpgradeRedirect(policyID: string, backTo?: Route) {
     const policy = usePolicy(policyID);
-    const {isBetaEnabled} = usePermissions();
     const [policyCategories] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY_CATEGORIES}${policyID}`);
 
     const isCollect = isCollectPolicy(policy);
     // Mirrors the feature check in AccessOrNotFoundWrapper. When Rules itself is disabled, that wrapper already
     // redirects to More features, so redirecting to the upgrade page too would flash it on the way there.
-    const isRulesFeatureEnabled = arePolicyRulesEnabled(policy, policyCategories, isBetaEnabled(CONST.BETAS.RULES_REVAMP));
+    const isRulesFeatureEnabled = arePolicyRulesEnabled(policy, policyCategories);
     const hasRedirectedToUpgrade = useRef(false);
     const upgradeBackTo = backTo ?? ROUTES.WORKSPACE_RULES.getRoute(policyID);