From 69713042be75faaaa755a9a4de01bd9cbed8c222 Mon Sep 17 00:00:00 2001
From: OSBotify <76178356+OSBotify@users.noreply.github.com>
Date: Tue, 20 Jun 2023 21:10:08 -0400
Subject: [PATCH 1/2] Merge pull request #21166 from
Expensify/version-BUILD-A4399E93-AE38-4056-AB45-A569FA03CE8B
Update version to 1.3.29-11 on main
(cherry picked from commit d20a5f40788ba43ecdd6292cd0c3b9dda7a6731b)
---
android/app/build.gradle | 4 ++--
ios/NewExpensify/Info.plist | 2 +-
ios/NewExpensifyTests/Info.plist | 2 +-
package-lock.json | 4 ++--
package.json | 2 +-
5 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/android/app/build.gradle b/android/app/build.gradle
index 807a86659f3f..33c70ddd1050 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -106,8 +106,8 @@ android {
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
multiDexEnabled rootProject.ext.multiDexEnabled
- versionCode 1001032910
- versionName "1.3.29-10"
+ versionCode 1001032911
+ versionName "1.3.29-11"
}
splits {
diff --git a/ios/NewExpensify/Info.plist b/ios/NewExpensify/Info.plist
index ef4e13fb89bc..1627d429f5b9 100644
--- a/ios/NewExpensify/Info.plist
+++ b/ios/NewExpensify/Info.plist
@@ -32,7 +32,7 @@
CFBundleVersion
- 1.3.29.10
+ 1.3.29.11
ITSAppUsesNonExemptEncryption
LSApplicationQueriesSchemes
diff --git a/ios/NewExpensifyTests/Info.plist b/ios/NewExpensifyTests/Info.plist
index 4af3ba895937..0d8e56366705 100644
--- a/ios/NewExpensifyTests/Info.plist
+++ b/ios/NewExpensifyTests/Info.plist
@@ -19,6 +19,6 @@
CFBundleSignature
????
CFBundleVersion
- 1.3.29.10
+ 1.3.29.11
diff --git a/package-lock.json b/package-lock.json
index 9e5fbdb327f2..a59a6b919a3e 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
{
"name": "new.expensify",
- "version": "1.3.29-10",
+ "version": "1.3.29-11",
"lockfileVersion": 2,
"requires": true,
"packages": {
"": {
"name": "new.expensify",
- "version": "1.3.29-10",
+ "version": "1.3.29-11",
"hasInstallScript": true,
"license": "MIT",
"dependencies": {
diff --git a/package.json b/package.json
index 227c6a6d1f9d..7df1b904ccdf 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "new.expensify",
- "version": "1.3.29-10",
+ "version": "1.3.29-11",
"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 10707219b3ea40769c786d5732df3fd1eb07d2b9 Mon Sep 17 00:00:00 2001
From: Carlos Martins
Date: Tue, 20 Jun 2023 19:04:36 -0600
Subject: [PATCH 2/2] Merge pull request #21159 from
Expensify/jasper-filterPersonalDetailsWithoutLogins
Only consider personal details with logins set in `OptionsListUtils.getOptions`
(cherry picked from commit b7069ece986cc97f1aa7b29151fef62799cf159b)
---
src/libs/OptionsListUtils.js | 6 ++++++
src/libs/actions/Task.js | 4 +++-
2 files changed, 9 insertions(+), 1 deletion(-)
diff --git a/src/libs/OptionsListUtils.js b/src/libs/OptionsListUtils.js
index e9e4a2f636a3..af2309c3eda8 100644
--- a/src/libs/OptionsListUtils.js
+++ b/src/libs/OptionsListUtils.js
@@ -603,6 +603,12 @@ function getOptions(
};
}
+ // We're only picking personal details that have logins set
+ // This is a temporary fix for all the logic that's been breaking because of the new privacy changes
+ // See https://github.com/Expensify/Expensify/issues/293465 for more context
+ // eslint-disable-next-line no-param-reassign
+ personalDetails = _.pick(personalDetails, (detail) => Boolean(detail.login));
+
let recentReportOptions = [];
let personalDetailsOptions = [];
const reportMapForAccountIDs = {};
diff --git a/src/libs/actions/Task.js b/src/libs/actions/Task.js
index 4003ba8002f0..acb47d34e3dd 100644
--- a/src/libs/actions/Task.js
+++ b/src/libs/actions/Task.js
@@ -303,7 +303,9 @@ function editTaskAndNavigate(report, ownerEmail, ownerAccountID, {title, descrip
// Sometimes title or description is undefined, so we need to check for that, and we provide it to multiple functions
const reportName = (title || report.reportName).trim();
- const reportDescription = (!_.isUndefined(description) ? description : report.description).trim();
+
+ // Description can be unset, so we default to an empty string if so
+ const reportDescription = (!_.isUndefined(description) ? description : lodashGet(report, 'description', '')).trim();
// If we make a change to the assignee, we want to add a comment to the assignee's chat
let optimisticAssigneeAddComment;