From bb6e6128db6a5d0c654e3104e5aba09a74c95702 Mon Sep 17 00:00:00 2001
From: OSBotify <76178356+OSBotify@users.noreply.github.com>
Date: Wed, 14 Jul 2021 19:38:51 -0700
Subject: [PATCH 1/2] Merge pull request #4064 from
Expensify/version-BUILD-951308fb3319f64c10b3302f904b26b65d72801e
(cherry picked from commit 1a1d66a322c733bbc79f8a5f05f1527240c769d7)
---
android/app/build.gradle | 4 ++--
ios/ExpensifyCash/Info.plist | 2 +-
ios/ExpensifyCashTests/Info.plist | 2 +-
package-lock.json | 2 +-
package.json | 2 +-
5 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/android/app/build.gradle b/android/app/build.gradle
index c034d92e7475..cd9edd7e4066 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -149,8 +149,8 @@ android {
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
multiDexEnabled rootProject.ext.multiDexEnabled
- versionCode 1001007800
- versionName "1.0.78-0"
+ versionCode 1001007801
+ versionName "1.0.78-1"
}
splits {
abi {
diff --git a/ios/ExpensifyCash/Info.plist b/ios/ExpensifyCash/Info.plist
index f5fbad180ec7..4889f065cc3e 100644
--- a/ios/ExpensifyCash/Info.plist
+++ b/ios/ExpensifyCash/Info.plist
@@ -30,7 +30,7 @@
CFBundleVersion
- 1.0.78.0
+ 1.0.78.1
ITSAppUsesNonExemptEncryption
LSApplicationQueriesSchemes
diff --git a/ios/ExpensifyCashTests/Info.plist b/ios/ExpensifyCashTests/Info.plist
index 0acee706f652..9576e207163e 100644
--- a/ios/ExpensifyCashTests/Info.plist
+++ b/ios/ExpensifyCashTests/Info.plist
@@ -19,6 +19,6 @@
CFBundleSignature
????
CFBundleVersion
- 1.0.78.0
+ 1.0.78.1
diff --git a/package-lock.json b/package-lock.json
index 73455ab92f06..14bfcdf0a928 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
{
"name": "expensify.cash",
- "version": "1.0.78-0",
+ "version": "1.0.78-1",
"lockfileVersion": 1,
"requires": true,
"dependencies": {
diff --git a/package.json b/package.json
index 2717a8fb8e56..4a05c19a62fe 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "expensify.cash",
- "version": "1.0.78-0",
+ "version": "1.0.78-1",
"author": "Expensify, Inc.",
"homepage": "https://new.expensify.com",
"description": "Expensify.cash is the next generation of Expensify: a reimagination of payments based atop a foundation of chat.",
From 4d5994902c90de5ddb4d33a2f053ee667634af28 Mon Sep 17 00:00:00 2001
From: Marc Glasser
Date: Wed, 14 Jul 2021 16:36:43 -1000
Subject: [PATCH 2/2] Merge pull request #4059 from
Expensify/joe-report-action-count
[CP Staging] Don't show all chats in LHN in #focus mode
(cherry picked from commit 951308fb3319f64c10b3302f904b26b65d72801e)
---
src/libs/actions/Report.js | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/libs/actions/Report.js b/src/libs/actions/Report.js
index eb065395ac86..b7f52429555d 100644
--- a/src/libs/actions/Report.js
+++ b/src/libs/actions/Report.js
@@ -106,17 +106,17 @@ function getUnreadActionCount(report) {
// Save the lastReadActionID locally so we can access this later
lastReadSequenceNumbers[report.reportID] = lastReadSequenceNumber;
- if (report.reportActionListLength === 0) {
+ if (report.reportActionCount === 0) {
return 0;
}
if (!lastReadSequenceNumber) {
- return report.reportActionListLength;
+ return report.reportActionCount;
}
// There are unread items if the last one the user has read is less
// than the highest sequence number we have
- const unreadActionCount = report.reportActionListLength - lastReadSequenceNumber;
+ const unreadActionCount = report.reportActionCount - lastReadSequenceNumber;
return Math.max(0, unreadActionCount);
}