From 3b3580355fc7e9ea1538b285ee7583f5a41d938e Mon Sep 17 00:00:00 2001
From: OSBotify <76178356+OSBotify@users.noreply.github.com>
Date: Wed, 13 Jul 2022 16:02:36 -0400
Subject: [PATCH 1/2] Merge pull request #9887 from
 Expensify/version-BUILD-A6204D40-5885-4A72-AD98-67847BDA2992

Update version to 1.1.84-6 on main

(cherry picked from commit bc7be6fe7c8f424bd921b490823cd0cd4a842e08)
---
 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 8fd2386148a5..cc86d97989f5 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 1001018405
-        versionName "1.1.84-5"
+        versionCode 1001018406
+        versionName "1.1.84-6"
     }
     splits {
         abi {
diff --git a/ios/NewExpensify/Info.plist b/ios/NewExpensify/Info.plist
index a566e9a7758b..036a80841ce9 100644
--- a/ios/NewExpensify/Info.plist
+++ b/ios/NewExpensify/Info.plist
@@ -30,7 +30,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>1.1.84.5</string>
+	<string>1.1.84.6</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LSApplicationQueriesSchemes</key>
diff --git a/ios/NewExpensifyTests/Info.plist b/ios/NewExpensifyTests/Info.plist
index fa39226434f9..e5515618a603 100644
--- a/ios/NewExpensifyTests/Info.plist
+++ b/ios/NewExpensifyTests/Info.plist
@@ -19,6 +19,6 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>1.1.84.5</string>
+	<string>1.1.84.6</string>
 </dict>
 </plist>
diff --git a/package-lock.json b/package-lock.json
index 30d3bd206fcc..0ba3adac51be 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "new.expensify",
-  "version": "1.1.84-5",
+  "version": "1.1.84-6",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 6cd193f8a48f..7a311642803c 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "new.expensify",
-  "version": "1.1.84-5",
+  "version": "1.1.84-6",
   "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 c3df0ed60fa3813700375368623e38ad1abf65f7 Mon Sep 17 00:00:00 2001
From: Neil Marcellini <neil@expensify.com>
Date: Wed, 13 Jul 2022 12:54:41 -0700
Subject: [PATCH 2/2] Merge pull request #9886 from
 Expensify/marcaaron-isReportFullyVisible

Fix crash when accessing bad method in `ReportActionsView`

(cherry picked from commit a6257d392a5100751d7f551c3fb60097845f475e)
---
 src/pages/home/report/ReportActionsView.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/home/report/ReportActionsView.js b/src/pages/home/report/ReportActionsView.js
index 2348489c9a8b..ef288001ce0e 100755
--- a/src/pages/home/report/ReportActionsView.js
+++ b/src/pages/home/report/ReportActionsView.js
@@ -201,7 +201,7 @@ class ReportActionsView extends React.Component {
 
     componentDidUpdate(prevProps) {
         if (prevProps.network.isOffline && !this.props.network.isOffline) {
-            if (this.isReportFullyVisible()) {
+            if (this.getIsReportFullyVisible()) {
                 Report.openReport(this.props.reportID);
             }
             this.fetchData();