Merge pull request #21655 from fedirjh/Fix-Dev-Beta-Access

[No QA] [Fix] Remove all Betas access for dev environment
Expensify · Jul 3, 2023 · d7cf0bc · d7cf0bc
2 parents 8b7a65d + 6a5fffc
commit d7cf0bc
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/src/libs/Permissions.js b/src/libs/Permissions.js
@@ -1,5 +1,4 @@
 import _ from 'underscore';
-import * as Environment from './Environment/Environment';
 import CONST from '../CONST';
 
 /**
@@ -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);
 }
 
 /**
@@ -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);
 }
 
 /**
@@ -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 {

diff --git a/tests/unit/OptionsListUtilsTest.js b/tests/unit/OptionsListUtilsTest.js
@@ -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);