Merge pull request Expensify#65908 from Expensify/yuwen-removeMLT

Remove multiLevelTags beta

Author: NikkiWines

src/CONST/index.ts

@@ -642,7 +642,6 @@ const CONST = {
         CUSTOM_RULES: 'customRules',
         GLOBAL_REIMBURSEMENTS_ON_ND: 'globalReimbursementsOnND',
         IS_TRAVEL_VERIFIED: 'isTravelVerified',
-        MULTI_LEVEL_TAGS: 'multiLevelTags',
         NEWDOT_MULTI_FILES_DRAG_AND_DROP: 'newDotMultiFilesDragAndDrop',
         NEWDOT_MULTI_SCAN: 'newDotMultiScan',
         PLAID_COMPANY_CARDS: 'plaidCompanyCards',

src/pages/workspace/tags/WorkspaceTagsPage.tsx

@@ -28,7 +28,6 @@ import useLocalize from '@hooks/useLocalize';
 import useMobileSelectionMode from '@hooks/useMobileSelectionMode';
 import useNetwork from '@hooks/useNetwork';
 import useOnyx from '@hooks/useOnyx';
-import usePermissions from '@hooks/usePermissions';
 import usePolicy from '@hooks/usePolicy';
 import useResponsiveLayout from '@hooks/useResponsiveLayout';
 import useSearchBackPress from '@hooks/useSearchBackPress';
@@ -112,7 +111,6 @@ function WorkspaceTagsPage({route}: WorkspaceTagsPageProps) {
         openPolicyTagsPage(policyID);
     }, [policyID]);
     const isQuickSettingsFlow = route.name === SCREENS.SETTINGS_TAGS.SETTINGS_TAGS_ROOT;
-    const {isBetaEnabled} = usePermissions();
 
     const tagsList = useMemo(() => {
         if (isMultiLevelTags) {
@@ -191,28 +189,27 @@ function WorkspaceTagsPage({route}: WorkspaceTagsPageProps) {
                     enabled: true,
                     required: policyTagList.required,
                     isDisabledCheckbox: isSwitchDisabled,
-                    rightElement:
-                        isBetaEnabled(CONST.BETAS.MULTI_LEVEL_TAGS) && hasDependentTags ? (
-                            <ListItemRightCaretWithLabel
-                                labelText={translate('workspace.tags.tagCount', {count: Object.keys(policyTagList?.tags ?? {}).length})}
-                                shouldShowCaret
-                            />
-                        ) : (
-                            <Switch
-                                isOn={isSwitchEnabled}
-                                accessibilityLabel={translate('workspace.tags.requiresTag')}
-                                onToggle={(newValue: boolean) => {
-                                    if (isMakingLastRequiredTagListOptional(policy, policyTags, [policyTagList])) {
-                                        setIsCannotMakeLastTagOptionalModalVisible(true);
-                                        return;
-                                    }
-
-                                    updateWorkspaceRequiresTag(newValue, policyTagList.orderWeight);
-                                }}
-                                disabled={isSwitchDisabled}
-                                showLockIcon={isMakingLastRequiredTagListOptional(policy, policyTags, [policyTagList])}
-                            />
-                        ),
+                    rightElement: hasDependentTags ? (
+                        <ListItemRightCaretWithLabel
+                            labelText={translate('workspace.tags.tagCount', {count: Object.keys(policyTagList?.tags ?? {}).length})}
+                            shouldShowCaret
+                        />
+                    ) : (
+                        <Switch
+                            isOn={isSwitchEnabled}
+                            accessibilityLabel={translate('workspace.tags.requiresTag')}
+                            onToggle={(newValue: boolean) => {
+                                if (isMakingLastRequiredTagListOptional(policy, policyTags, [policyTagList])) {
+                                    setIsCannotMakeLastTagOptionalModalVisible(true);
+                                    return;
+                                }
+
+                                updateWorkspaceRequiresTag(newValue, policyTagList.orderWeight);
+                            }}
+                            disabled={isSwitchDisabled}
+                            showLockIcon={isMakingLastRequiredTagListOptional(policy, policyTags, [policyTagList])}
+                        />
+                    ),
                 };
             });
         }
@@ -241,7 +238,7 @@ function WorkspaceTagsPage({route}: WorkspaceTagsPageProps) {
                 />
             ),
         }));
