Skip to content

Remove workspaceRoomsPage beta and release Workspace Rooms page #96603

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
grgia merged 1 commit into from
Jul 21, 2026
+5 −22
Merged

Remove workspaceRoomsPage beta and release Workspace Rooms page #96603

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion src/CONST/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down
9 changes: 3 additions & 6 deletions src/pages/workspace/WorkspaceInitialPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)) {
Expand Down
9 changes: 1 addition & 8 deletions src/pages/workspace/rooms/WorkspaceRoomCreatePage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,25 +1,18 @@
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';

type WorkspaceRoomCreatePageProps = PlatformStackScreenProps<SettingsNavigatorParamList, typeof SCREENS.WORKSPACE.ROOM_CREATE>;

function WorkspaceRoomCreatePage({route}: WorkspaceRoomCreatePageProps) {
const {isBetaEnabled} = usePermissions();
return (
<AccessOrNotFoundWrapper
policyID={route.params.policyID}
shouldBeBlocked={!isBetaEnabled(CONST.BETAS.WORKSPACE_ROOMS_PAGE)}
>
<AccessOrNotFoundWrapper policyID={route.params.policyID}>
<WorkspaceNewRoomPage policyID={route.params.policyID} />
</AccessOrNotFoundWrapper>
);
Expand Down
8 changes: 1 addition & 7 deletions src/pages/workspace/rooms/WorkspaceRoomsPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand All @@ -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';
Expand All @@ -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;
Expand Down Expand Up @@ -94,10 +91,7 @@ function WorkspaceRoomsPage({route}: WorkspaceRoomsPageProps) {
});

return (
<AccessOrNotFoundWrapper
policyID={policyID}
shouldBeBlocked={!isBetaEnabled(CONST.BETAS.WORKSPACE_ROOMS_PAGE)}
>
<AccessOrNotFoundWrapper policyID={policyID}>
<ScreenWrapper
testID={WorkspaceRoomsPage.displayName}
style={[styles.defaultModalContainer]}
Expand Down
Loading