From 65f1aacc45df00501556c9ea9c3777b3860a35d4 Mon Sep 17 00:00:00 2001 From: OSBotify <76178356+OSBotify@users.noreply.github.com> Date: Thu, 24 Nov 2022 18:35:45 -0500 Subject: [PATCH 1/2] Merge pull request #13030 from Expensify/version-BUILD-DFA66909-7E6C-4A8C-B4DD-86AE245B16F3 Update version to 1.2.31-8 on main (cherry picked from commit e6923ea0b0257355252ea0f619fa886f6a2d826e) --- 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 778e73ccecd0b..08cbfe4527d7c 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -156,8 +156,8 @@ android { minSdkVersion rootProject.ext.minSdkVersion targetSdkVersion rootProject.ext.targetSdkVersion multiDexEnabled rootProject.ext.multiDexEnabled - versionCode 1001023107 - versionName "1.2.31-7" + versionCode 1001023108 + versionName "1.2.31-8" buildConfigField "boolean", "IS_NEW_ARCHITECTURE_ENABLED", isNewArchitectureEnabled().toString() if (isNewArchitectureEnabled()) { diff --git a/ios/NewExpensify/Info.plist b/ios/NewExpensify/Info.plist index 185e93cfdf2f4..b4bc604d16e76 100644 --- a/ios/NewExpensify/Info.plist +++ b/ios/NewExpensify/Info.plist @@ -30,7 +30,7 @@ CFBundleVersion - 1.2.31.7 + 1.2.31.8 ITSAppUsesNonExemptEncryption LSApplicationQueriesSchemes diff --git a/ios/NewExpensifyTests/Info.plist b/ios/NewExpensifyTests/Info.plist index 021c8af13ad7f..34f500e6e45e0 100644 --- a/ios/NewExpensifyTests/Info.plist +++ b/ios/NewExpensifyTests/Info.plist @@ -19,6 +19,6 @@ CFBundleSignature ???? CFBundleVersion - 1.2.31.7 + 1.2.31.8 diff --git a/package-lock.json b/package-lock.json index a3c1418d127f4..ef21e7eaff620 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "new.expensify", - "version": "1.2.31-7", + "version": "1.2.31-8", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "new.expensify", - "version": "1.2.31-7", + "version": "1.2.31-8", "hasInstallScript": true, "license": "MIT", "dependencies": { diff --git a/package.json b/package.json index fa82c5caf5d5e..9209dc1cb9649 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "new.expensify", - "version": "1.2.31-7", + "version": "1.2.31-8", "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 17bd30b8ce20e32529c2a37a5def53368c36129d Mon Sep 17 00:00:00 2001 From: Vit Horacek <36083550+mountiny@users.noreply.github.com> Date: Thu, 24 Nov 2022 23:29:14 +0000 Subject: [PATCH 2/2] Merge pull request #13028 from Expensify/cmartins-fixReportPage Only navigate to chat reports (cherry picked from commit 5fd7959aa37b37a8ef720167500078f995ef8418) --- src/libs/ReportUtils.js | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/src/libs/ReportUtils.js b/src/libs/ReportUtils.js index b0035909d1d47..2d213feba794d 100644 --- a/src/libs/ReportUtils.js +++ b/src/libs/ReportUtils.js @@ -75,6 +75,15 @@ function getReportParticipantsTitle(logins) { return _.map(logins, login => Str.removeSMSDomain(login)).join(', '); } +/** + * Attempts to find a report in onyx with the provided list of participants + * @param {Object} report + * @returns {Boolean} + */ +function isIOUReport(report) { + return report && _.has(report, 'total'); +} + /** * Check whether a report action is Attachment or not. * Ignore messages containing [Attachment] as the main content. Attachments are actions with only text as [Attachment]. @@ -95,7 +104,7 @@ function isReportMessageAttachment({text, html}) { function sortReportsByLastVisited(reports) { return _.chain(reports) .toArray() - .filter(report => report && report.reportID) + .filter(report => report && report.reportID && !isIOUReport(report)) .sortBy('lastVisitedTimestamp') .value(); }