From 95c05bd24ac84ffb2c9f8084a7994dda6fe42953 Mon Sep 17 00:00:00 2001
From: OSBotify <76178356+OSBotify@users.noreply.github.com>
Date: Tue, 25 Apr 2023 16:52:13 -0400
Subject: [PATCH 1/2] Merge pull request #17989 from
 Expensify/version-BUILD-00045E0B-6E7D-43D5-8EF2-ECAE15E63905

Update version to 1.3.5-6 on main

(cherry picked from commit c3a8ad9b5073c9fb2fb27698b173e4bc8c733c85)
---
 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 f283b566d7b3..d2329a6dc9c8 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 1001030505
-        versionName "1.3.5-5"
+        versionCode 1001030506
+        versionName "1.3.5-6"
     }
 
     splits {
diff --git a/ios/NewExpensify/Info.plist b/ios/NewExpensify/Info.plist
index ac801923c5a3..7777ad8ea62b 100644
--- a/ios/NewExpensify/Info.plist
+++ b/ios/NewExpensify/Info.plist
@@ -30,7 +30,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>1.3.5.5</string>
+	<string>1.3.5.6</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LSApplicationQueriesSchemes</key>
diff --git a/ios/NewExpensifyTests/Info.plist b/ios/NewExpensifyTests/Info.plist
index 21f29ac8f82a..09f034682ce4 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.5.5</string>
+	<string>1.3.5.6</string>
 </dict>
 </plist>
diff --git a/package-lock.json b/package-lock.json
index 42dcdcb27c38..0fa4933091c3 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "new.expensify",
-  "version": "1.3.5-5",
+  "version": "1.3.5-6",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "new.expensify",
-      "version": "1.3.5-5",
+      "version": "1.3.5-6",
       "hasInstallScript": true,
       "license": "MIT",
       "dependencies": {
diff --git a/package.json b/package.json
index d623c5131403..fb9bb52e81ad 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "new.expensify",
-  "version": "1.3.5-5",
+  "version": "1.3.5-6",
   "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 439545d644b0591dbe0ceba42451f8d3c6dfcd5c Mon Sep 17 00:00:00 2001
From: Hayata Suenaga <hayata@expensify.com>
Date: Tue, 25 Apr 2023 13:41:52 -0700
Subject: [PATCH 2/2] Merge pull request #17988 from
 Expensify/jasper-fixUndefinedPersonalDetailsAccess

Fix undefined personal details access causing crash when calling getOptions

(cherry picked from commit 295f30e0f28272c882bc44e85931e2e1975584e0)
---
 src/libs/OptionsListUtils.js | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/libs/OptionsListUtils.js b/src/libs/OptionsListUtils.js
index e5a5d22bec6e..e05c3613207d 100644
--- a/src/libs/OptionsListUtils.js
+++ b/src/libs/OptionsListUtils.js
@@ -436,9 +436,10 @@ function createOption(logins, personalDetails, report, reportActions = {}, {
         }
         reportName = ReportUtils.getReportName(report, policies);
     } else {
-        reportName = ReportUtils.getDisplayNameForParticipant(logins[0]);
-        result.keyForList = personalDetail.login;
-        result.alternateText = LocalePhoneNumber.formatPhoneNumber(personalDetail.login);
+        const login = logins[0];
+        reportName = ReportUtils.getDisplayNameForParticipant(login);
+        result.keyForList = login;
+        result.alternateText = LocalePhoneNumber.formatPhoneNumber(login);
     }
 
     result.isIOUReportOwner = ReportUtils.isIOUOwnedByCurrentUser(result, iouReports);