From 9c8b02237026bc1b5b9ea8687a1ab271215e54f3 Mon Sep 17 00:00:00 2001
From: OSBotify <76178356+OSBotify@users.noreply.github.com>
Date: Wed, 8 Feb 2023 17:12:01 -0500
Subject: [PATCH 1/2] Merge pull request #14959 from
Expensify/version-BUILD-944066A0-78FB-4D16-8996-84DF4A4731A1
Update version to 1.2.67-7 on main
(cherry picked from commit 3723009062e8a04a02cd261fb210e1ce578571a3)
---
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 5046aac66445..4171f1fee1fc 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 1001026706
- versionName "1.2.67-6"
+ versionCode 1001026707
+ versionName "1.2.67-7"
buildConfigField "boolean", "IS_NEW_ARCHITECTURE_ENABLED", isNewArchitectureEnabled().toString()
if (isNewArchitectureEnabled()) {
diff --git a/ios/NewExpensify/Info.plist b/ios/NewExpensify/Info.plist
index d06f8954c050..db30a3fba079 100644
--- a/ios/NewExpensify/Info.plist
+++ b/ios/NewExpensify/Info.plist
@@ -30,7 +30,7 @@
CFBundleVersion
- 1.2.67.6
+ 1.2.67.7
ITSAppUsesNonExemptEncryption
LSApplicationQueriesSchemes
diff --git a/ios/NewExpensifyTests/Info.plist b/ios/NewExpensifyTests/Info.plist
index 0f0ef17989c2..a850b62e14c7 100644
--- a/ios/NewExpensifyTests/Info.plist
+++ b/ios/NewExpensifyTests/Info.plist
@@ -19,6 +19,6 @@
CFBundleSignature
????
CFBundleVersion
- 1.2.67.6
+ 1.2.67.7
diff --git a/package-lock.json b/package-lock.json
index f1cc15ea6a65..72f6acf5462e 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
{
"name": "new.expensify",
- "version": "1.2.67-6",
+ "version": "1.2.67-7",
"lockfileVersion": 2,
"requires": true,
"packages": {
"": {
"name": "new.expensify",
- "version": "1.2.67-6",
+ "version": "1.2.67-7",
"hasInstallScript": true,
"license": "MIT",
"dependencies": {
diff --git a/package.json b/package.json
index d8b5462c1098..8d94045fb456 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "new.expensify",
- "version": "1.2.67-6",
+ "version": "1.2.67-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 663e88f58de656e39f2aeec8e9ef0a53cec04a18 Mon Sep 17 00:00:00 2001
From: Maxence Coulibaly
Date: Wed, 8 Feb 2023 22:06:05 +0000
Subject: [PATCH 2/2] Merge pull request #14955 from
Expensify/marco-checkRouteParams
[CP Staging] Get route.params.openOnAdminRoom if exists
(cherry picked from commit 05f5c49f65f92c0212c19924ac6e1ff5d115ab64)
---
src/libs/Navigation/AppNavigator/MainDrawerNavigator.js | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/src/libs/Navigation/AppNavigator/MainDrawerNavigator.js b/src/libs/Navigation/AppNavigator/MainDrawerNavigator.js
index 59e91f3d6a89..4360c1271aec 100644
--- a/src/libs/Navigation/AppNavigator/MainDrawerNavigator.js
+++ b/src/libs/Navigation/AppNavigator/MainDrawerNavigator.js
@@ -68,7 +68,12 @@ class MainDrawerNavigator extends Component {
constructor(props) {
super(props);
this.trackAppStartTiming = this.trackAppStartTiming.bind(this);
- this.initialParams = getInitialReportScreenParams(props.reports, !Permissions.canUseDefaultRooms(props.betas), props.policies, props.route.params.openOnAdminRoom);
+ this.initialParams = getInitialReportScreenParams(
+ props.reports,
+ !Permissions.canUseDefaultRooms(props.betas),
+ props.policies,
+ lodashGet(props, 'route.params.openOnAdminRoom', false),
+ );
// When we have chat reports the moment this component got created
// we know that the data was served from storage/cache
@@ -80,7 +85,7 @@ class MainDrawerNavigator extends Component {
nextProps.reports,
!Permissions.canUseDefaultRooms(nextProps.betas),
nextProps.policies,
- nextProps.route.params.openOnAdminRoom,
+ lodashGet(nextProps, 'route.params.openOnAdminRoom', false),
);
if (this.initialParams.reportID === initialNextParams.reportID) {
return false;