Merge pull request #19141 from Expensify/OSBotify-cherry-pick-staging…

…-19106

🍒 Cherry pick PR #19106 to staging 🍒

android/app/build.gradle

@@ -106,8 +106,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1001031505
-        versionName "1.3.15-5"
+        versionCode 1001031506
+        versionName "1.3.15-6"
     }
 
     splits {

ios/NewExpensify/Info.plist

@@ -30,7 +30,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>1.3.15.5</string>
+	<string>1.3.15.6</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.15.5</string>
+	<string>1.3.15.6</string>
 </dict>
 </plist>

package.json

@@ -1,6 +1,6 @@
 {
   "name": "new.expensify",
-  "version": "1.3.15-5",
+  "version": "1.3.15-6",
   "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/pages/home/report/ReportActionItem.js

@@ -282,8 +282,14 @@ class ReportActionItem extends Component {
 
         const reactions = _.get(this.props, ['action', 'message', 0, 'reactions'], []);
         const hasReactions = reactions.length > 0;
+        const numberOfThreadReplies = _.get(this.props, ['action', 'childVisibleActionCount'], 0);
+        const hasReplies = numberOfThreadReplies > 0;
+
         const shouldDisplayThreadReplies =
-            this.props.action.childCommenterCount && Permissions.canUseThreads(this.props.betas) && !ReportUtils.isThreadFirstChat(this.props.action, this.props.report.reportID);
+            hasReplies &&
+            this.props.action.childCommenterCount &&
+            Permissions.canUseThreads(this.props.betas) &&
+            !ReportUtils.isThreadFirstChat(this.props.action, this.props.report.reportID);
         const oldestFourEmails = lodashGet(this.props.action, 'childOldestFourEmails', '').split(',');
 
         return (
@@ -300,7 +306,7 @@ class ReportActionItem extends Component {
                 {shouldDisplayThreadReplies && (
                     <ReportActionItemThread
                         childReportID={`${this.props.action.childReportID}`}
-                        numberOfReplies={this.props.action.childVisibleActionCount || 0}
+                        numberOfReplies={numberOfThreadReplies}
                         mostRecentReply={`${this.props.action.childLastVisibleActionCreated}`}
                         isHovered={hovered}
                         icons={ReportUtils.getIconsForParticipants(oldestFourEmails, this.props.personalDetails)}