-    }, [isMultiLevelTags, policyTagLists, isBetaEnabled, hasDependentTags, translate, policy, policyTags, updateWorkspaceRequiresTag, updateWorkspaceTagEnabled]);
+    }, [isMultiLevelTags, policyTagLists, hasDependentTags, translate, policy, policyTags, updateWorkspaceRequiresTag, updateWorkspaceTagEnabled]);
 
     const filterTag = useCallback((tag: TagListItem, searchInput: string) => {
         const tagText = StringUtils.normalize(tag.text?.toLowerCase() ?? '');
@@ -286,7 +283,7 @@ function WorkspaceTagsPage({route}: WorkspaceTagsPageProps) {
     };
 
     const getCustomListHeader = () => {
-        if (isBetaEnabled(CONST.BETAS.MULTI_LEVEL_TAGS) && hasDependentTags) {
+        if (hasDependentTags) {
             return (
                 <CustomListHeader
                     canSelectMultiple={false}
@@ -345,18 +342,12 @@ function WorkspaceTagsPage({route}: WorkspaceTagsPageProps) {
             close(() => setIsOfflineModalVisible(true));
             return;
         }
-        if (isBetaEnabled(CONST.BETAS.MULTI_LEVEL_TAGS)) {
-            Navigation.navigate(
-                isQuickSettingsFlow
-                    ? ROUTES.SETTINGS_TAGS_IMPORT.getRoute(policyID, ROUTES.SETTINGS_TAGS_ROOT.getRoute(policyID, backTo))
-                    : ROUTES.WORKSPACE_TAGS_IMPORT_OPTIONS.getRoute(policyID),
-            );
-        } else {
-            Navigation.navigate(
-                isQuickSettingsFlow ? ROUTES.SETTINGS_TAGS_IMPORT.getRoute(policyID, ROUTES.SETTINGS_TAGS_ROOT.getRoute(policyID, backTo)) : ROUTES.WORKSPACE_TAGS_IMPORT.getRoute(policyID),
-            );
-        }
-    }, [backTo, isOffline, isQuickSettingsFlow, policyID, isBetaEnabled]);
+        Navigation.navigate(
+            isQuickSettingsFlow
+                ? ROUTES.SETTINGS_TAGS_IMPORT.getRoute(policyID, ROUTES.SETTINGS_TAGS_ROOT.getRoute(policyID, backTo))
+                : ROUTES.WORKSPACE_TAGS_IMPORT_OPTIONS.getRoute(policyID),
+        );
+    }, [backTo, isOffline, isQuickSettingsFlow, policyID]);
 
     const hasAccountingConnections = hasAccountingConnectionsPolicyUtils(policy);
     const secondaryActions = useMemo(() => {
@@ -387,7 +378,7 @@ function WorkspaceTagsPage({route}: WorkspaceTagsPageProps) {
                         return;
                     }
                     close(() => {
-                        if (hasIndependentTags && isBetaEnabled(CONST.BETAS.MULTI_LEVEL_TAGS)) {
+                        if (hasIndependentTags) {
                             downloadMultiLevelIndependentTagsCSV(policyID, () => {
                                 setIsDownloadFailureModalVisible(true);
                             });
@@ -403,7 +394,7 @@ function WorkspaceTagsPage({route}: WorkspaceTagsPageProps) {
         }
 
         return menuItems;
-    }, [translate, navigateToTagsSettings, isBetaEnabled, hasDependentTags, hasVisibleTags, isOffline, policyID, hasIndependentTags, hasAccountingConnections, navigateToImportSpreadsheet]);
+    }, [translate, navigateToTagsSettings, hasDependentTags, hasVisibleTags, isOffline, policyID, hasIndependentTags, hasAccountingConnections, navigateToImportSpreadsheet]);
 
     const getHeaderButtons = () => {
         const selectedTagsObject = selectedTags.map((key) => policyTagLists.at(0)?.tags?.[key]);

tests/unit/usePermissionsTest.tsx

@@ -65,7 +65,6 @@ describe('usePermissions', () => {
         // Initially, check the value for the initial betas
         expect(result.current.isBetaEnabled(CONST.BETAS.DEFAULT_ROOMS)).toBe(true);
         expect(result.current.isBlockedFromSpotnanaTravel).toBe(true);
-        expect(result.current.isBetaEnabled(CONST.BETAS.MULTI_LEVEL_TAGS)).toBe(false);
         expect(result.current.isBetaEnabled(CONST.BETAS.ALL)).toBe(false);
 
         Onyx.merge(ONYXKEYS.BETAS, updatedBetas);
@@ -75,6 +74,5 @@ describe('usePermissions', () => {
         // After update, check the value for the updated betas
         expect(result.current.isBlockedFromSpotnanaTravel).toBe(false);
         expect(result.current.isBetaEnabled(CONST.BETAS.ALL)).toBe(true);
-        expect(result.current.isBetaEnabled(CONST.BETAS.MULTI_LEVEL_TAGS)).toBe(true);
     });
 });