Skip to content

Commit 8d0752a

Browse files
committed
Remove multiLevelTags beta
1 parent d40d0af commit 8d0752a

3 files changed

Lines changed: 12 additions & 22 deletions

File tree

src/CONST/index.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -639,7 +639,6 @@ const CONST = {
639639
CUSTOM_RULES: 'customRules',
640640
GLOBAL_REIMBURSEMENTS_ON_ND: 'globalReimbursementsOnND',
641641
IS_TRAVEL_VERIFIED: 'isTravelVerified',
642-
MULTI_LEVEL_TAGS: 'multiLevelTags',
643642
NEWDOT_MULTI_FILES_DRAG_AND_DROP: 'newDotMultiFilesDragAndDrop',
644643
NEWDOT_MULTI_SCAN: 'newDotMultiScan',
645644
PLAID_COMPANY_CARDS: 'plaidCompanyCards',

src/pages/workspace/tags/WorkspaceTagsPage.tsx

Lines changed: 12 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ import useLocalize from '@hooks/useLocalize';
2828
import useMobileSelectionMode from '@hooks/useMobileSelectionMode';
2929
import useNetwork from '@hooks/useNetwork';
3030
import useOnyx from '@hooks/useOnyx';
31-
import usePermissions from '@hooks/usePermissions';
31+
3232
import usePolicy from '@hooks/usePolicy';
3333
import useResponsiveLayout from '@hooks/useResponsiveLayout';
3434
import useSearchBackPress from '@hooks/useSearchBackPress';
@@ -112,7 +112,6 @@ function WorkspaceTagsPage({route}: WorkspaceTagsPageProps) {
112112
openPolicyTagsPage(policyID);
113113
}, [policyID]);
114114
const isQuickSettingsFlow = route.name === SCREENS.SETTINGS_TAGS.SETTINGS_TAGS_ROOT;
115-
const {isBetaEnabled} = usePermissions();
116115

117116
const tagsList = useMemo(() => {
118117
if (isMultiLevelTags) {
@@ -192,7 +191,7 @@ function WorkspaceTagsPage({route}: WorkspaceTagsPageProps) {
192191
required: policyTagList.required,
193192
isDisabledCheckbox: isSwitchDisabled,
194193
rightElement:
195-
isBetaEnabled(CONST.BETAS.MULTI_LEVEL_TAGS) && hasDependentTags ? (
194+
hasDependentTags ? (
196195
<ListItemRightCaretWithLabel
197196
labelText={translate('workspace.tags.tagCount', {count: Object.keys(policyTagList?.tags ?? {}).length})}
198197
shouldShowCaret
@@ -241,7 +240,7 @@ function WorkspaceTagsPage({route}: WorkspaceTagsPageProps) {
241240
/>
242241
),
243242
}));
244-
}, [isMultiLevelTags, policyTagLists, isBetaEnabled, hasDependentTags, translate, policy, policyTags, updateWorkspaceRequiresTag, updateWorkspaceTagEnabled]);
243+
}, [isMultiLevelTags, policyTagLists, hasDependentTags, translate, policy, policyTags, updateWorkspaceRequiresTag, updateWorkspaceTagEnabled]);
245244

