Merge pull request #4970 from Expensify/OSBotify-cherry-pick-staging-…

…4967

android/app/build.gradle

@@ -150,8 +150,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1001009001
-        versionName "1.0.90-1"
+        versionCode 1001009002
+        versionName "1.0.90-2"
     }
     splits {
         abi {

ios/NewExpensify/Info.plist

@@ -30,7 +30,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>1.0.90.1</string>
+	<string>1.0.90.2</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LSApplicationQueriesSchemes</key>

ios/NewExpensifyTests/Info.plist

@@ -19,6 +19,6 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>1.0.90.1</string>
+	<string>1.0.90.2</string>
 </dict>
 </plist>

package.json

@@ -1,6 +1,6 @@
 {
   "name": "new.expensify",
-  "version": "1.0.90-1",
+  "version": "1.0.90-2",
   "author": "Expensify, Inc.",
   "homepage": "https://new.expensify.com",
   "description": "New Expensify is the next generation of Expensify: a reimagination of payments based atop a foundation of chat.",

src/components/LocalePicker.js

@@ -6,7 +6,6 @@ import {setLocale} from '../libs/actions/App';
 import withLocalize, {withLocalizePropTypes} from './withLocalize';
 import ONYXKEYS from '../ONYXKEYS';
 import CONST from '../CONST';
-import Permissions from '../libs/Permissions';
 import {translate} from '../libs/translate';
 import ExpensiPicker from './ExpensiPicker';
 
@@ -17,16 +16,12 @@ const propTypes = {
     /** Indicates size of a picker component and whether to render the label or not */
     size: PropTypes.oneOf(['normal', 'small']),
 
-    /** Beta features list */
-    betas: PropTypes.arrayOf(PropTypes.string),
-
     ...withLocalizePropTypes,
 };
 
 const defaultProps = {
     preferredLocale: CONST.DEFAULT_LOCALE,
     size: 'normal',
-    betas: [],
 };
 
 const localesToLanguages = {
@@ -42,26 +37,20 @@ const localesToLanguages = {
 
 const LocalePicker = ({
     // eslint-disable-next-line no-shadow
-    preferredLocale, translate, betas, size,
-}) => {
-    if (!Permissions.canUseInternationalization(betas)) {
-        return null;
-    }
-
-    return (
-        <ExpensiPicker
-            label={size === 'normal' ? translate('preferencesPage.language') : null}
-            onChange={(locale) => {
-                if (locale !== preferredLocale) {
-                    setLocale(locale);
-                }
-            }}
-            items={Object.values(localesToLanguages)}
-            size={size}
-            value={preferredLocale}
-        />
-    );
-};
+    preferredLocale, translate, size,
+}) => (
+    <ExpensiPicker
+        label={size === 'normal' ? translate('preferencesPage.language') : null}
+        onChange={(locale) => {
+            if (locale !== preferredLocale) {
+                setLocale(locale);
+            }
+        }}
+        items={Object.values(localesToLanguages)}
+        size={size}
+        value={preferredLocale}
+    />
+);
 
 LocalePicker.defaultProps = defaultProps;
 LocalePicker.propTypes = propTypes;
@@ -73,8 +62,5 @@ export default compose(
         preferredLocale: {
             key: ONYXKEYS.NVP_PREFERRED_LOCALE,
         },
-        betas: {
-            key: ONYXKEYS.BETAS,
-        },
     }),
 )(LocalePicker);

src/libs/Permissions.js

@@ -51,19 +51,10 @@ function canUseDefaultRooms(betas) {
     return _.contains(betas, CONST.BETAS.DEFAULT_ROOMS) || canUseAllBetas(betas);
 }
 
-/**
- * @param {Array<String>} betas
- * @returns {Boolean}
- */
-function canUseInternationalization(betas) {
-    return _.contains(betas, CONST.BETAS.INTERNATIONALIZATION) || canUseAllBetas(betas);
-}
-
 export default {
     canUseChronos,
     canUseIOU,
     canUsePayWithExpensify,
     canUseFreePlan,
     canUseDefaultRooms,
-    canUseInternationalization,
 };