From 83abbafade5c8c68ff3429bc5fe1a5b47e362347 Mon Sep 17 00:00:00 2001
From: OSBotify <76178356+OSBotify@users.noreply.github.com>
Date: Fri, 22 Jul 2022 12:06:01 -0400
Subject: [PATCH 1/2] Merge pull request #10054 from
Expensify/version-BUILD-05B6BDBC-8340-44AE-877D-009F661A2A3D
Update version to 1.1.85-7 on main
(cherry picked from commit e5c7ad40f85f77abc951f712232df8dd3d6d4eaf)
---
android/app/build.gradle | 4 ++--
ios/NewExpensify/Info.plist | 2 +-
ios/NewExpensifyTests/Info.plist | 2 +-
package-lock.json | 2 +-
package.json | 2 +-
5 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/android/app/build.gradle b/android/app/build.gradle
index 50b4ff2e0cc7..aed76e6becb4 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -152,8 +152,8 @@ android {
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
multiDexEnabled rootProject.ext.multiDexEnabled
- versionCode 1001018506
- versionName "1.1.85-6"
+ versionCode 1001018507
+ versionName "1.1.85-7"
}
splits {
abi {
diff --git a/ios/NewExpensify/Info.plist b/ios/NewExpensify/Info.plist
index 51c38da73658..780c3cd4780a 100644
--- a/ios/NewExpensify/Info.plist
+++ b/ios/NewExpensify/Info.plist
@@ -30,7 +30,7 @@
CFBundleVersion
- 1.1.85.6
+ 1.1.85.7
ITSAppUsesNonExemptEncryption
LSApplicationQueriesSchemes
diff --git a/ios/NewExpensifyTests/Info.plist b/ios/NewExpensifyTests/Info.plist
index ce6fbf2a107d..ad0bf14ea4ef 100644
--- a/ios/NewExpensifyTests/Info.plist
+++ b/ios/NewExpensifyTests/Info.plist
@@ -19,6 +19,6 @@
CFBundleSignature
????
CFBundleVersion
- 1.1.85.6
+ 1.1.85.7
diff --git a/package-lock.json b/package-lock.json
index 1361ead34bc3..4c530b4ed044 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
{
"name": "new.expensify",
- "version": "1.1.85-6",
+ "version": "1.1.85-7",
"lockfileVersion": 1,
"requires": true,
"dependencies": {
diff --git a/package.json b/package.json
index 3bf1fff80270..a1c25573e12f 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "new.expensify",
- "version": "1.1.85-6",
+ "version": "1.1.85-7",
"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 146e0de27ceda857e714b0b2d30e25ecef0a57cc Mon Sep 17 00:00:00 2001
From: Marc Glasser
Date: Wed, 20 Jul 2022 07:55:07 -1000
Subject: [PATCH 2/2] Merge pull request #9956 from
Expensify/marcaaron-fixBuildOptimisticReportActionCrash
Get current user personal details directly in `Report.js`
(cherry picked from commit ed3be19932a92cd4e389a3f0f7b0812dc7f4277f)
---
src/libs/actions/Report.js | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/libs/actions/Report.js b/src/libs/actions/Report.js
index f851f172e111..ee146c5d1515 100644
--- a/src/libs/actions/Report.js
+++ b/src/libs/actions/Report.js
@@ -50,10 +50,10 @@ Onyx.connect({
callback: val => lastViewedReportID = val ? Number(val) : null,
});
-let myPersonalDetails;
+let personalDetails;
Onyx.connect({
key: ONYXKEYS.PERSONAL_DETAILS,
- callback: val => myPersonalDetails = val[currentUserEmail],
+ callback: val => personalDetails = val,
});
const allReports = {};
@@ -859,7 +859,7 @@ function buildOptimisticReportAction(reportID, text, file) {
person: [
{
style: 'strong',
- text: myPersonalDetails.displayName || currentUserEmail,
+ text: lodashGet(personalDetails, [currentUserEmail, 'displayName'], currentUserEmail),
type: 'TEXT',
},
],
@@ -868,7 +868,7 @@ function buildOptimisticReportAction(reportID, text, file) {
// Use the client generated ID as a optimistic action ID so we can remove it later
sequenceNumber: optimisticReportActionID,
clientID: optimisticReportActionID,
- avatar: myPersonalDetails.avatar,
+ avatar: lodashGet(personalDetails, [currentUserEmail, 'avatar'], ReportUtils.getDefaultAvatar(currentUserEmail)),
timestamp: moment().unix(),
message: [
{