246245
const filterTag = useCallback((tag: TagListItem, searchInput: string) => {
247246
const tagText = StringUtils.normalize(tag.text?.toLowerCase() ?? '');
@@ -286,7 +285,7 @@ function WorkspaceTagsPage({route}: WorkspaceTagsPageProps) {
286285
};
287286

288287
const getCustomListHeader = () => {
289-
if (isBetaEnabled(CONST.BETAS.MULTI_LEVEL_TAGS) && hasDependentTags) {
288+
if (hasDependentTags) {
290289
return (
291290
<CustomListHeader
292291
canSelectMultiple={false}
@@ -345,18 +344,12 @@ function WorkspaceTagsPage({route}: WorkspaceTagsPageProps) {
345344
close(() => setIsOfflineModalVisible(true));
346345
return;
347346
}
348-
if (isBetaEnabled(CONST.BETAS.MULTI_LEVEL_TAGS)) {
349-
Navigation.navigate(
350-
isQuickSettingsFlow
351-
? ROUTES.SETTINGS_TAGS_IMPORT.getRoute(policyID, ROUTES.SETTINGS_TAGS_ROOT.getRoute(policyID, backTo))
352-
: ROUTES.WORKSPACE_TAGS_IMPORT_OPTIONS.getRoute(policyID),
353-
);
354-
} else {
355-
Navigation.navigate(
356-
isQuickSettingsFlow ? ROUTES.SETTINGS_TAGS_IMPORT.getRoute(policyID, ROUTES.SETTINGS_TAGS_ROOT.getRoute(policyID, backTo)) : ROUTES.WORKSPACE_TAGS_IMPORT.getRoute(policyID),
357-
);
358-
}
359-
}, [backTo, isOffline, isQuickSettingsFlow, policyID, isBetaEnabled]);
347+
Navigation.navigate(
348+
isQuickSettingsFlow
349+
? ROUTES.SETTINGS_TAGS_IMPORT.getRoute(policyID, ROUTES.SETTINGS_TAGS_ROOT.getRoute(policyID, backTo))
350+
: ROUTES.WORKSPACE_TAGS_IMPORT_OPTIONS.getRoute(policyID),
351+
);
352+
}, [backTo, isOffline, isQuickSettingsFlow, policyID]);
360353

361354
const hasAccountingConnections = hasAccountingConnectionsPolicyUtils(policy);
362355
const secondaryActions = useMemo(() => {
@@ -387,7 +380,7 @@ function WorkspaceTagsPage({route}: WorkspaceTagsPageProps) {
387380
return;
388381
}
389382
close(() => {
390-
if (hasIndependentTags && isBetaEnabled(CONST.BETAS.MULTI_LEVEL_TAGS)) {
383+
if (hasIndependentTags) {
391384
downloadMultiLevelIndependentTagsCSV(policyID, () => {
392385
setIsDownloadFailureModalVisible(true);
393386
});
@@ -403,7 +396,7 @@ function WorkspaceTagsPage({route}: WorkspaceTagsPageProps) {
403396
}
404397

405398
return menuItems;
406-
}, [translate, navigateToTagsSettings, isBetaEnabled, hasDependentTags, hasVisibleTags, isOffline, policyID, hasIndependentTags, hasAccountingConnections, navigateToImportSpreadsheet]);
399+
}, [translate, navigateToTagsSettings, hasDependentTags, hasVisibleTags, isOffline, policyID, hasIndependentTags, hasAccountingConnections, navigateToImportSpreadsheet]);
407400

408401
const getHeaderButtons = () => {
409402
const selectedTagsObject = selectedTags.map((key) => policyTagLists.at(0)?.tags?.[key]);

tests/unit/usePermissionsTest.tsx

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,6 @@ describe('usePermissions', () => {
6565
// Initially, check the value for the initial betas
6666
expect(result.current.isBetaEnabled(CONST.BETAS.DEFAULT_ROOMS)).toBe(true);
6767
expect(result.current.isBlockedFromSpotnanaTravel).toBe(true);
68-
expect(result.current.isBetaEnabled(CONST.BETAS.MULTI_LEVEL_TAGS)).toBe(false);
6968
expect(result.current.isBetaEnabled(CONST.BETAS.ALL)).toBe(false);
7069

7170
Onyx.merge(ONYXKEYS.BETAS, updatedBetas);
@@ -75,6 +74,5 @@ describe('usePermissions', () => {
7574
// After update, check the value for the updated betas
7675
expect(result.current.isBlockedFromSpotnanaTravel).toBe(false);
7776
expect(result.current.isBetaEnabled(CONST.BETAS.ALL)).toBe(true);
78-
expect(result.current.isBetaEnabled(CONST.BETAS.MULTI_LEVEL_TAGS)).toBe(true);
7977
});
8078
});

0 commit comments

Comments
 (0)