Skip to content
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.

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

[No QA] [Fix] Remove all Betas access for dev environment #21655

Merged
merged 2 commits into from
Jul 3, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
9 changes: 4 additions & 5 deletions src/libs/Permissions.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import _ from 'underscore';
import * as Environment from './Environment/Environment';
import CONST from '../CONST';

/**
Expand All @@ -8,7 +7,7 @@ import CONST from '../CONST';
* @returns {Boolean}
*/
function canUseAllBetas(betas) {
return Environment.isDevelopment() || _.contains(betas, CONST.BETAS.ALL);
return _.contains(betas, CONST.BETAS.ALL);
}

/**
Expand Down Expand Up @@ -75,7 +74,7 @@ function canUseCommentLinking(betas) {
* @returns {Boolean}
*/
function canUsePolicyRooms(betas) {
return _.contains(betas, CONST.BETAS.POLICY_ROOMS) || _.contains(betas, CONST.BETAS.ALL);
return _.contains(betas, CONST.BETAS.POLICY_ROOMS) || canUseAllBetas(betas);
}

/**
Expand All @@ -91,15 +90,15 @@ function canUsePolicyExpenseChat(betas) {
* @returns {Boolean}
*/
function canUsePasswordlessLogins(betas) {
return _.contains(betas, CONST.BETAS.PASSWORDLESS) || _.contains(betas, CONST.BETAS.ALL);
return _.contains(betas, CONST.BETAS.PASSWORDLESS) || canUseAllBetas(betas);
}

/**
* @param {Array<String>} betas
* @returns {Boolean}
*/
function canUseTasks(betas) {
return _.contains(betas, CONST.BETAS.TASKS) || _.contains(betas, CONST.BETAS.ALL);
return _.contains(betas, CONST.BETAS.TASKS) || canUseAllBetas(betas);
}

export default {
Expand Down
2 changes: 1 addition & 1 deletion tests/unit/OptionsListUtilsTest.js
Original file line number Diff line number Diff line change
Expand Up @@ -296,7 +296,7 @@ describe('OptionsListUtils', () => {

it('getSearchOptions()', () => {
// When we filter in the Search view without providing a searchValue
let results = OptionsListUtils.getSearchOptions(REPORTS, PERSONAL_DETAILS, '');
let results = OptionsListUtils.getSearchOptions(REPORTS, PERSONAL_DETAILS, '', [CONST.BETAS.ALL]);

// Then the 2 personalDetails that don't have reports should be returned
expect(results.personalDetails.length).toBe(2);
Expand Down