From 4e273de74d0351b1ffe68c74e8e105ee3f5e909c Mon Sep 17 00:00:00 2001
From: OSBotify <76178356+OSBotify@users.noreply.github.com>
Date: Wed, 17 May 2023 13:47:27 -0400
Subject: [PATCH 1/2] Merge pull request #19130 from
Expensify/version-BUILD-B39A6FE6-18B5-405E-91A5-6AC88ED1D813
Update version to 1.3.15-5 on main
(cherry picked from commit 19e683722255d16b38db8ec80dffe3262df78a19)
---
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 bdebf6b1d808..089d89f9afe1 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 1001031504
- versionName "1.3.15-4"
+ versionCode 1001031505
+ versionName "1.3.15-5"
}
splits {
diff --git a/ios/NewExpensify/Info.plist b/ios/NewExpensify/Info.plist
index 1f4776747a50..beb91c4abb0d 100644
--- a/ios/NewExpensify/Info.plist
+++ b/ios/NewExpensify/Info.plist
@@ -30,7 +30,7 @@
CFBundleVersion
- 1.3.15.4
+ 1.3.15.5
ITSAppUsesNonExemptEncryption
LSApplicationQueriesSchemes
diff --git a/ios/NewExpensifyTests/Info.plist b/ios/NewExpensifyTests/Info.plist
index 1810dcb24c06..98bb06c2fb27 100644
--- a/ios/NewExpensifyTests/Info.plist
+++ b/ios/NewExpensifyTests/Info.plist
@@ -19,6 +19,6 @@
CFBundleSignature
????
CFBundleVersion
- 1.3.15.4
+ 1.3.15.5
diff --git a/package-lock.json b/package-lock.json
index d07b889eb123..7676683d03c6 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
{
"name": "new.expensify",
- "version": "1.3.15-4",
+ "version": "1.3.15-5",
"lockfileVersion": 2,
"requires": true,
"packages": {
"": {
"name": "new.expensify",
- "version": "1.3.15-4",
+ "version": "1.3.15-5",
"hasInstallScript": true,
"license": "MIT",
"dependencies": {
diff --git a/package.json b/package.json
index 8e87cc27f499..593e6e3daf79 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "new.expensify",
- "version": "1.3.15-4",
+ "version": "1.3.15-5",
"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 98389d4149168adcfacb9c30eb8d1c45dc8510f4 Mon Sep 17 00:00:00 2001
From: Carlos Martins
Date: Wed, 17 May 2023 11:38:39 -0600
Subject: [PATCH 2/2] Merge pull request #19127 from
Expensify/cmartins-fixReportHeader
Fallback on report
(cherry picked from commit 3e5d81b7ba4e688cb440d89e7383e181c596b655)
---
src/pages/home/HeaderView.js | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/pages/home/HeaderView.js b/src/pages/home/HeaderView.js
index 47d62048b980..427c8a0d8003 100644
--- a/src/pages/home/HeaderView.js
+++ b/src/pages/home/HeaderView.js
@@ -76,7 +76,7 @@ const HeaderView = (props) => {
const isChatRoom = ReportUtils.isChatRoom(props.report);
const isPolicyExpenseChat = ReportUtils.isPolicyExpenseChat(props.report);
const isTaskReport = ReportUtils.isTaskReport(props.report);
- const reportHeaderData = (isTaskReport || !isThread) && !_.isEmpty(props.parentReport) ? props.parentReport : props.report;
+ const reportHeaderData = (isTaskReport || !isThread) && props.report.parentReportID ? props.parentReport : props.report;
const title = ReportUtils.getReportName(reportHeaderData);
const subtitle = ReportUtils.getChatRoomSubtitle(reportHeaderData, props.parentReport);
const isConcierge = participants.length === 1 && _.contains(participants, CONST.EMAIL.CONCIERGE);
@@ -239,7 +239,7 @@ export default compose(
canEvict: false,
},
parentReport: {
- key: ({report}) => `${ONYXKEYS.COLLECTION.REPORT}${report.parentReportID}`,
+ key: ({report}) => `${ONYXKEYS.COLLECTION.REPORT}${report.parentReportID || report.reportID}`,
},
}),
)(HeaderView);