Merge pull request #8966 from Expensify/neil-remove-canUseFreePlan

[No QA] Remove Permissions.canUseFreePlan
Expensify · May 12, 2022 · da85b24 · da85b24
2 parents d958654 + 208e106
commit da85b24
Show file tree

Hide file tree

Showing 5 changed files with 1 addition and 70 deletions.
diff --git a/src/libs/Navigation/Navigation.js b/src/libs/Navigation/Navigation.js
@@ -1,8 +1,6 @@
 import _ from 'underscore';
-import React from 'react';
 import {Keyboard} from 'react-native';
 import {DrawerActions, getPathFromState, StackActions} from '@react-navigation/native';
-import PropTypes from 'prop-types';
 import Onyx from 'react-native-onyx';
 import Log from '../Log';
 import linkTo from './linkTo';
@@ -188,42 +186,13 @@ function isActiveRoute(routePath) {
     return getActiveRoute().substring(1) === routePath;
 }
 
-/**
- * Alternative to the `Navigation.dismissModal()` function that we can use inside
- * the render function of other components to avoid breaking React rules about side-effects.
- *
- * Example:
- * ```jsx
- * if (!Permissions.canUseFreePlan(this.props.betas)) {
- *     return <Navigation.DismissModal />;
- * }
- * ```
- */
-class DismissModal extends React.Component {
-    componentDidMount() {
-        dismissModal(this.props.shouldOpenDrawer);
-    }
-
-    render() {
-        return null;
-    }
-}
-
-DismissModal.propTypes = {
-    shouldOpenDrawer: PropTypes.bool,
-};
-DismissModal.defaultProps = {
-    shouldOpenDrawer: false,
-};
-
 export default {
     canNavigate,
     navigate,
     dismissModal,
     isActiveRoute,
     getActiveRoute,
     goBack,
-    DismissModal,
     closeDrawer,
     getDefaultDrawerState,
     setDidTapNotification,

diff --git a/src/libs/Permissions.js b/src/libs/Permissions.js
@@ -35,14 +35,6 @@ function canUsePayWithExpensify(betas) {
     return _.contains(betas, CONST.BETAS.PAY_WITH_EXPENSIFY) || canUseAllBetas(betas);
 }
 
-/**
- * @param {Array<String>} betas
- * @returns {Boolean}
- */
-function canUseFreePlan(betas) {
-    return _.contains(betas, CONST.BETAS.FREE_PLAN) || canUseAllBetas(betas);
-}
-
 /**
  * @param {Array<String>} betas
  * @returns {Boolean}
@@ -98,7 +90,6 @@ export default {
     canUseChronos,
     canUseIOU,
     canUsePayWithExpensify,
-    canUseFreePlan,
     canUseDefaultRooms,
     canUseInternationalization,
     canUseIOUSend,

diff --git a/src/pages/home/sidebar/SidebarScreen.js b/src/pages/home/sidebar/SidebarScreen.js
@@ -165,7 +165,7 @@ class SidebarScreen extends Component {
                                         onSelected: () => Navigation.navigate(ROUTES.IOU_BILL),
                                     },
                                 ] : []),
-                                ...(!this.props.isCreatingWorkspace && Permissions.canUseFreePlan(this.props.betas) && !Policy.isAdminOfFreePolicy(this.props.allPolicies) ? [
+                                ...(!this.props.isCreatingWorkspace && !Policy.isAdminOfFreePolicy(this.props.allPolicies) ? [
                                     {
                                         icon: Expensicons.NewWorkspace,
                                         iconWidth: 46,

diff --git a/src/pages/workspace/WorkspaceMembersPage.js b/src/pages/workspace/WorkspaceMembersPage.js
@@ -7,7 +7,6 @@ import {
 import PropTypes from 'prop-types';
 import {withOnyx} from 'react-native-onyx';
 import Str from 'expensify-common/lib/str';
-import Log from '../../libs/Log';
 import styles from '../../styles/styles';
 import ONYXKEYS from '../../ONYXKEYS';
 import HeaderWithCloseButton from '../../components/HeaderWithCloseButton';
@@ -22,7 +21,6 @@ import Text from '../../components/Text';
 import ROUTES from '../../ROUTES';
 import ConfirmModal from '../../components/ConfirmModal';
 import personalDetailsPropType from '../personalDetailsPropType';
-import Permissions from '../../libs/Permissions';
 import withWindowDimensions, {windowDimensionsPropTypes} from '../../components/withWindowDimensions';
 import OptionRow from '../../components/OptionRow';
 import CheckboxWithTooltip from '../../components/CheckboxWithTooltip';
@@ -31,9 +29,6 @@ import withFullPolicy, {fullPolicyPropTypes, fullPolicyDefaultProps} from './wit
 import CONST from '../../CONST';
 
 const propTypes = {
-    /** List of betas */
-    betas: PropTypes.arrayOf(PropTypes.string).isRequired,
-
     /** The personal details of the person who is logged in */
     personalDetails: personalDetailsPropType.isRequired,
 
@@ -241,10 +236,6 @@ class WorkspaceMembersPage extends React.Component {
     }
 
     render() {
-        if (!Permissions.canUseFreePlan(this.props.betas)) {
-            Log.info('Not showing workspace people page because user is not on free plan beta');
-            return <Navigation.DismissModal />;
-        }
         const policyEmployeeList = lodashGet(this.props, 'policy.employeeList', []);
         const removableMembers = _.without(this.props.policy.employeeList, this.props.session.email, this.props.policy.owner);
         const data = _.chain(policyEmployeeList)
@@ -334,8 +325,5 @@ export default compose(
         session: {
             key: ONYXKEYS.SESSION,
         },
-        betas: {
-            key: ONYXKEYS.BETAS,
-        },
     }),
 )(WorkspaceMembersPage);
