Skip to content

Add policy rooms to its own beta, and restrict this beta on dev #7130

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
jasperhuangg merged 4 commits into from
Jan 12, 2022
Merged

Add policy rooms to its own beta, and restrict this beta on dev #7130

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2e2e835
Add policy rooms to its own beta, and restrict this beta on dev
jasperhuangg Jan 11, 2022
5e7ec60
Add policy rooms to its own beta, and restrict this beta on dev
jasperhuangg Jan 11, 2022
50ebc74
Add policy rooms to its own beta, and restrict this beta on dev
jasperhuangg Jan 11, 2022
bbf85bb
prevent policy rooms from appearing in the LHN
jasperhuangg Jan 11, 2022
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: 1 addition & 0 deletions src/CONST.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,7 @@ const CONST = {
BETA_EXPENSIFY_WALLET: 'expensifyWallet',
INTERNATIONALIZATION: 'internationalization',
IOU_SEND: 'sendMoney',
POLICY_ROOMS: 'policyRooms',
},
BUTTON_STATES: {
DEFAULT: 'default',
Expand Down
4 changes: 4 additions & 0 deletions src/libs/OptionsListUtils.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -415,6 +415,10 @@ function getOptions(reports, personalDetails, activeReportID, {
return;
}

if (ReportUtils.isUserCreatedPolicyRoom(report) && !Permissions.canUsePolicyRooms(betas)) {
return;
}

const reportPersonalDetails = getPersonalDetailsForLogins(logins, personalDetails);

// Save the report in the map if this is a single participant so we can associate the reportID with the
Expand Down
13 changes: 13 additions & 0 deletions src/libs/Permissions.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,18 @@ function canUseWallet(betas) {
return _.contains(betas, CONST.BETAS.BETA_EXPENSIFY_WALLET) || 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
* @param {Array<String>} betas
* @returns {Boolean}
*/

function canUsePolicyRooms(betas) {
return _.contains(betas, CONST.BETAS.POLICY_ROOMS) || _.contains(betas, CONST.BETAS.ALL);
}

export default {
canUseChronos,
canUseIOU,
Expand All @@ -86,4 +98,5 @@ export default {
canUseInternationalization,
canUseIOUSend,
canUseWallet,
canUsePolicyRooms,
};
2 changes: 1 addition & 1 deletion src/pages/home/sidebar/SidebarScreen.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@ class SidebarScreen extends Component {
text: this.props.translate('sidebarScreen.newGroup'),
onSelected: () => Navigation.navigate(ROUTES.NEW_GROUP),
},
...(Permissions.canUseDefaultRooms(this.props.betas) ? [
...(Permissions.canUsePolicyRooms(this.props.betas) ? [
{
icon: Expensicons.Hashtag,
text: this.props.translate('sidebarScreen.newRoom'),
Expand Down