From 5aff13eb9991ceb82e845b9658d81eed73e696f4 Mon Sep 17 00:00:00 2001
From: OSBotify <76178356+OSBotify@users.noreply.github.com>
Date: Tue, 30 May 2023 13:14:50 -0400
Subject: [PATCH 1/2] Merge pull request #19832 from
Expensify/version-BUILD-68148967-7A00-4B58-8033-BA14DEA04051
Update version to 1.3.20-3 on main
(cherry picked from commit 933264afbc0f2285cf905a0767b75472721cf537)
---
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 b0fa64f57a50..0c8ebf1a9a37 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 1001032002
- versionName "1.3.20-2"
+ versionCode 1001032003
+ versionName "1.3.20-3"
}
splits {
diff --git a/ios/NewExpensify/Info.plist b/ios/NewExpensify/Info.plist
index a67bdda052dd..47403abe9f5b 100644
--- a/ios/NewExpensify/Info.plist
+++ b/ios/NewExpensify/Info.plist
@@ -30,7 +30,7 @@
CFBundleVersion
- 1.3.20.2
+ 1.3.20.3
ITSAppUsesNonExemptEncryption
LSApplicationQueriesSchemes
diff --git a/ios/NewExpensifyTests/Info.plist b/ios/NewExpensifyTests/Info.plist
index 86d52d04cc68..6514699a9169 100644
--- a/ios/NewExpensifyTests/Info.plist
+++ b/ios/NewExpensifyTests/Info.plist
@@ -19,6 +19,6 @@
CFBundleSignature
????
CFBundleVersion
- 1.3.20.2
+ 1.3.20.3
diff --git a/package-lock.json b/package-lock.json
index f67e98694149..93e1d0210919 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
{
"name": "new.expensify",
- "version": "1.3.20-2",
+ "version": "1.3.20-3",
"lockfileVersion": 2,
"requires": true,
"packages": {
"": {
"name": "new.expensify",
- "version": "1.3.20-2",
+ "version": "1.3.20-3",
"hasInstallScript": true,
"license": "MIT",
"dependencies": {
diff --git a/package.json b/package.json
index a8b1e5b9e22f..ddb387bceaad 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "new.expensify",
- "version": "1.3.20-2",
+ "version": "1.3.20-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 b73f3dbae3effe2b151f6c172018604e119ab63c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marco=20Ch=C3=A1vez?=
Date: Tue, 30 May 2023 11:06:00 -0600
Subject: [PATCH 2/2] Merge pull request #19818 from
situchan/fix/18293-follow-up
fix crash when open report for anonymous user
(cherry picked from commit 00a771f6b05c4360f8a61fbe12917e9d4e5e0776)
---
src/libs/BootSplash/index.js | 3 ++-
src/libs/ReportUtils.js | 5 +++++
2 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/src/libs/BootSplash/index.js b/src/libs/BootSplash/index.js
index b9b8692f687c..ff7ab5562b1f 100644
--- a/src/libs/BootSplash/index.js
+++ b/src/libs/BootSplash/index.js
@@ -9,9 +9,10 @@ function hide() {
return document.fonts.ready.then(() => {
const splash = document.getElementById('splash');
- splash.style.opacity = 0;
+ if (splash) splash.style.opacity = 0;
return resolveAfter(250).then(() => {
+ if (!splash || !splash.parentNode) return;
splash.parentNode.removeChild(splash);
});
});
diff --git a/src/libs/ReportUtils.js b/src/libs/ReportUtils.js
index 249e862b753d..3de5af38a306 100644
--- a/src/libs/ReportUtils.js
+++ b/src/libs/ReportUtils.js
@@ -455,6 +455,11 @@ function isAllowedToComment(report) {
return true;
}
+ // If unauthenticated user opens public chat room using deeplink, they do not have policies available and they cannot comment
+ if (!allPolicies) {
+ return false;
+ }
+
// If we've made it here, commenting on this report is restricted.
// If the user is an admin, allow them to post.
const policy = allPolicies[`${ONYXKEYS.COLLECTION.POLICY}${report.policyID}`];