From b4acae33343df4915e54d1959202e11428825d3f Mon Sep 17 00:00:00 2001
From: OSBotify <76178356+OSBotify@users.noreply.github.com>
Date: Mon, 19 Jun 2023 14:37:02 -0400
Subject: [PATCH 1/2] Merge pull request #21069 from
Expensify/version-BUILD-40E0B04A-5205-4860-90DE-9205AC4D07DA
Update version to 1.3.29-3 on main
(cherry picked from commit 55e3cb9ddadde1e7ca3c60d1586343a84ffc9754)
---
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 fea11f76fba2..74f52a25b7fc 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 1001032902
- versionName "1.3.29-2"
+ versionCode 1001032903
+ versionName "1.3.29-3"
}
splits {
diff --git a/ios/NewExpensify/Info.plist b/ios/NewExpensify/Info.plist
index 258a9a63f2de..36db5a1a7925 100644
--- a/ios/NewExpensify/Info.plist
+++ b/ios/NewExpensify/Info.plist
@@ -32,7 +32,7 @@
CFBundleVersion
- 1.3.29.2
+ 1.3.29.3
ITSAppUsesNonExemptEncryption
LSApplicationQueriesSchemes
diff --git a/ios/NewExpensifyTests/Info.plist b/ios/NewExpensifyTests/Info.plist
index 9fd31b93a56c..85da6b831671 100644
--- a/ios/NewExpensifyTests/Info.plist
+++ b/ios/NewExpensifyTests/Info.plist
@@ -19,6 +19,6 @@
CFBundleSignature
????
CFBundleVersion
- 1.3.29.2
+ 1.3.29.3
diff --git a/package-lock.json b/package-lock.json
index c9af612dce2d..91467cada5d7 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
{
"name": "new.expensify",
- "version": "1.3.29-2",
+ "version": "1.3.29-3",
"lockfileVersion": 2,
"requires": true,
"packages": {
"": {
"name": "new.expensify",
- "version": "1.3.29-2",
+ "version": "1.3.29-3",
"hasInstallScript": true,
"license": "MIT",
"dependencies": {
diff --git a/package.json b/package.json
index d8295fb30f52..d0b6acc87d94 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "new.expensify",
- "version": "1.3.29-2",
+ "version": "1.3.29-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 9b955e9f66ea78940e54e972ac6e4b4823357661 Mon Sep 17 00:00:00 2001
From: Carlos Martins
Date: Mon, 19 Jun 2023 12:31:48 -0600
Subject: [PATCH 2/2] Merge pull request #20951 from
Expensify/yuwen-personalDetailFallback
[CP Staging] Make sure that we first check the PersonalDetails we already have before creating fake optimistic personal details
(cherry picked from commit 8456d27561414caf7467d5861ee42a48a3f034f0)
---
src/libs/actions/Report.js | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/src/libs/actions/Report.js b/src/libs/actions/Report.js
index 8c62046dea5a..5f24bcf7c409 100644
--- a/src/libs/actions/Report.js
+++ b/src/libs/actions/Report.js
@@ -67,6 +67,14 @@ Onyx.connect({
callback: (val) => (isNetworkOffline = lodashGet(val, 'isOffline', false)),
});
+let allPersonalDetails;
+Onyx.connect({
+ key: ONYXKEYS.PERSONAL_DETAILS_LIST,
+ callback: (val) => {
+ allPersonalDetails = val || {};
+ },
+});
+
const allReports = {};
let conciergeChatReportID;
const typingWatchTimers = {};
@@ -420,7 +428,7 @@ function openReport(reportID, participantLoginList = [], newReportObject = {}, p
const optimisticPersonalDetails = {};
_.map(participantLoginList, (login, index) => {
const accountID = newReportObject.participantAccountIDs[index];
- optimisticPersonalDetails[accountID] = {
+ optimisticPersonalDetails[accountID] = allPersonalDetails[accountID] || {
login,
accountID,
avatar: UserUtils.getDefaultAvatarURL(accountID),