From 3277d52e2b7ac254530399c16c08226fa7a34b4c Mon Sep 17 00:00:00 2001
From: OSBotify <76178356+OSBotify@users.noreply.github.com>
Date: Wed, 3 May 2023 17:40:27 -0400
Subject: [PATCH 1/2] Merge pull request #18378 from
 Expensify/version-BUILD-B01F8E9A-1FB3-46BE-A139-9379312085D0

Update version to 1.3.9-18 on main

(cherry picked from commit 6cb23ab79fae4525d7089d3c4facefeadbafff70)
---
 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 a4d05d95b88e..9f51fab3bacd 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -106,8 +106,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1001030917
-        versionName "1.3.9-17"
+        versionCode 1001030918
+        versionName "1.3.9-18"
     }
 
     splits {
diff --git a/ios/NewExpensify/Info.plist b/ios/NewExpensify/Info.plist
index 327fd4e2c8cd..fe6e3ec56f11 100644
--- a/ios/NewExpensify/Info.plist
+++ b/ios/NewExpensify/Info.plist
@@ -30,7 +30,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>1.3.9.17</string>
+	<string>1.3.9.18</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LSApplicationQueriesSchemes</key>
diff --git a/ios/NewExpensifyTests/Info.plist b/ios/NewExpensifyTests/Info.plist
index 56d9286938ec..20db2ec73760 100644
--- a/ios/NewExpensifyTests/Info.plist
+++ b/ios/NewExpensifyTests/Info.plist
@@ -19,6 +19,6 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>1.3.9.17</string>
+	<string>1.3.9.18</string>
 </dict>
 </plist>
diff --git a/package-lock.json b/package-lock.json
index 96ad55f67ce5..12b6823b7baa 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "new.expensify",
-  "version": "1.3.9-17",
+  "version": "1.3.9-18",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "new.expensify",
-      "version": "1.3.9-17",
+      "version": "1.3.9-18",
       "hasInstallScript": true,
       "license": "MIT",
       "dependencies": {
diff --git a/package.json b/package.json
index dec6f01a1a07..e54a6222b84f 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "new.expensify",
-  "version": "1.3.9-17",
+  "version": "1.3.9-18",
   "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 1f9b37b044a0c31107d6942b00b765592922675f Mon Sep 17 00:00:00 2001
From: Joel Bettner <joelbettner@expensify.com>
Date: Wed, 3 May 2023 15:32:12 -0600
Subject: [PATCH 2/2] Merge pull request #18369 from
 Expensify/francois-defaultAvatatOldDot

[CP Staging] Re-add old-style default avatar prefix

(cherry picked from commit 9b163cf9101855de72a0a6ee487db7a4a70286cc)
---
 src/libs/ReportUtils.js | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/libs/ReportUtils.js b/src/libs/ReportUtils.js
index 3aa99d8ffa0c..3d55927de05c 100644
--- a/src/libs/ReportUtils.js
+++ b/src/libs/ReportUtils.js
@@ -592,7 +592,13 @@ function getOldDotDefaultAvatar(login = '') {
  * @returns {Boolean}
  */
 function isDefaultAvatar(avatarURL) {
-    if (_.isString(avatarURL) && (avatarURL.includes('images/avatars/default-avatar_') || avatarURL.includes('images/avatars/user/default'))) {
+    if (_.isString(avatarURL)
+        && (
+            avatarURL.includes('images/avatars/avatar_')
+            || avatarURL.includes('images/avatars/default-avatar_')
+            || avatarURL.includes('images/avatars/user/default')
+        )
+    ) {
         return true;
     }