@@ -28,7 +28,7 @@ import useLocalize from '@hooks/useLocalize';
2828import useMobileSelectionMode from '@hooks/useMobileSelectionMode' ;
2929import useNetwork from '@hooks/useNetwork' ;
3030import useOnyx from '@hooks/useOnyx' ;
31- import usePermissions from '@hooks/usePermissions' ;
31+
3232import usePolicy from '@hooks/usePolicy' ;
3333import useResponsiveLayout from '@hooks/useResponsiveLayout' ;
3434import 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 ] ) ;
0 commit comments