From ea3c03ce14013eae9946adce013f8bb4ee6c4e0e Mon Sep 17 00:00:00 2001
From: Amal Nazeem <amal@expensify.com>
Date: Tue, 27 Jul 2021 16:01:23 -0400
Subject: [PATCH 1/3] Add beta check to Workspaces page

---
 src/pages/workspace/WorkspaceCardPage.js | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/src/pages/workspace/WorkspaceCardPage.js b/src/pages/workspace/WorkspaceCardPage.js
index 98f18de118736..b77f05efce9f6 100644
--- a/src/pages/workspace/WorkspaceCardPage.js
+++ b/src/pages/workspace/WorkspaceCardPage.js
@@ -20,12 +20,16 @@ import themeDefault from '../../styles/themes/default';
 import ROUTES from '../../ROUTES';
 import CONFIG from '../../CONFIG';
 import CONST from '../../CONST';
+import Permissions from '../../libs/Permissions';
 import HeroCardWebImage from '../../../assets/images/cascading-cards-web.svg';
 import HeroCardMobileImage from '../../../assets/images/cascading-cards-mobile.svg';
 
 const propTypes = {
     /* Onyx Props */
 
+    /** Beta features list */
+    betas: PropTypes.arrayOf(PropTypes.string).isRequired,
+
     /** The details about the user that is signed in */
     user: PropTypes.shape({
         /** Whether or not the user has public domain */
@@ -65,6 +69,7 @@ const publicLink = CONFIG.EXPENSIFY.URL_EXPENSIFY_COM + CONST.ADD_SECONDARY_LOGI
 const manageCardLink = CONFIG.EXPENSIFY.URL_EXPENSIFY_COM + CONST.MANAGE_CARDS_URL;
 
 const WorkspaceCardPage = ({
+    betas,
     user,
     translate,
     isSmallScreenWidth,
@@ -92,6 +97,11 @@ const WorkspaceCardPage = ({
         }
     };
 
+    if (!Permissions.canUseFreePlan(betas)) {
+        console.debug('Not showing workspace card page because user is not on free plan beta');
+        return <Navigation.DismissModal />;
+    }
+
     return (
         <ScreenWrapper style={[styles.defaultModalContainer]}>
             <HeaderWithCloseButton
@@ -193,5 +203,8 @@ export default compose(
         reimbursementAccount: {
             key: ONYXKEYS.REIMBURSEMENT_ACCOUNT,
         },
+        betas: {
+            key: ONYXKEYS.BETAS,
+        },
     }),
 )(WorkspaceCardPage);

From 63ed060bf540ecd4a25f989552fefe0dbaada7ce Mon Sep 17 00:00:00 2001
From: Amal Nazeem <amal@expensify.com>
Date: Tue, 27 Jul 2021 19:29:15 -0400
Subject: [PATCH 2/3] Add beta check to people page as well

---
 src/pages/workspace/WorkspacePeoplePage.js | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/src/pages/workspace/WorkspacePeoplePage.js b/src/pages/workspace/WorkspacePeoplePage.js
index abbcd2c81d352..bf2325860730d 100644
--- a/src/pages/workspace/WorkspacePeoplePage.js
+++ b/src/pages/workspace/WorkspacePeoplePage.js
@@ -21,6 +21,7 @@ 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 '../home/sidebar/OptionRow';
 
@@ -29,6 +30,9 @@ const propTypes = {
 
     ...windowDimensionsPropTypes,
 
+    /** List of betas */
+    betas: PropTypes.arrayOf(PropTypes.string),
+
     /** The personal details of the person who is logged in */
     personalDetails: personalDetailsPropType.isRequired,
 
@@ -204,6 +208,10 @@ class WorkspacePeoplePage extends React.Component {
     }
 
     render() {
+        if (!Permissions.canUseFreePlan(this.props.betas)) {
+            console.debug('Not showing workspace people page because user is not on free plan beta');
+            return <Navigation.DismissModal />;
+        }
         const policyEmployeeList = lodashGet(this.props, 'policy.employeeList', []);
         const data = _.chain(policyEmployeeList)
             .map(email => this.props.personalDetails[email])
@@ -285,5 +293,8 @@ export default compose(
         session: {
             key: ONYXKEYS.SESSION,
         },
+        betas : {
+            key: ONYXKEYS.BETAS,
+        },
     }),
 )(WorkspacePeoplePage);

From 03132080b0613a8d8cabc955635cdfa05d055896 Mon Sep 17 00:00:00 2001
From: Amal Nazeem <amal@expensify.com>
Date: Tue, 27 Jul 2021 20:02:56 -0400
Subject: [PATCH 3/3] style fixes

---
 src/pages/workspace/WorkspacePeoplePage.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/pages/workspace/WorkspacePeoplePage.js b/src/pages/workspace/WorkspacePeoplePage.js
index bf2325860730d..a396454083fe8 100644
--- a/src/pages/workspace/WorkspacePeoplePage.js
+++ b/src/pages/workspace/WorkspacePeoplePage.js
@@ -31,7 +31,7 @@ const propTypes = {
     ...windowDimensionsPropTypes,
 
     /** List of betas */
-    betas: PropTypes.arrayOf(PropTypes.string),
+    betas: PropTypes.arrayOf(PropTypes.string).isRequired,
 
     /** The personal details of the person who is logged in */
     personalDetails: personalDetailsPropType.isRequired,
@@ -293,7 +293,7 @@ export default compose(
         session: {
             key: ONYXKEYS.SESSION,
         },
-        betas : {
+        betas: {
             key: ONYXKEYS.BETAS,
         },
     }),