From 728dc6eca2c94d0e0a6e710d42fe35553511f16b Mon Sep 17 00:00:00 2001
From: OSBotify <76178356+OSBotify@users.noreply.github.com>
Date: Tue, 16 May 2023 11:37:33 -0400
Subject: [PATCH 1/2] Merge pull request #19025 from
Expensify/version-BUILD-0814FE7F-AECA-4BC0-AA39-F521952B347C
Update version to 1.3.14-10 on main
(cherry picked from commit 45185532a04860cad422d2440c8642387d19716c)
---
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 b8dbc338ee68..e78f1ba53bf3 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 1001031409
- versionName "1.3.14-9"
+ versionCode 1001031410
+ versionName "1.3.14-10"
}
splits {
diff --git a/ios/NewExpensify/Info.plist b/ios/NewExpensify/Info.plist
index b99259eed80d..d7fce6860731 100644
--- a/ios/NewExpensify/Info.plist
+++ b/ios/NewExpensify/Info.plist
@@ -30,7 +30,7 @@
CFBundleVersion
- 1.3.14.9
+ 1.3.14.10
ITSAppUsesNonExemptEncryption
LSApplicationQueriesSchemes
diff --git a/ios/NewExpensifyTests/Info.plist b/ios/NewExpensifyTests/Info.plist
index 1280516d99c1..e4563d934e50 100644
--- a/ios/NewExpensifyTests/Info.plist
+++ b/ios/NewExpensifyTests/Info.plist
@@ -19,6 +19,6 @@
CFBundleSignature
????
CFBundleVersion
- 1.3.14.9
+ 1.3.14.10
diff --git a/package-lock.json b/package-lock.json
index 8045ec325c78..b8d61f1ac9ef 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
{
"name": "new.expensify",
- "version": "1.3.14-9",
+ "version": "1.3.14-10",
"lockfileVersion": 2,
"requires": true,
"packages": {
"": {
"name": "new.expensify",
- "version": "1.3.14-9",
+ "version": "1.3.14-10",
"hasInstallScript": true,
"license": "MIT",
"dependencies": {
diff --git a/package.json b/package.json
index b8eb857aec7b..d7b4c97e6eb3 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "new.expensify",
- "version": "1.3.14-9",
+ "version": "1.3.14-10",
"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 44860e33487617edbabc1860f340fde086ec92c6 Mon Sep 17 00:00:00 2001
From: Vit Horacek <36083550+mountiny@users.noreply.github.com>
Date: Tue, 16 May 2023 17:29:24 +0200
Subject: [PATCH 2/2] Merge pull request #19019 from
0xmiroslav/fix/19010-new-message-avatar
prevent grouping created action message
(cherry picked from commit 579ed64f71a942e5c17669481631a994e64b350f)
---
src/libs/ReportActionsUtils.js | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/src/libs/ReportActionsUtils.js b/src/libs/ReportActionsUtils.js
index 558afca9904e..3bd4b8ff84ce 100644
--- a/src/libs/ReportActionsUtils.js
+++ b/src/libs/ReportActionsUtils.js
@@ -144,6 +144,11 @@ function isConsecutiveActionMadeByPreviousActor(reportActions, actionIndex) {
return false;
}
+ // Do not group if previous action was a created action
+ if (previousAction.actionName === CONST.REPORT.ACTIONS.TYPE.CREATED) {
+ return false;
+ }
+
// Do not group if previous or current action was a renamed action
if (previousAction.actionName === CONST.REPORT.ACTIONS.TYPE.RENAMED || currentAction.actionName === CONST.REPORT.ACTIONS.TYPE.RENAMED) {
return false;