Merge pull request #33827 from Expensify/jasper-deprecatePolicyRoomsBeta

Remove all instances of the `policyRooms` beta
Expensify · Jan 8, 2024 · cd60aae · cd60aae
2 parents 30a91a7 + 38cf1b6
commit cd60aae
Show file tree

Hide file tree

Showing 12 changed files with 119 additions and 161 deletions.
diff --git a/src/CONST.ts b/src/CONST.ts
@@ -269,7 +269,6 @@ const CONST = {
         CHRONOS_IN_CASH: 'chronosInCash',
         DEFAULT_ROOMS: 'defaultRooms',
         BETA_COMMENT_LINKING: 'commentLinking',
-        POLICY_ROOMS: 'policyRooms',
         VIOLATIONS: 'violations',
         REPORT_FIELDS: 'reportFields',
     },

diff --git a/src/libs/Permissions.ts b/src/libs/Permissions.ts
@@ -22,15 +22,6 @@ function canUseReportFields(betas: OnyxEntry<Beta[]>): boolean {
     return !!betas?.includes(CONST.BETAS.REPORT_FIELDS) || canUseAllBetas(betas);
 }
 
-/**
- * We're requiring you to be added to the policy rooms beta on dev,
- * since contributors have been reporting a number of false issues related to the feature being under development.
- * See https://expensify.slack.com/archives/C01GTK53T8Q/p1641921996319400?thread_ts=1641598356.166900&cid=C01GTK53T8Q
- */
-function canUsePolicyRooms(betas: OnyxEntry<Beta[]>): boolean {
-    return !!betas?.includes(CONST.BETAS.POLICY_ROOMS) || canUseAllBetas(betas);
-}
-
 function canUseViolations(betas: OnyxEntry<Beta[]>): boolean {
     return !!betas?.includes(CONST.BETAS.VIOLATIONS) || canUseAllBetas(betas);
 }
