Merge pull request #4390 from Expensify/cherry-pick-staging-4366

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 {

ios/ExpensifyCash/Info.plist

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

ios/ExpensifyCashTests/Info.plist

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

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.",

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 (
-            <LocaleContext.Provider value={this.translateUtils}>
+            <LocaleContext.Provider value={this.getContextValue()}>
                 {this.props.children}
             </LocaleContext.Provider>
         );
@@ -137,7 +139,7 @@ export default function withLocalize(WrappedComponent) {
     const WithLocalize = forwardRef((props, ref) => (
         <LocaleContext.Consumer>
             {/* eslint-disable-next-line react/jsx-props-no-spreading */}
-            { translateUtils => <WrappedComponent {...translateUtils} {...props} ref={ref} />}
+            {translateUtils => <WrappedComponent {...translateUtils} {...props} ref={ref} />}
         </LocaleContext.Consumer>
     ));