From e1be5492e554b52b503811315daa2d18f88f6468 Mon Sep 17 00:00:00 2001 From: OSBotify <76178356+OSBotify@users.noreply.github.com> Date: Tue, 31 Aug 2021 17:02:44 -0700 Subject: [PATCH 1/2] Merge pull request #4969 from Expensify/version-BUILD-9a06c42ec2940e8dd92e7d818fe5cb102956a563 (cherry picked from commit 3a4109b9dbc513019013c5bd4b73a941f7a773c7) --- android/app/build.gradle | 4 ++-- ios/NewExpensify/Info.plist | 2 +- ios/NewExpensifyTests/Info.plist | 2 +- package-lock.json | 2 +- package.json | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/android/app/build.gradle b/android/app/build.gradle index 72b78f82b4b..c0dc4bb8f28 100644 --- a/android/app/build.gradle +++ b/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 { diff --git a/ios/NewExpensify/Info.plist b/ios/NewExpensify/Info.plist index 46f154e3e8d..1df1d1dfeb3 100644 --- a/ios/NewExpensify/Info.plist +++ b/ios/NewExpensify/Info.plist @@ -30,7 +30,7 @@ CFBundleVersion - 1.0.90.1 + 1.0.90.2 ITSAppUsesNonExemptEncryption LSApplicationQueriesSchemes diff --git a/ios/NewExpensifyTests/Info.plist b/ios/NewExpensifyTests/Info.plist index bb217905e4c..c5e85d08550 100644 --- a/ios/NewExpensifyTests/Info.plist +++ b/ios/NewExpensifyTests/Info.plist @@ -19,6 +19,6 @@ CFBundleSignature ???? CFBundleVersion - 1.0.90.1 + 1.0.90.2 diff --git a/package-lock.json b/package-lock.json index c59f7119fb1..8b47f82dbc9 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "new.expensify", - "version": "1.0.90-1", + "version": "1.0.90-2", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index 968d4f68664..ae0048ef093 100644 --- a/package.json +++ b/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.", From 1d2315f0a4b68519dcd16d5f08e3f712812cb174 Mon Sep 17 00:00:00 2001 From: Rory Abraham <47436092+roryabraham@users.noreply.github.com> Date: Tue, 31 Aug 2021 17:00:28 -0700 Subject: [PATCH 2/2] Merge pull request #4967 from Expensify/Rory-RemoveInternationalizationBeta Remove internationalization beta (cherry picked from commit 9a06c42ec2940e8dd92e7d818fe5cb102956a563) --- src/CONST.js | 1 - src/components/LocalePicker.js | 42 ++++++++++++---------------------- src/libs/Permissions.js | 9 -------- 3 files changed, 14 insertions(+), 38 deletions(-) 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, };