diff --git a/src/pages/workspace/WorkspaceSettingsPage.js b/src/pages/workspace/WorkspaceSettingsPage.js
@@ -1,13 +1,9 @@
 import React from 'react';
 import {View} from 'react-native';
 import {withOnyx} from 'react-native-onyx';
-import PropTypes from 'prop-types';
 import _ from 'underscore';
-import Log from '../../libs/Log';
 import ONYXKEYS from '../../ONYXKEYS';
 import withLocalize, {withLocalizePropTypes} from '../../components/withLocalize';
-import Navigation from '../../libs/Navigation/Navigation';
-import Permissions from '../../libs/Permissions';
 import styles from '../../styles/styles';
 import Button from '../../components/Button';
 import Text from '../../components/Text';
@@ -32,17 +28,12 @@ const propTypes = {
     /** Information about the network from Onyx */
     network: networkPropTypes.isRequired,
 
-    /** List of betas */
-    betas: PropTypes.arrayOf(PropTypes.string),
-
     ...fullPolicyPropTypes,
 
     ...withLocalizePropTypes,
 };
 
 const defaultProps = {
-    betas: [],
-
     ...fullPolicyDefaultProps,
 };
 
@@ -127,11 +118,6 @@ class WorkspaceSettingsPage extends React.Component {
     }
 
     render() {
-        if (!Permissions.canUseFreePlan(this.props.betas)) {
-            Log.info('Not showing workspace editor page because user is not on free plan beta');
-            return <Navigation.DismissModal />;
-        }
-
         if (_.isEmpty(this.props.policy)) {
             return <FullScreenLoadingIndicator />;
         }
@@ -208,9 +194,6 @@ WorkspaceSettingsPage.defaultProps = defaultProps;
 export default compose(
     withFullPolicy,
     withOnyx({
-        betas: {
-            key: ONYXKEYS.BETAS,
-        },
         currencyList: {key: ONYXKEYS.CURRENCY_LIST},
     }),
     withLocalize,