From ce1f72ed28333c5b264280e14cd6ac9e1cedeaaa Mon Sep 17 00:00:00 2001
From: OSBotify <76178356+OSBotify@users.noreply.github.com>
Date: Wed, 28 Jul 2021 15:58:33 -0700
Subject: [PATCH 1/2] Merge pull request #4288 from
Expensify/version-BUILD-e864cf8d3ae3886959ba7ac2c986f82304139b60
(cherry picked from commit cad68724faf2ce5e3bb6e8d7d0b8acdee9359928)
---
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 b8c3fb59625fd..dee913e78e97f 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 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
index c83a8899090c9..790b90b03b32d 100644
--- a/ios/ExpensifyCash/Info.plist
+++ b/ios/ExpensifyCash/Info.plist
@@ -30,7 +30,7 @@
CFBundleVersion
- 1.0.81.0
+ 1.0.81.1
ITSAppUsesNonExemptEncryption
LSApplicationQueriesSchemes
diff --git a/ios/ExpensifyCashTests/Info.plist b/ios/ExpensifyCashTests/Info.plist
index 428d035addfc7..135fb4f426e22 100644
--- a/ios/ExpensifyCashTests/Info.plist
+++ b/ios/ExpensifyCashTests/Info.plist
@@ -19,6 +19,6 @@
CFBundleSignature
????
CFBundleVersion
- 1.0.81.0
+ 1.0.81.1
diff --git a/package-lock.json b/package-lock.json
index 90dd382d8d1c6..2bff44ebdf79b 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
{
"name": "expensify.cash",
- "version": "1.0.81-0",
+ "version": "1.0.81-1",
"lockfileVersion": 1,
"requires": true,
"dependencies": {
diff --git a/package.json b/package.json
index 2c29e02b037c2..d742ee0f86576 100644
--- 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.",
From bc0340d6718130ae53e7e0d0f4f116eca66b04b9 Mon Sep 17 00:00:00 2001
From: Marc Glasser
Date: Wed, 28 Jul 2021 12:56:19 -1000
Subject: [PATCH 2/2] Merge pull request #4286 from
Expensify/marcaaron-fixUsagesOfPreferredLocale
Fix staging due to undefined Onyx key
(cherry picked from commit e864cf8d3ae3886959ba7ac2c986f82304139b60)
---
src/components/LocalePicker.js | 2 +-
src/libs/actions/SignInRedirect.js | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/components/LocalePicker.js b/src/components/LocalePicker.js
index 88a25971d7a3f..b64707cc16ab8 100644
--- 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
index a206b5f249ac7..fec0dafc581c8 100644
--- 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});