diff --git a/android/app/build.gradle b/android/app/build.gradle index 4d5efe8d0068..f41567a8e3b6 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -86,8 +86,8 @@ android { minSdkVersion rootProject.ext.minSdkVersion targetSdkVersion rootProject.ext.targetSdkVersion multiDexEnabled rootProject.ext.multiDexEnabled - versionCode 1001035001 - versionName "1.3.50-1" + versionCode 1001035002 + versionName "1.3.50-2" } signingConfigs { diff --git a/ios/NewExpensify/Info.plist b/ios/NewExpensify/Info.plist index 421b5ad5a7c6..576412cef269 100644 --- a/ios/NewExpensify/Info.plist +++ b/ios/NewExpensify/Info.plist @@ -32,7 +32,7 @@ CFBundleVersion - 1.3.50.1 + 1.3.50.2 ITSAppUsesNonExemptEncryption LSApplicationQueriesSchemes diff --git a/ios/NewExpensifyTests/Info.plist b/ios/NewExpensifyTests/Info.plist index cbd6e3c8a7a9..6c5f8a4eb950 100644 --- a/ios/NewExpensifyTests/Info.plist +++ b/ios/NewExpensifyTests/Info.plist @@ -19,6 +19,6 @@ CFBundleSignature ???? CFBundleVersion - 1.3.50.1 + 1.3.50.2 diff --git a/package-lock.json b/package-lock.json index 966c5b64b60b..dbd33b020725 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "new.expensify", - "version": "1.3.50-1", + "version": "1.3.50-2", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "new.expensify", - "version": "1.3.50-1", + "version": "1.3.50-2", "hasInstallScript": true, "license": "MIT", "dependencies": { diff --git a/package.json b/package.json index a8625cef31f1..70d8274cdd47 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "new.expensify", - "version": "1.3.50-1", + "version": "1.3.50-2", "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.", diff --git a/src/libs/ReportUtils.js b/src/libs/ReportUtils.js index 91c35d4cd956..4fbc4505db91 100644 --- a/src/libs/ReportUtils.js +++ b/src/libs/ReportUtils.js @@ -405,17 +405,6 @@ function isOptimisticPersonalDetail(accountID) { return _.isEmpty(allPersonalDetails[accountID]) || !!allPersonalDetails[accountID].isOptimisticPersonalDetail; } -/** - * Check if report is a DM and personal detail of participant is optimistic data - * @param {String} report - * @returns {Boolean} - */ -function shouldDisableDetailPage(report) { - const participants = lodashGet(report, 'participantAccountIDs', []); - const isMultipleParticipant = participants.length > 1; - return !isMultipleParticipant && isOptimisticPersonalDetail(participants[0]) && !report.parentReportID; -} - /** * Checks if a report is a task report from a policy expense chat. * @@ -460,6 +449,25 @@ function isConciergeChatReport(report) { return lodashGet(report, 'participantAccountIDs', []).length === 1 && Number(report.participantAccountIDs[0]) === CONST.ACCOUNT_ID.CONCIERGE && !isChatThread(report); } +/** + * Check if the report is a single chat report that isn't a thread + * and personal detail of participant is optimistic data + * @param {Object} report + * @param {Array} report.participantAccountIDs + * @returns {Boolean} + */ +function shouldDisableDetailPage(report) { + const participantAccountIDs = lodashGet(report, 'participantAccountIDs', []); + + if (isChatRoom(report) || isPolicyExpenseChat(report) || isChatThread(report)) { + return false; + } + if (participantAccountIDs.length === 1) { + return isOptimisticPersonalDetail(participantAccountIDs[0]); + } + return false; +} + /** * Returns true if there are any Expensify accounts (i.e. with domain 'expensify.com') in the set of accountIDs * by cross-referencing the accountIDs with personalDetails.