From 89f3a4b3c35e2875db1759a5be4ec5bb00631119 Mon Sep 17 00:00:00 2001
From: OSBotify <76178356+OSBotify@users.noreply.github.com>
Date: Tue, 19 Jul 2022 14:05:08 -0400
Subject: [PATCH 1/2] Merge pull request #10004 from
Expensify/version-BUILD-D403BE14-176D-4E2D-BCEA-BCE8E90C5FFC
Update version to 1.1.85-4 on main
(cherry picked from commit 64972156946daa5367b8844737736ea922c5bafc)
---
android/app/build.gradle | 4 ++--
ios/NewExpensify/Info.plist | 2 +-
ios/NewExpensifyTests/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 e7711c00d20..c23b4520159 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -152,8 +152,8 @@ android {
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
multiDexEnabled rootProject.ext.multiDexEnabled
- versionCode 1001018503
- versionName "1.1.85-3"
+ versionCode 1001018504
+ versionName "1.1.85-4"
}
splits {
abi {
diff --git a/ios/NewExpensify/Info.plist b/ios/NewExpensify/Info.plist
index 89055363d91..27e339d36c7 100644
--- a/ios/NewExpensify/Info.plist
+++ b/ios/NewExpensify/Info.plist
@@ -30,7 +30,7 @@
CFBundleVersion
- 1.1.85.3
+ 1.1.85.4
ITSAppUsesNonExemptEncryption
LSApplicationQueriesSchemes
diff --git a/ios/NewExpensifyTests/Info.plist b/ios/NewExpensifyTests/Info.plist
index bc55afdf7d6..b8167c7200d 100644
--- a/ios/NewExpensifyTests/Info.plist
+++ b/ios/NewExpensifyTests/Info.plist
@@ -19,6 +19,6 @@
CFBundleSignature
????
CFBundleVersion
- 1.1.85.3
+ 1.1.85.4
diff --git a/package-lock.json b/package-lock.json
index 8f230f58434..d98703ee77e 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
{
"name": "new.expensify",
- "version": "1.1.85-3",
+ "version": "1.1.85-4",
"lockfileVersion": 1,
"requires": true,
"dependencies": {
diff --git a/package.json b/package.json
index 197fc7cffe7..30bd832e0c2 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "new.expensify",
- "version": "1.1.85-3",
+ "version": "1.1.85-4",
"author": "Expensify, Inc.",
"homepage": "https://new.expensify.com",
"description": "New Expensify is the next generation of Expensify: a reimagination of payments based atop a foundation of chat.",
From b038e153fea02456933a69f6da7a29584d306b10 Mon Sep 17 00:00:00 2001
From: Marc Glasser
Date: Tue, 19 Jul 2022 07:55:35 -1000
Subject: [PATCH 2/2] Merge pull request #10002 from
Expensify/marcaaron-removeMyPersonalDetails
Remove MY_PERSONAL_DETAILS from timezone update logic
(cherry picked from commit ebf29ef08d5c24f43d0908796f7fd231fb756fda)
---
src/libs/actions/Report.js | 5 -----
1 file changed, 5 deletions(-)
diff --git a/src/libs/actions/Report.js b/src/libs/actions/Report.js
index c14279085fb..f851f172e11 100644
--- a/src/libs/actions/Report.js
+++ b/src/libs/actions/Report.js
@@ -982,11 +982,6 @@ function addActions(reportID, text = '', file) {
if (DateUtils.canUpdateTimezone()) {
const timezone = DateUtils.getCurrentTimezone();
parameters.timezone = JSON.stringify(timezone);
- optimisticData.push({
- onyxMethod: CONST.ONYX.METHOD.MERGE,
- key: ONYXKEYS.MY_PERSONAL_DETAILS,
- value: {timezone},
- });
optimisticData.push({
onyxMethod: CONST.ONYX.METHOD.MERGE,
key: ONYXKEYS.PERSONAL_DETAILS,