@@ -46,7 +37,6 @@ export default {
     canUseChronos,
     canUseDefaultRooms,
     canUseCommentLinking,
-    canUsePolicyRooms,
     canUseLinkPreviews,
     canUseViolations,
     canUseReportFields,

diff --git a/src/libs/__mocks__/Permissions.ts b/src/libs/__mocks__/Permissions.ts
@@ -11,5 +11,4 @@ import type Beta from '@src/types/onyx/Beta';
 export default {
     ...jest.requireActual('../Permissions'),
     canUseDefaultRooms: (betas: Beta[]) => betas.includes(CONST.BETAS.DEFAULT_ROOMS),
-    canUsePolicyRooms: (betas: Beta[]) => betas.includes(CONST.BETAS.POLICY_ROOMS),
 };
diff --git a/src/pages/NewChatPage.js b/src/pages/NewChatPage.js
@@ -16,7 +16,6 @@ import useWindowDimensions from '@hooks/useWindowDimensions';
 import * as Browser from '@libs/Browser';
 import compose from '@libs/compose';
 import * as OptionsListUtils from '@libs/OptionsListUtils';
-import Permissions from '@libs/Permissions';
 import * as ReportUtils from '@libs/ReportUtils';
 import variables from '@styles/variables';
 import * as Report from '@userActions/Report';
@@ -231,9 +230,7 @@ function NewChatPage({betas, isGroupChat, personalDetails, reports, translate, i
                     behavior="padding"
                     // Offset is needed as KeyboardAvoidingView in nested inside of TabNavigator instead of wrapping whole screen.
                     // This is because when wrapping whole screen the screen was freezing when changing Tabs.
-                    keyboardVerticalOffset={
-                        variables.contentHeaderHeight + insets.top + (Permissions.canUsePolicyRooms(betas) ? variables.tabSelectorButtonHeight + variables.tabSelectorButtonPadding : 0)
-                    }
+                    keyboardVerticalOffset={variables.contentHeaderHeight + insets.top + variables.tabSelectorButtonHeight + variables.tabSelectorButtonPadding}
                 >
                     <View style={[styles.flex1, styles.w100, styles.pRelative, selectedOptions.length > 0 ? safeAreaPaddingBottomStyle : {}]}>
                         <OptionsSelector

diff --git a/src/pages/NewChatSelectorPage.js b/src/pages/NewChatSelectorPage.js
@@ -7,7 +7,6 @@ import withLocalize, {withLocalizePropTypes} from '@components/withLocalize';
 import withWindowDimensions, {windowDimensionsPropTypes} from '@components/withWindowDimensions';
 import compose from '@libs/compose';
 import OnyxTabNavigator, {TopTab} from '@libs/Navigation/OnyxTabNavigator';
-import Permissions from '@libs/Permissions';
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
 import NewChatPage from './NewChatPage';
@@ -35,29 +34,25 @@ function NewChatSelectorPage(props) {
             testID={NewChatSelectorPage.displayName}
         >
             <HeaderWithBackButton title={props.translate('sidebarScreen.fabNewChat')} />
-            {Permissions.canUsePolicyRooms(props.betas) ? (
-                <OnyxTabNavigator
-                    id={CONST.TAB.NEW_CHAT_TAB_ID}
-                    tabBar={({state, navigation, position}) => (
-                        <TabSelector
-                            state={state}
-                            navigation={navigation}
-                            position={position}
-                        />
-                    )}
-                >
-                    <TopTab.Screen
-                        name={CONST.TAB.NEW_CHAT}
-                        component={NewChatPage}
+            <OnyxTabNavigator
+                id={CONST.TAB.NEW_CHAT_TAB_ID}
+                tabBar={({state, navigation, position}) => (
+                    <TabSelector
+                        state={state}
+                        navigation={navigation}
+                        position={position}
                     />
-                    <TopTab.Screen
-                        name={CONST.TAB.NEW_ROOM}
-                        component={WorkspaceNewRoomPage}
-                    />
-                </OnyxTabNavigator>
-            ) : (
-                <NewChatPage />
-            )}
+                )}
+            >
+                <TopTab.Screen
+                    name={CONST.TAB.NEW_CHAT}
+                    component={NewChatPage}
+                />
+                <TopTab.Screen
+                    name={CONST.TAB.NEW_ROOM}
+                    component={WorkspaceNewRoomPage}
+                />
+            </OnyxTabNavigator>
         </ScreenWrapper>
     );
 }

diff --git a/src/pages/workspace/WorkspaceNewRoomPage.js b/src/pages/workspace/WorkspaceNewRoomPage.js
@@ -4,7 +4,6 @@ import {View} from 'react-native';
 import {withOnyx} from 'react-native-onyx';
 import _ from 'underscore';
 import BlockingView from '@components/BlockingViews/BlockingView';
-import FullPageNotFoundView from '@components/BlockingViews/FullPageNotFoundView';
 import Button from '@components/Button';
 import FormProvider from '@components/Form/FormProvider';
 import InputWrapper from '@components/Form/InputWrapper';
@@ -25,7 +24,6 @@ import useWindowDimensions from '@hooks/useWindowDimensions';
 import compose from '@libs/compose';
 import * as ErrorUtils from '@libs/ErrorUtils';
 import Navigation from '@libs/Navigation/Navigation';
-import Permissions from '@libs/Permissions';
 import * as PolicyUtils from '@libs/PolicyUtils';
 import * as ReportUtils from '@libs/ReportUtils';
 import * as ValidationUtils from '@libs/ValidationUtils';
@@ -48,9 +46,6 @@ const propTypes = {
         policyID: PropTypes.string,
     }),
 
-    /** List of betas available to current user */
-    betas: PropTypes.arrayOf(PropTypes.string),
-
     /** The list of policies the user has access to. */
     policies: PropTypes.objectOf(
         PropTypes.shape({
@@ -84,7 +79,6 @@ const propTypes = {
     }),
 };
 const defaultProps = {
-    betas: [],
     reports: {},
     policies: {},
     formState: {
@@ -246,96 +240,94 @@ function WorkspaceNewRoomPage(props) {
     );
 
     return (
-        <FullPageNotFoundView shouldShow={!Permissions.canUsePolicyRooms(props.betas)}>
-            <ScreenWrapper
-                shouldEnableKeyboardAvoidingView={false}
-                includeSafeAreaPaddingBottom={isOffline}
-                shouldShowOfflineIndicator={false}
-                includePaddingTop={false}
-                shouldEnablePickerAvoiding={false}
-                testID={WorkspaceNewRoomPage.displayName}
-            >
-                {({insets}) =>
-                    workspaceOptions.length === 0 ? (
-                        renderEmptyWorkspaceView()
-                    ) : (
-                        <KeyboardAvoidingView
-                            style={styles.h100}
-                            behavior="padding"
-                            // Offset is needed as KeyboardAvoidingView in nested inside of TabNavigator instead of wrapping whole screen.
-                            // This is because when wrapping whole screen the screen was freezing when changing Tabs.
-                            keyboardVerticalOffset={variables.contentHeaderHeight + variables.tabSelectorButtonHeight + variables.tabSelectorButtonPadding + insets.top}
+        <ScreenWrapper
+            shouldEnableKeyboardAvoidingView={false}
+            includeSafeAreaPaddingBottom={isOffline}
+            shouldShowOfflineIndicator={false}
+            includePaddingTop={false}
+            shouldEnablePickerAvoiding={false}
+            testID={WorkspaceNewRoomPage.displayName}
+        >
+            {({insets}) =>
+                workspaceOptions.length === 0 ? (
+                    renderEmptyWorkspaceView()
+                ) : (
+                    <KeyboardAvoidingView
+                        style={styles.h100}
+                        behavior="padding"
+                        // Offset is needed as KeyboardAvoidingView in nested inside of TabNavigator instead of wrapping whole screen.
+                        // This is because when wrapping whole screen the screen was freezing when changing Tabs.
+                        keyboardVerticalOffset={variables.contentHeaderHeight + variables.tabSelectorButtonHeight + variables.tabSelectorButtonPadding + insets.top}
+                    >
+                        <FormProvider
+                            formID={ONYXKEYS.FORMS.NEW_ROOM_FORM}
+                            submitButtonText={translate('newRoomPage.createRoom')}
+                            style={[styles.mh5, styles.flexGrow1]}
+                            validate={validate}
+                            onSubmit={submit}
+                            enabledWhenOffline
                         >
-                            <FormProvider
-                                formID={ONYXKEYS.FORMS.NEW_ROOM_FORM}
-                                submitButtonText={translate('newRoomPage.createRoom')}
-                                style={[styles.mh5, styles.flexGrow1]}
-                                validate={validate}
-                                onSubmit={submit}
-                                enabledWhenOffline
-                            >
-                                <View style={styles.mb5}>
-                                    <InputWrapper
-                                        InputComponent={RoomNameInput}
-                                        ref={inputCallbackRef}
-                                        inputID="roomName"
-                                        isFocused={props.isFocused}
-                                        shouldDelayFocus
-                                        autoFocus
-                                    />
-                                </View>
-                                <View style={styles.mb5}>
-                                    <InputWrapper
-                                        InputComponent={TextInput}
-                                        inputID="welcomeMessage"
-                                        label={translate('welcomeMessagePage.welcomeMessageOptional')}
-                                        accessibilityLabel={translate('welcomeMessagePage.welcomeMessageOptional')}
-                                        role={CONST.ACCESSIBILITY_ROLE.TEXT}
-                                        autoGrowHeight
-                                        maxLength={CONST.MAX_COMMENT_LENGTH}
-                                        autoCapitalize="none"
-                                        containerStyles={[styles.autoGrowHeightMultilineInput]}
-                                    />
-                                </View>
-                                <View style={[styles.mhn5]}>
-                                    <InputWrapper
-                                        InputComponent={ValuePicker}
-                                        inputID="policyID"
-                                        label={translate('workspace.common.workspace')}
-                                        items={workspaceOptions}
-                                        onValueChange={setPolicyID}
-                                    />
-                                </View>
-                                {isPolicyAdmin && (
-                                    <View style={styles.mhn5}>
-                                        <InputWrapper
-                                            InputComponent={ValuePicker}
-                                            inputID="writeCapability"
-                                            label={translate('writeCapabilityPage.label')}
-                                            items={writeCapabilityOptions}
-                                            value={writeCapability}
-                                            onValueChange={setWriteCapability}
-                                        />
-                                    </View>
-                                )}
-                                <View style={[styles.mb1, styles.mhn5]}>
+                            <View style={styles.mb5}>
+                                <InputWrapper
+                                    InputComponent={RoomNameInput}
+                                    ref={inputCallbackRef}
+                                    inputID="roomName"
+                                    isFocused={props.isFocused}
+                                    shouldDelayFocus
+                                    autoFocus
+                                />
+                            </View>
+                            <View style={styles.mb5}>
+                                <InputWrapper
+                                    InputComponent={TextInput}
+                                    inputID="welcomeMessage"
+                                    label={translate('welcomeMessagePage.welcomeMessageOptional')}
+                                    accessibilityLabel={translate('welcomeMessagePage.welcomeMessageOptional')}
+                                    role={CONST.ACCESSIBILITY_ROLE.TEXT}
+                                    autoGrowHeight
+                                    maxLength={CONST.MAX_COMMENT_LENGTH}
+                                    autoCapitalize="none"
+                                    containerStyles={[styles.autoGrowHeightMultilineInput]}
+                                />
+                            </View>
+                            <View style={[styles.mhn5]}>
+                                <InputWrapper
+                                    InputComponent={ValuePicker}
+                                    inputID="policyID"
+                                    label={translate('workspace.common.workspace')}
+                                    items={workspaceOptions}
+                                    onValueChange={setPolicyID}
+                                />
+                            </View>
+                            {isPolicyAdmin && (
+                                <View style={styles.mhn5}>
                                     <InputWrapper
                                         InputComponent={ValuePicker}
-                                        inputID="visibility"
-                                        label={translate('newRoomPage.visibility')}
-                                        items={visibilityOptions}
-                                        onValueChange={setVisibility}
-                                        value={visibility}
-                                        furtherDetails={visibilityDescription}
+                                        inputID="writeCapability"
+                                        label={translate('writeCapabilityPage.label')}
+                                        items={writeCapabilityOptions}
+                                        value={writeCapability}
+                                        onValueChange={setWriteCapability}
                                     />
                                 </View>
-                            </FormProvider>
-                            {isSmallScreenWidth && <OfflineIndicator />}
-                        </KeyboardAvoidingView>
-                    )
-                }
-            </ScreenWrapper>
-        </FullPageNotFoundView>
+                            )}
+                            <View style={[styles.mb1, styles.mhn5]}>
+                                <InputWrapper
+                                    InputComponent={ValuePicker}
+                                    inputID="visibility"
+                                    label={translate('newRoomPage.visibility')}
+                                    items={visibilityOptions}
+                                    onValueChange={setVisibility}
+                                    value={visibility}
+                                    furtherDetails={visibilityDescription}
+                                />
+                            </View>
+                        </FormProvider>
+                        {isSmallScreenWidth && <OfflineIndicator />}
+                    </KeyboardAvoidingView>
+                )
+            }
+        </ScreenWrapper>
     );
 }
 

diff --git a/tests/perf-test/ReportScreen.perf-test.js b/tests/perf-test/ReportScreen.perf-test.js
@@ -208,7 +208,7 @@ test.skip('[ReportScreen] should render ReportScreen with composer interactions'
                 [`${ONYXKEYS.COLLECTION.REPORT}${mockRoute.params.reportID}`]: report,
                 [`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${mockRoute.params.reportID}`]: reportActions,
                 [ONYXKEYS.PERSONAL_DETAILS_LIST]: LHNTestUtils.fakePersonalDetails,
-                [ONYXKEYS.BETAS]: [CONST.BETAS.DEFAULT_ROOMS, CONST.BETAS.POLICY_ROOMS],
+                [ONYXKEYS.BETAS]: [CONST.BETAS.DEFAULT_ROOMS],
                 [`${ONYXKEYS.COLLECTION.POLICY}${policy.policyID}`]: policy,
                 [`${ONYXKEYS.COLLECTION.REPORT_METADATA}${mockRoute.params.reportID}`]: {
                     isLoadingReportActions: false,
@@ -273,7 +273,7 @@ test.skip('[ReportScreen] should press of the report item', () => {
                 [`${ONYXKEYS.COLLECTION.REPORT}${mockRoute.params.reportID}`]: report,
                 [`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${mockRoute.params.reportID}`]: reportActions,
                 [ONYXKEYS.PERSONAL_DETAILS_LIST]: LHNTestUtils.fakePersonalDetails,
-                [ONYXKEYS.BETAS]: [CONST.BETAS.DEFAULT_ROOMS, CONST.BETAS.POLICY_ROOMS],
+                [ONYXKEYS.BETAS]: [CONST.BETAS.DEFAULT_ROOMS],
                 [`${ONYXKEYS.COLLECTION.POLICY}${policy.policyID}`]: policy,
                 [`${ONYXKEYS.COLLECTION.REPORT_METADATA}${mockRoute.params.reportID}`]: {
                     isLoadingReportActions: false,

diff --git a/tests/perf-test/SidebarLinks.perf-test.js b/tests/perf-test/SidebarLinks.perf-test.js
@@ -67,7 +67,7 @@ test('[SidebarLinks] should render Sidebar with 500 reports stored', () => {
             Onyx.multiSet({
                 [ONYXKEYS.NVP_PRIORITY_MODE]: CONST.PRIORITY_MODE.DEFAULT,
                 [ONYXKEYS.PERSONAL_DETAILS_LIST]: LHNTestUtils.fakePersonalDetails,
-                [ONYXKEYS.BETAS]: [CONST.BETAS.DEFAULT_ROOMS, CONST.BETAS.POLICY_ROOMS],
+                [ONYXKEYS.BETAS]: [CONST.BETAS.DEFAULT_ROOMS],
                 [ONYXKEYS.NVP_PRIORITY_MODE]: CONST.PRIORITY_MODE.GSD,
                 [ONYXKEYS.IS_LOADING_REPORT_DATA]: false,
                 ...mockedResponseMap,
@@ -111,7 +111,7 @@ test('[SidebarLinks] should scroll and click some of the items', () => {
             Onyx.multiSet({
                 [ONYXKEYS.NVP_PRIORITY_MODE]: CONST.PRIORITY_MODE.DEFAULT,
                 [ONYXKEYS.PERSONAL_DETAILS_LIST]: LHNTestUtils.fakePersonalDetails,
-                [ONYXKEYS.BETAS]: [CONST.BETAS.DEFAULT_ROOMS, CONST.BETAS.POLICY_ROOMS],
+                [ONYXKEYS.BETAS]: [CONST.BETAS.DEFAULT_ROOMS],
                 [ONYXKEYS.NVP_PRIORITY_MODE]: CONST.PRIORITY_MODE.GSD,
                 [ONYXKEYS.IS_LOADING_REPORT_DATA]: false,
                 ...mockedResponseMap,

diff --git a/tests/perf-test/SidebarUtils.perf-test.ts b/tests/perf-test/SidebarUtils.perf-test.ts
@@ -64,7 +64,7 @@ test('[SidebarUtils] getOptionData on 5k reports', async () => {
 test('[SidebarUtils] getOrderedReportIDs on 5k reports', async () => {
     const currentReportId = '1';
     const allReports = getMockedReports();
-    const betas = [CONST.BETAS.DEFAULT_ROOMS, CONST.BETAS.POLICY_ROOMS];
+    const betas = [CONST.BETAS.DEFAULT_ROOMS];
 
     const policies = createCollection<Policy>(
         (item) => `${ONYXKEYS.COLLECTION.POLICY}${item.id}`,