From b8b94fe1f92c15efc4b0992ca968432e3c482cc5 Mon Sep 17 00:00:00 2001
From: OSBotify <76178356+OSBotify@users.noreply.github.com>
Date: Thu, 5 Aug 2021 11:38:29 -0700
Subject: [PATCH 1/2] Merge pull request #4427 from
Expensify/version-BUILD-969f9d2a49090baa7233733fea852904693d3fd3
(cherry picked from commit bead55c6193270290b1f25ec0b0a0b723ea53ea9)
---
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 b1347e848c9e5..a73edcbdaee12 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 1001008203
- versionName "1.0.82-3"
+ versionCode 1001008204
+ versionName "1.0.82-4"
}
splits {
abi {
diff --git a/ios/ExpensifyCash/Info.plist b/ios/ExpensifyCash/Info.plist
index 2827b588c6c9b..e9b593279364d 100644
--- a/ios/ExpensifyCash/Info.plist
+++ b/ios/ExpensifyCash/Info.plist
@@ -30,7 +30,7 @@
CFBundleVersion
- 1.0.82.3
+ 1.0.82.4
ITSAppUsesNonExemptEncryption
LSApplicationQueriesSchemes
diff --git a/ios/ExpensifyCashTests/Info.plist b/ios/ExpensifyCashTests/Info.plist
index 281c33b8a0c45..bc58fb844a40c 100644
--- a/ios/ExpensifyCashTests/Info.plist
+++ b/ios/ExpensifyCashTests/Info.plist
@@ -19,6 +19,6 @@
CFBundleSignature
????
CFBundleVersion
- 1.0.82.3
+ 1.0.82.4
diff --git a/package-lock.json b/package-lock.json
index 8020c6b475399..5e481452746b9 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
{
"name": "expensify.cash",
- "version": "1.0.82-3",
+ "version": "1.0.82-4",
"lockfileVersion": 1,
"requires": true,
"dependencies": {
diff --git a/package.json b/package.json
index 175d1c4019733..64566e7f09914 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "expensify.cash",
- "version": "1.0.82-3",
+ "version": "1.0.82-4",
"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 ed8f9729d0e1d37924897d982b3df2d07cd78406 Mon Sep 17 00:00:00 2001
From: Chirag Chandrakant Salian
Date: Thu, 5 Aug 2021 11:31:32 -0700
Subject: [PATCH 2/2] Merge pull request #4416 from
Expensify/chirag-race-fix-attempt
Attempt at fixing race
(cherry picked from commit 969f9d2a49090baa7233733fea852904693d3fd3)
---
src/libs/Navigation/AppNavigator/AuthScreens.js | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/src/libs/Navigation/AppNavigator/AuthScreens.js b/src/libs/Navigation/AppNavigator/AuthScreens.js
index 028ff82ea4438..8c6d852e0c309 100644
--- a/src/libs/Navigation/AppNavigator/AuthScreens.js
+++ b/src/libs/Navigation/AppNavigator/AuthScreens.js
@@ -69,6 +69,10 @@ import defaultScreenOptions from './defaultScreenOptions';
Onyx.connect({
key: ONYXKEYS.MY_PERSONAL_DETAILS,
callback: (val) => {
+ if (!val) {
+ return;
+ }
+
const timezone = lodashGet(val, 'timezone', {});
const currentTimezone = moment.tz.guess(true);