From 9f31e72d316603e7e80f00f8b4a341b68e49f34f Mon Sep 17 00:00:00 2001
From: OSBotify <76178356+OSBotify@users.noreply.github.com>
Date: Tue, 3 Aug 2021 03:57:46 -0700
Subject: [PATCH 1/2] Merge pull request #4389 from
Expensify/version-BUILD-7d842b9bea5e3df9d02b3da3ab45b69d6277b7ca
(cherry picked from commit 96cd6ba76bc187822a680412588e5deec8ed692c)
---
android/app/build.gradle | 4 ++--
ios/ExpensifyCash/Info.plist | 2 +-
ios/ExpensifyCashTests/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 3d9b9bebd5b..b1347e848c9 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 1001008202
- versionName "1.0.82-2"
+ versionCode 1001008203
+ versionName "1.0.82-3"
}
splits {
abi {
diff --git a/ios/ExpensifyCash/Info.plist b/ios/ExpensifyCash/Info.plist
index c92231397a1..2827b588c6c 100644
--- a/ios/ExpensifyCash/Info.plist
+++ b/ios/ExpensifyCash/Info.plist
@@ -30,7 +30,7 @@
CFBundleVersion
- 1.0.82.2
+ 1.0.82.3
ITSAppUsesNonExemptEncryption
LSApplicationQueriesSchemes
diff --git a/ios/ExpensifyCashTests/Info.plist b/ios/ExpensifyCashTests/Info.plist
index 777d404b19b..281c33b8a0c 100644
--- a/ios/ExpensifyCashTests/Info.plist
+++ b/ios/ExpensifyCashTests/Info.plist
@@ -19,6 +19,6 @@
CFBundleSignature
????
CFBundleVersion
- 1.0.82.2
+ 1.0.82.3
diff --git a/package-lock.json b/package-lock.json
index a83df0fbd21..8020c6b4753 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
{
"name": "expensify.cash",
- "version": "1.0.82-2",
+ "version": "1.0.82-3",
"lockfileVersion": 1,
"requires": true,
"dependencies": {
diff --git a/package.json b/package.json
index ac3a42e0cc7..175d1c40197 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "expensify.cash",
- "version": "1.0.82-2",
+ "version": "1.0.82-3",
"author": "Expensify, Inc.",
"homepage": "https://new.expensify.com",
"description": "Expensify.cash is the next generation of Expensify: a reimagination of payments based atop a foundation of chat.",
From 2fd926aa69cd795e94f4f067088451e10ecf9ee1 Mon Sep 17 00:00:00 2001
From: Ionatan Wiznia
Date: Tue, 3 Aug 2021 04:53:37 -0600
Subject: [PATCH 2/2] Merge pull request #4366 from
kidroca/kidroca/locale-perf-fix
(cherry picked from commit 7d842b9bea5e3df9d02b3da3ab45b69d6277b7ca)
---
src/components/withLocalize.js | 16 +++++++++-------
1 file changed, 9 insertions(+), 7 deletions(-)
diff --git a/src/components/withLocalize.js b/src/components/withLocalize.js
index 4eb5ca18d6d..a5fbb53e57d 100755
--- a/src/components/withLocalize.js
+++ b/src/components/withLocalize.js
@@ -44,17 +44,19 @@ const localeProviderDefaultProps = {
};
class LocaleContextProvider extends React.Component {
- constructor(props) {
- super(props);
-
- /* The context this component exposes to consumers */
- this.translateUtils = {
+ /**
+ * The context this component exposes to child components
+ * @returns {object} translation util functions and locale
+ */
+ getContextValue() {
+ return {
translate: this.translate.bind(this),
numberFormat: this.numberFormat.bind(this),
timestampToRelative: this.timestampToRelative.bind(this),
timestampToDateTime: this.timestampToDateTime.bind(this),
fromLocalPhone: this.fromLocalPhone.bind(this),
toLocalPhone: this.toLocalPhone.bind(this),
+ locale: this.props.preferredLocale,
};
}
@@ -115,7 +117,7 @@ class LocaleContextProvider extends React.Component {
render() {
return (
-
+
{this.props.children}
);
@@ -137,7 +139,7 @@ export default function withLocalize(WrappedComponent) {
const WithLocalize = forwardRef((props, ref) => (
{/* eslint-disable-next-line react/jsx-props-no-spreading */}
- { translateUtils => }
+ {translateUtils => }
));