From 9cec840210888a3b3c9448eba5e760e25fd7e666 Mon Sep 17 00:00:00 2001
From: OSBotify <76178356+OSBotify@users.noreply.github.com>
Date: Thu, 20 Oct 2022 10:12:57 -0400
Subject: [PATCH 1/2] Merge pull request #12039 from
Expensify/version-BUILD-8BB98902-F4A9-4361-8042-07993CDA3244
Update version to 1.2.18-4 on main
(cherry picked from commit f24c24c00bd4a5c7839b76637dfa375e9e4ec111)
---
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 8d4ddaaec716..04dba1f580d5 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -156,8 +156,8 @@ android {
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
multiDexEnabled rootProject.ext.multiDexEnabled
- versionCode 1001021803
- versionName "1.2.18-3"
+ versionCode 1001021804
+ versionName "1.2.18-4"
buildConfigField "boolean", "IS_NEW_ARCHITECTURE_ENABLED", isNewArchitectureEnabled().toString()
if (isNewArchitectureEnabled()) {
diff --git a/ios/NewExpensify/Info.plist b/ios/NewExpensify/Info.plist
index 5d2160fb41a3..3b59b633fbb4 100644
--- a/ios/NewExpensify/Info.plist
+++ b/ios/NewExpensify/Info.plist
@@ -30,7 +30,7 @@
CFBundleVersion
- 1.2.18.3
+ 1.2.18.4
ITSAppUsesNonExemptEncryption
LSApplicationQueriesSchemes
diff --git a/ios/NewExpensifyTests/Info.plist b/ios/NewExpensifyTests/Info.plist
index bbfc0448c762..8317aaa4f4df 100644
--- a/ios/NewExpensifyTests/Info.plist
+++ b/ios/NewExpensifyTests/Info.plist
@@ -19,6 +19,6 @@
CFBundleSignature
????
CFBundleVersion
- 1.2.18.3
+ 1.2.18.4
diff --git a/package-lock.json b/package-lock.json
index 821195655b59..58cc490c2d4c 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
{
"name": "new.expensify",
- "version": "1.2.18-3",
+ "version": "1.2.18-4",
"lockfileVersion": 2,
"requires": true,
"packages": {
"": {
"name": "new.expensify",
- "version": "1.2.18-3",
+ "version": "1.2.18-4",
"hasInstallScript": true,
"license": "MIT",
"dependencies": {
diff --git a/package.json b/package.json
index fd84147bfb86..1f5ad3e779ed 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "new.expensify",
- "version": "1.2.18-3",
+ "version": "1.2.18-4",
"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 fc79da22ac22f740e4090dec482f4e38a3d85a47 Mon Sep 17 00:00:00 2001
From: Vit Horacek <36083550+mountiny@users.noreply.github.com>
Date: Thu, 20 Oct 2022 10:07:17 -0400
Subject: [PATCH 2/2] Merge pull request #12038 from
Expensify/vit-fixDeployBlocker
[CP Staging] Fix hasExpensifyGuidesEmails call
(cherry picked from commit 5cb3c348a9a9b3b7dcba7506287995c230293110)
---
src/libs/ReportUtils.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/libs/ReportUtils.js b/src/libs/ReportUtils.js
index 15095f980246..d95024d9153d 100644
--- a/src/libs/ReportUtils.js
+++ b/src/libs/ReportUtils.js
@@ -941,7 +941,7 @@ function shouldReportBeInOptionList(report, reportIDFromRoute, isInGSDMode, curr
}
// Include default rooms unless you're on the default room beta, unless you have an assigned guide
- if (isDefaultRoom(report) && !Permissions.canUseDefaultRooms(betas) && !this.hasExpensifyGuidesEmails(lodashGet(report, ['participants'], []))) {
+ if (isDefaultRoom(report) && !Permissions.canUseDefaultRooms(betas) && !hasExpensifyGuidesEmails(lodashGet(report, ['participants'], []))) {
return false;
}