From 3c5ba482982883a4802916cc68a5a6909a8e5d8b Mon Sep 17 00:00:00 2001
From: OSBotify <76178356+OSBotify@users.noreply.github.com>
Date: Fri, 2 Sep 2022 05:37:07 -0400
Subject: [PATCH 1/2] Merge pull request #10781 from
Expensify/version-BUILD-83CAB9C6-811B-420C-B6D2-8E2DCB287AF6
Update version to 1.1.96-3 on main
(cherry picked from commit 73ec98657a72a21b74007e245e0a8069c1face02)
---
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 f3779840ef0f..c442cf666b3a 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -155,8 +155,8 @@ android {
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
multiDexEnabled rootProject.ext.multiDexEnabled
- versionCode 1001019602
- versionName "1.1.96-2"
+ versionCode 1001019603
+ versionName "1.1.96-3"
buildConfigField "boolean", "IS_NEW_ARCHITECTURE_ENABLED", isNewArchitectureEnabled().toString()
if (isNewArchitectureEnabled()) {
diff --git a/ios/NewExpensify/Info.plist b/ios/NewExpensify/Info.plist
index a495f1f4d80d..bbd68e043f2d 100644
--- a/ios/NewExpensify/Info.plist
+++ b/ios/NewExpensify/Info.plist
@@ -30,7 +30,7 @@
CFBundleVersion
- 1.1.96.2
+ 1.1.96.3
ITSAppUsesNonExemptEncryption
LSApplicationQueriesSchemes
diff --git a/ios/NewExpensifyTests/Info.plist b/ios/NewExpensifyTests/Info.plist
index def198abe030..aac1bff91378 100644
--- a/ios/NewExpensifyTests/Info.plist
+++ b/ios/NewExpensifyTests/Info.plist
@@ -19,6 +19,6 @@
CFBundleSignature
????
CFBundleVersion
- 1.1.96.2
+ 1.1.96.3
diff --git a/package-lock.json b/package-lock.json
index afc8b2c3ebf3..a1dfb3ff2ca8 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
{
"name": "new.expensify",
- "version": "1.1.96-2",
+ "version": "1.1.96-3",
"lockfileVersion": 2,
"requires": true,
"packages": {
"": {
"name": "new.expensify",
- "version": "1.1.96-2",
+ "version": "1.1.96-3",
"hasInstallScript": true,
"license": "MIT",
"dependencies": {
diff --git a/package.json b/package.json
index 7c2fd10acbc9..e09c4380f668 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "new.expensify",
- "version": "1.1.96-2",
+ "version": "1.1.96-3",
"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 63bd65f94c678bec20b41a9e4aea6904711850e8 Mon Sep 17 00:00:00 2001
From: Srikar Parsi <48188732+srikarparsi@users.noreply.github.com>
Date: Fri, 2 Sep 2022 11:11:38 +0200
Subject: [PATCH 2/2] Merge pull request #10779 from
Expensify/marcaaron-concatKeyForReportActionsList
Use sequenceNumber and reportActionID for now
(cherry picked from commit bd39027dbeaf9494a7a83d7b9fc5fef6ae970175)
---
src/pages/home/report/ReportActionsList.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/pages/home/report/ReportActionsList.js b/src/pages/home/report/ReportActionsList.js
index d9868ba2e415..02e66009c663 100644
--- a/src/pages/home/report/ReportActionsList.js
+++ b/src/pages/home/report/ReportActionsList.js
@@ -116,7 +116,7 @@ class ReportActionsList extends React.Component {
* @return {String}
*/
keyExtractor(item) {
- return `${item.action.reportActionID}`;
+ return `${item.action.reportActionID}${item.action.sequenceNumber}`;
}
/**