From 97efd0c442fc5a4dd735f4adfe9852cc125be88f Mon Sep 17 00:00:00 2001
From: OSBotify <76178356+OSBotify@users.noreply.github.com>
Date: Tue, 20 Jun 2023 15:20:30 -0400
Subject: [PATCH 1/2] Merge pull request #21151 from
Expensify/version-BUILD-5DCFE95F-55C2-42E4-94FB-D2A07025939D
Update version to 1.3.29-9 on main
(cherry picked from commit 90f88033b2fe8f33ff6791d63eb5f222d0a98c58)
---
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 bc2693a6abc9..bfb4c0df3586 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 1001032908
- versionName "1.3.29-8"
+ versionCode 1001032909
+ versionName "1.3.29-9"
}
splits {
diff --git a/ios/NewExpensify/Info.plist b/ios/NewExpensify/Info.plist
index 053edc3661a9..df516c292e23 100644
--- a/ios/NewExpensify/Info.plist
+++ b/ios/NewExpensify/Info.plist
@@ -32,7 +32,7 @@
CFBundleVersion
- 1.3.29.8
+ 1.3.29.9
ITSAppUsesNonExemptEncryption
LSApplicationQueriesSchemes
diff --git a/ios/NewExpensifyTests/Info.plist b/ios/NewExpensifyTests/Info.plist
index 912cf9963a65..5597c56bb486 100644
--- a/ios/NewExpensifyTests/Info.plist
+++ b/ios/NewExpensifyTests/Info.plist
@@ -19,6 +19,6 @@
CFBundleSignature
????
CFBundleVersion
- 1.3.29.8
+ 1.3.29.9
diff --git a/package-lock.json b/package-lock.json
index 804c2c72ce19..de0b904da617 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
{
"name": "new.expensify",
- "version": "1.3.29-8",
+ "version": "1.3.29-9",
"lockfileVersion": 2,
"requires": true,
"packages": {
"": {
"name": "new.expensify",
- "version": "1.3.29-8",
+ "version": "1.3.29-9",
"hasInstallScript": true,
"license": "MIT",
"dependencies": {
diff --git a/package.json b/package.json
index 018c46f75377..af9d802eb453 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "new.expensify",
- "version": "1.3.29-8",
+ "version": "1.3.29-9",
"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 f2bd37ee10c7d81c4d440f3066764fa4de1dc33d Mon Sep 17 00:00:00 2001
From: Amy Evans
Date: Tue, 20 Jun 2023 15:06:17 -0400
Subject: [PATCH 2/2] Merge pull request #21148 from Pujan92/fix/21127
Fix: Search - Group chat displays blank in Search results
(cherry picked from commit 9e846bdb8b47b733027252c7d6361dabc7298c2c)
---
src/components/OptionRow.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/components/OptionRow.js b/src/components/OptionRow.js
index a6aae46736e0..489c70c25dc5 100644
--- a/src/components/OptionRow.js
+++ b/src/components/OptionRow.js
@@ -135,7 +135,7 @@ class OptionRow extends Component {
// We only create tooltips for the first 10 users or so since some reports have hundreds of users, causing performance to degrade.
const displayNamesWithTooltips = ReportUtils.getDisplayNamesWithTooltips(
- (this.props.option.participantsList || this.props.option.accountID ? [this.props.option] : []).slice(0, 10),
+ (this.props.option.participantsList || (this.props.option.accountID ? [this.props.option] : [])).slice(0, 10),
isMultipleParticipant,
);
let subscriptColor = themeColors.appBG;