From e8f984290c3ecb82857384fb103f53b245bdf086 Mon Sep 17 00:00:00 2001
From: OSBotify <76178356+OSBotify@users.noreply.github.com>
Date: Mon, 12 Dec 2022 18:33:12 -0500
Subject: [PATCH 1/2] Merge pull request #13544 from
Expensify/version-BUILD-CD6B22E8-5650-4760-9D79-5F57EDDC9DF4
Update version to 1.2.38-4 on main
(cherry picked from commit b639eb4129300935c65ad71158a86baab82bc3d5)
---
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 a9d5716b2963..d477359e8a04 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 1001023803
- versionName "1.2.38-3"
+ versionCode 1001023804
+ versionName "1.2.38-4"
buildConfigField "boolean", "IS_NEW_ARCHITECTURE_ENABLED", isNewArchitectureEnabled().toString()
if (isNewArchitectureEnabled()) {
diff --git a/ios/NewExpensify/Info.plist b/ios/NewExpensify/Info.plist
index dba2c9895f05..3963291283e7 100644
--- a/ios/NewExpensify/Info.plist
+++ b/ios/NewExpensify/Info.plist
@@ -30,7 +30,7 @@
CFBundleVersion
- 1.2.38.3
+ 1.2.38.4
ITSAppUsesNonExemptEncryption
LSApplicationQueriesSchemes
diff --git a/ios/NewExpensifyTests/Info.plist b/ios/NewExpensifyTests/Info.plist
index e922988b2858..e80d2b028d4a 100644
--- a/ios/NewExpensifyTests/Info.plist
+++ b/ios/NewExpensifyTests/Info.plist
@@ -19,6 +19,6 @@
CFBundleSignature
????
CFBundleVersion
- 1.2.38.3
+ 1.2.38.4
diff --git a/package-lock.json b/package-lock.json
index eaa8756ed925..f8d93dd3871c 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
{
"name": "new.expensify",
- "version": "1.2.38-3",
+ "version": "1.2.38-4",
"lockfileVersion": 2,
"requires": true,
"packages": {
"": {
"name": "new.expensify",
- "version": "1.2.38-3",
+ "version": "1.2.38-4",
"hasInstallScript": true,
"license": "MIT",
"dependencies": {
diff --git a/package.json b/package.json
index d6e6eb86f930..2a97771239a2 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "new.expensify",
- "version": "1.2.38-3",
+ "version": "1.2.38-4",
"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 d12e15a70fceb621edc03d1a3203165c00e09c77 Mon Sep 17 00:00:00 2001
From: Monil Bhavsar
Date: Mon, 12 Dec 2022 23:26:51 +0000
Subject: [PATCH 2/2] Merge pull request #13531 from
Expensify/aldo_avoid-crash-empty-report
Report can be a {}, improve check for emptyness/falsey
(cherry picked from commit 910167268e79decae88ce039839fb35cd9cff0bc)
---
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 58c23bb46d66..e8b6c65aaa3f 100644
--- a/src/libs/ReportUtils.js
+++ b/src/libs/ReportUtils.js
@@ -436,7 +436,7 @@ function getDefaultAvatar(login = '') {
* @returns {Array<*>}
*/
function getIcons(report, personalDetails, policies, defaultIcon = null) {
- if (!report) {
+ if (_.isEmpty(report)) {
return [defaultIcon || getDefaultAvatar()];
}
if (isArchivedRoom(report)) {