🍒 Cherry pick PR #24091 to staging 🍒

android/app/build.gradle

@@ -86,8 +86,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1001035001
-        versionName "1.3.50-1"
+        versionCode 1001035002
+        versionName "1.3.50-2"
     }
 
     signingConfigs {

ios/NewExpensify/Info.plist

@@ -32,7 +32,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>1.3.50.1</string>
+	<string>1.3.50.2</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LSApplicationQueriesSchemes</key>

ios/NewExpensifyTests/Info.plist

@@ -19,6 +19,6 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>1.3.50.1</string>
+	<string>1.3.50.2</string>
 </dict>
 </plist>

package.json

@@ -1,6 +1,6 @@
 {
   "name": "new.expensify",
-  "version": "1.3.50-1",
+  "version": "1.3.50-2",
   "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.",

src/libs/ReportUtils.js

@@ -405,17 +405,6 @@ function isOptimisticPersonalDetail(accountID) {
     return _.isEmpty(allPersonalDetails[accountID]) || !!allPersonalDetails[accountID].isOptimisticPersonalDetail;
 }
 
-/**
- * Check if report is a DM and personal detail of participant is optimistic data
- * @param {String} report
- * @returns {Boolean}
- */
-function shouldDisableDetailPage(report) {
-    const participants = lodashGet(report, 'participantAccountIDs', []);
-    const isMultipleParticipant = participants.length > 1;
-    return !isMultipleParticipant && isOptimisticPersonalDetail(participants[0]) && !report.parentReportID;
-}
-
 /**
  * Checks if a report is a task report from a policy expense chat.
  *
@@ -460,6 +449,25 @@ function isConciergeChatReport(report) {
     return lodashGet(report, 'participantAccountIDs', []).length === 1 && Number(report.participantAccountIDs[0]) === CONST.ACCOUNT_ID.CONCIERGE && !isChatThread(report);
 }
 
+/**
+ * Check if the report is a single chat report that isn't a thread
+ * and personal detail of participant is optimistic data
+ * @param {Object} report
+ * @param {Array} report.participantAccountIDs
+ * @returns {Boolean}
+ */
+function shouldDisableDetailPage(report) {
+    const participantAccountIDs = lodashGet(report, 'participantAccountIDs', []);
+
+    if (isChatRoom(report) || isPolicyExpenseChat(report) || isChatThread(report)) {
+        return false;
+    }
+    if (participantAccountIDs.length === 1) {
+        return isOptimisticPersonalDetail(participantAccountIDs[0]);
+    }
+    return false;
+}
+
 /**
  * Returns true if there are any Expensify accounts (i.e. with domain 'expensify.com') in the set of accountIDs
  * by cross-referencing the accountIDs with personalDetails.