From 0547096647936d1a32309eebd2897788a663493b Mon Sep 17 00:00:00 2001
From: OSBotify <76178356+OSBotify@users.noreply.github.com>
Date: Fri, 21 Apr 2023 13:04:56 -0400
Subject: [PATCH 1/2] Merge pull request #17793 from
 Expensify/version-BUILD-82DFF6C2-3E8D-4C0C-BD04-20A09D44A8BA

Update version to 1.3.3-2 on main

(cherry picked from commit 0033493e56a7a1fff4155807f3a7019baad14256)
---
 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 3666515b7661..756a21da91f4 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 1001030301
-        versionName "1.3.3-1"
+        versionCode 1001030302
+        versionName "1.3.3-2"
     }
 
     splits {
diff --git a/ios/NewExpensify/Info.plist b/ios/NewExpensify/Info.plist
index 87d32681edc0..6940876c2c3e 100644
--- a/ios/NewExpensify/Info.plist
+++ b/ios/NewExpensify/Info.plist
@@ -30,7 +30,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>1.3.3.1</string>
+	<string>1.3.3.2</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LSApplicationQueriesSchemes</key>
diff --git a/ios/NewExpensifyTests/Info.plist b/ios/NewExpensifyTests/Info.plist
index a6b084e23f47..64ed9546369c 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.3.1</string>
+	<string>1.3.3.2</string>
 </dict>
 </plist>
diff --git a/package-lock.json b/package-lock.json
index 6acc8beeff82..bdf87be02b57 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "new.expensify",
-  "version": "1.3.3-1",
+  "version": "1.3.3-2",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "new.expensify",
-      "version": "1.3.3-1",
+      "version": "1.3.3-2",
       "hasInstallScript": true,
       "license": "MIT",
       "dependencies": {
diff --git a/package.json b/package.json
index ca62dc59f830..56eb38f17f01 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "new.expensify",
-  "version": "1.3.3-1",
+  "version": "1.3.3-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.",

From 2b05edfc3bfb660cdae219a654ae2efd4f7ce28a Mon Sep 17 00:00:00 2001
From: John Lee <john@expensify.com>
Date: Fri, 21 Apr 2023 12:55:22 -0400
Subject: [PATCH 2/2] Merge pull request #17792 from Expensify/rocio-RemoveThis

Remove this so it doesn't crash after building it

(cherry picked from commit ff9b1f48437f21b39ad7b5ba2887d06e5fce6147)
---
 src/libs/ReportUtils.js | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/libs/ReportUtils.js b/src/libs/ReportUtils.js
index 0c70edfe8f9a..41ab03b816a4 100644
--- a/src/libs/ReportUtils.js
+++ b/src/libs/ReportUtils.js
@@ -1703,6 +1703,14 @@ function canLeaveRoom(report, isPolicyMember) {
     return true;
 }
 
+/**
+ * @param {string[]} participants
+ * @returns {Boolean}
+ */
+function isCurrentUserTheOnlyParticipant(participants) {
+    return participants && participants.length === 1 && participants[0] === sessionEmail;
+}
+
 /**
  * Returns display names for those that can see the whisper.
  * However, it returns "you" if the current user is the only one who can see it besides the person that sent it.
@@ -1711,7 +1719,7 @@ function canLeaveRoom(report, isPolicyMember) {
  * @returns {string}
  */
 function getWhisperDisplayNames(participants) {
-    const isWhisperOnlyVisibleToCurrentUSer = this.isCurrentUserTheOnlyParticipant(participants);
+    const isWhisperOnlyVisibleToCurrentUSer = isCurrentUserTheOnlyParticipant(participants);
 
     // When the current user is the only participant, the display name needs to be "you" because that's the only person reading it
     if (isWhisperOnlyVisibleToCurrentUSer) {
@@ -1721,14 +1729,6 @@ function getWhisperDisplayNames(participants) {
     return _.map(participants, login => getDisplayNameForParticipant(login, !isWhisperOnlyVisibleToCurrentUSer)).join(', ');
 }
 
-/**
- * @param {string[]} participants
- * @returns {Boolean}
- */
-function isCurrentUserTheOnlyParticipant(participants) {
-    return participants && participants.length === 1 && participants[0] === sessionEmail;
-}
-
 export {
     getReportParticipantsTitle,
     isReportMessageAttachment,