diff --git a/src/CONST.js b/src/CONST.js index ff5f73419ac..5e568efec1a 100755 --- a/src/CONST.js +++ b/src/CONST.js @@ -87,7 +87,6 @@ const CONST = { PAY_WITH_EXPENSIFY: 'payWithExpensify', FREE_PLAN: 'freePlan', DEFAULT_ROOMS: 'defaultRooms', - INTERNATIONALIZATION: 'internationalization', }, BUTTON_STATES: { DEFAULT: 'default', diff --git a/src/components/LocalePicker.js b/src/components/LocalePicker.js index 6df228ca477..ed394a93718 100644 --- a/src/components/LocalePicker.js +++ b/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 ( - { - if (locale !== preferredLocale) { - setLocale(locale); - } - }} - items={Object.values(localesToLanguages)} - size={size} - value={preferredLocale} - /> - ); -}; + preferredLocale, translate, size, +}) => ( + { + 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); diff --git a/src/libs/Permissions.js b/src/libs/Permissions.js index 1ca31ce8871..7063273b245 100644 --- a/src/libs/Permissions.js +++ b/src/libs/Permissions.js @@ -51,19 +51,10 @@ function canUseDefaultRooms(betas) { return _.contains(betas, CONST.BETAS.DEFAULT_ROOMS) || canUseAllBetas(betas); } -/** - * @param {Array} betas - * @returns {Boolean} - */ -function canUseInternationalization(betas) { - return _.contains(betas, CONST.BETAS.INTERNATIONALIZATION) || canUseAllBetas(betas); -} - export default { canUseChronos, canUseIOU, canUsePayWithExpensify, canUseFreePlan, canUseDefaultRooms, - canUseInternationalization, };