From 5695464492788a7b9dd00318005a73854ed53774 Mon Sep 17 00:00:00 2001 From: OSBotify <76178356+OSBotify@users.noreply.github.com> Date: Fri, 13 May 2022 17:41:46 -0700 Subject: [PATCH 1/2] Merge pull request #9011 from Expensify/version-BUILD-71a96f1b0c3facd50f7cc723416affd5ed2df2a7 Update version to 1.1.60-3 on main (cherry picked from commit 572f6cb1b161fbb90fad17569f10c4af4926e773) --- android/app/build.gradle | 4 ++-- ios/NewExpensify/Info.plist | 2 +- ios/NewExpensifyTests/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 7115eca45c25..0b16d9136f37 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -152,8 +152,8 @@ android { minSdkVersion rootProject.ext.minSdkVersion targetSdkVersion rootProject.ext.targetSdkVersion multiDexEnabled rootProject.ext.multiDexEnabled - versionCode 1001016002 - versionName "1.1.60-2" + versionCode 1001016003 + versionName "1.1.60-3" } splits { abi { diff --git a/ios/NewExpensify/Info.plist b/ios/NewExpensify/Info.plist index 0caefd27c94f..93d6601ab4fa 100644 --- a/ios/NewExpensify/Info.plist +++ b/ios/NewExpensify/Info.plist @@ -30,7 +30,7 @@ CFBundleVersion - 1.1.60.2 + 1.1.60.3 ITSAppUsesNonExemptEncryption LSApplicationQueriesSchemes diff --git a/ios/NewExpensifyTests/Info.plist b/ios/NewExpensifyTests/Info.plist index 7def85669fd7..5e9bf6b0f020 100644 --- a/ios/NewExpensifyTests/Info.plist +++ b/ios/NewExpensifyTests/Info.plist @@ -19,6 +19,6 @@ CFBundleSignature ???? CFBundleVersion - 1.1.60.2 + 1.1.60.3 diff --git a/package-lock.json b/package-lock.json index f786f3642974..91c8c59bdb3c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "new.expensify", - "version": "1.1.60-2", + "version": "1.1.60-3", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index 5551cd135f94..4096beb17bfb 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "new.expensify", - "version": "1.1.60-2", + "version": "1.1.60-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 58c35199017d4e2a3291021dd25617d824a45c02 Mon Sep 17 00:00:00 2001 From: Scott Deeter Date: Fri, 13 May 2022 13:27:53 -0700 Subject: [PATCH 2/2] Merge pull request #8998 from Santhosh-Sellavel/deployblocker_8996 press enter in search for new user email fixed (cherry picked from commit e3da3d3ff918af1d1ce963c9302f7679afdbacf6) --- src/libs/ReportUtils.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libs/ReportUtils.js b/src/libs/ReportUtils.js index 2cfdfa289711..04692d69780f 100644 --- a/src/libs/ReportUtils.js +++ b/src/libs/ReportUtils.js @@ -450,7 +450,7 @@ function getDisplayNamesWithTooltips(participants, isMultipleParticipantReport) */ function getReportName(report, personalDetailsForParticipants = {}, policies = {}) { if (lodashGet(report, 'reportNameValuePairs.type') !== 'chat') { - return report.reportName || ''; + return lodashGet(report, 'reportName', ''); } let formattedName;