Merge pull request #4289 from Expensify/cherry-pick-staging-4286

OSBotify · web-flow · commit d6f318eceb9a · 2021-07-28T16:00:06.000-07:00
diff --git 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 1001008100
-        versionName "1.0.81-0"
+        versionCode 1001008101
+        versionName "1.0.81-1"
     }
     splits {
         abi {
diff --git a/ios/ExpensifyCash/Info.plist b/ios/ExpensifyCash/Info.plist
@@ -30,7 +30,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>1.0.81.0</string>
+	<string>1.0.81.1</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LSApplicationQueriesSchemes</key>
diff --git a/ios/ExpensifyCashTests/Info.plist b/ios/ExpensifyCashTests/Info.plist
@@ -19,6 +19,6 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>1.0.81.0</string>
+	<string>1.0.81.1</string>
 </dict>
 </plist>
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "expensify.cash",
-  "version": "1.0.81-0",
+  "version": "1.0.81-1",
   "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.",
diff --git a/src/components/LocalePicker.js b/src/components/LocalePicker.js
@@ -79,7 +79,7 @@ export default compose(
     withLocalize,
     withOnyx({
         preferredLocale: {
-            key: ONYXKEYS.PREFERRED_LOCALE,
+            key: ONYXKEYS.NVP_PREFERRED_LOCALE,
         },
         betas: {
             key: ONYXKEYS.BETAS,
diff --git a/src/libs/actions/SignInRedirect.js b/src/libs/actions/SignInRedirect.js
@@ -21,7 +21,7 @@ Onyx.connect({
 
 let currentPreferredLocale;
 Onyx.connect({
-    key: ONYXKEYS.PREFERRED_LOCALE,
+    key: ONYXKEYS.NVP_PREFERRED_LOCALE,
     callback: val => currentPreferredLocale = val,
 });
 
@@ -51,7 +51,7 @@ function redirectToSignIn(errorMessage) {
         .then(() => {
             Onyx.clear().then(() => {
                 if (preferredLocale) {
-                    Onyx.set(ONYXKEYS.PREFERRED_LOCALE, preferredLocale);
+                    Onyx.set(ONYXKEYS.NVP_PREFERRED_LOCALE, preferredLocale);
                 }
                 if (errorMessage) {
                     Onyx.set(ONYXKEYS.SESSION, {error: errorMessage});

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "expensify.cash",`
`3`		`- "version": "1.0.81-0",`
	`3`	`+ "version": "1.0.81-1",`
`4`	`4`	`"author": "Expensify, Inc.",`
`5`	`5`	`"homepage": "https://new.expensify.com",`
`6`	`6`	`"description": "Expensify.cash is the next generation of Expensify: a reimagination of payments based atop a foundation of chat.",`