diff --git a/src/CONST/index.ts b/src/CONST/index.ts index 21102c4e1fc6..08be383a4129 100644 --- a/src/CONST/index.ts +++ b/src/CONST/index.ts @@ -992,7 +992,6 @@ const CONST = { BULK_EDIT_WORKSPACES: 'bulkEditWorkspaces', SUBMIT_2026: 'submit2026', BULK_SUBMIT_APPROVE_PAY: 'bulkSubmitApprovePay', - WORKSPACE_ROOMS_PAGE: 'workspaceRoomsPage', VENDOR_MATCHING: 'vendorMatching', RILLET: 'rillet', RULES_REVAMP: 'rulesRevamp', diff --git a/src/pages/workspace/WorkspaceInitialPage.tsx b/src/pages/workspace/WorkspaceInitialPage.tsx index f77c6e6b02ef..486096964219 100644 --- a/src/pages/workspace/WorkspaceInitialPage.tsx +++ b/src/pages/workspace/WorkspaceInitialPage.tsx @@ -284,17 +284,14 @@ function WorkspaceInitialPage({policyDraft, policy: policyProp, route}: Workspac screenName: SCREENS.WORKSPACE.MEMBERS, sentryLabel: CONST.SENTRY_LABEL.WORKSPACE.INITIAL.MEMBERS, }, - ]; - - if (isBetaEnabled(CONST.BETAS.WORKSPACE_ROOMS_PAGE)) { - workspaceMenuItems.push({ + { translationKey: 'workspace.common.rooms', icon: expensifyIcons.Hashtag, action: singleExecution(waitForNavigate(() => Navigation.navigate(ROUTES.WORKSPACE_ROOMS.getRoute(policyID)))), screenName: SCREENS.WORKSPACE.ROOMS, sentryLabel: CONST.SENTRY_LABEL.WORKSPACE.INITIAL.ROOMS, - }); - } + }, + ]; if (isGroupPolicy(policy) && shouldShowProtectedItems) { if (canReadPolicyFeature(CONST.POLICY.POLICY_FEATURE.REPORT_FIELDS)) { diff --git a/src/pages/workspace/rooms/WorkspaceRoomCreatePage.tsx b/src/pages/workspace/rooms/WorkspaceRoomCreatePage.tsx index 067b32434ed0..67dc9779b4c6 100644 --- a/src/pages/workspace/rooms/WorkspaceRoomCreatePage.tsx +++ b/src/pages/workspace/rooms/WorkspaceRoomCreatePage.tsx @@ -1,12 +1,9 @@ -import usePermissions from '@hooks/usePermissions'; - import type {PlatformStackScreenProps} from '@libs/Navigation/PlatformStackNavigation/types'; import type {SettingsNavigatorParamList} from '@libs/Navigation/types'; import AccessOrNotFoundWrapper from '@pages/workspace/AccessOrNotFoundWrapper'; import WorkspaceNewRoomPage from '@pages/workspace/WorkspaceNewRoomPage'; -import CONST from '@src/CONST'; import type SCREENS from '@src/SCREENS'; import React from 'react'; @@ -14,12 +11,8 @@ import React from 'react'; type WorkspaceRoomCreatePageProps = PlatformStackScreenProps; function WorkspaceRoomCreatePage({route}: WorkspaceRoomCreatePageProps) { - const {isBetaEnabled} = usePermissions(); return ( - + ); diff --git a/src/pages/workspace/rooms/WorkspaceRoomsPage.tsx b/src/pages/workspace/rooms/WorkspaceRoomsPage.tsx index 3789df84b2fc..8fb8bd923994 100644 --- a/src/pages/workspace/rooms/WorkspaceRoomsPage.tsx +++ b/src/pages/workspace/rooms/WorkspaceRoomsPage.tsx @@ -8,7 +8,6 @@ import type {WorkspaceRoomRowData} from '@components/Tables/WorkspaceRoomsTable' import {useMemoizedLazyExpensifyIcons, useMemoizedLazyIllustrations} from '@hooks/useLazyAsset'; import useLocalize from '@hooks/useLocalize'; import useOnyx from '@hooks/useOnyx'; -import usePermissions from '@hooks/usePermissions'; import usePolicy from '@hooks/usePolicy'; import useReportAttributes from '@hooks/useReportAttributes'; import useResponsiveLayout from '@hooks/useResponsiveLayout'; @@ -28,7 +27,6 @@ import type {WorkspaceSplitNavigatorParamList} from '@navigation/types'; import AccessOrNotFoundWrapper from '@pages/workspace/AccessOrNotFoundWrapper'; -import CONST from '@src/CONST'; import ONYXKEYS from '@src/ONYXKEYS'; import ROUTES, {DYNAMIC_ROUTES} from '@src/ROUTES'; import type SCREENS from '@src/SCREENS'; @@ -44,7 +42,6 @@ function WorkspaceRoomsPage({route}: WorkspaceRoomsPageProps) { const {translate} = useLocalize(); const styles = useThemeStyles(); const {shouldUseNarrowLayout} = useResponsiveLayout(); - const {isBetaEnabled} = usePermissions(); const headerIcons = useMemoizedLazyExpensifyIcons(['Plus']); const illustrations = useMemoizedLazyIllustrations(['Hashtag']); const policyID = route.params.policyID; @@ -94,10 +91,7 @@ function WorkspaceRoomsPage({route}: WorkspaceRoomsPageProps) { }); return ( - +