From 0426819f704e5377ddf1ea5234cc0fcfc55da61d Mon Sep 17 00:00:00 2001
From: OSBotify <76178356+OSBotify@users.noreply.github.com>
Date: Wed, 17 May 2023 18:52:41 -0400
Subject: [PATCH 1/2] Merge pull request #19151 from
 Expensify/version-BUILD-525EBAEC-CBC7-4F6C-AEBB-1B2C6B65AEAC

Update version to 1.3.15-7 on main

(cherry picked from commit c2a9130d07065ac98acbd70444cdc1243a40cce7)
---
 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 503b2d941a82..e38be596dc54 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 1001031506
-        versionName "1.3.15-6"
+        versionCode 1001031507
+        versionName "1.3.15-7"
     }
 
     splits {
diff --git a/ios/NewExpensify/Info.plist b/ios/NewExpensify/Info.plist
index af0e9c38ebf9..08c50d1346e7 100644
--- a/ios/NewExpensify/Info.plist
+++ b/ios/NewExpensify/Info.plist
@@ -30,7 +30,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>1.3.15.6</string>
+	<string>1.3.15.7</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LSApplicationQueriesSchemes</key>
diff --git a/ios/NewExpensifyTests/Info.plist b/ios/NewExpensifyTests/Info.plist
index 6462413cefd8..773e271dc84b 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.3.15.6</string>
+	<string>1.3.15.7</string>
 </dict>
 </plist>
diff --git a/package-lock.json b/package-lock.json
index 88024f346f81..431010627226 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "new.expensify",
-  "version": "1.3.15-6",
+  "version": "1.3.15-7",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "new.expensify",
-      "version": "1.3.15-6",
+      "version": "1.3.15-7",
       "hasInstallScript": true,
       "license": "MIT",
       "dependencies": {
diff --git a/package.json b/package.json
index 682a5db7faea..451196c71ed1 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "new.expensify",
-  "version": "1.3.15-6",
+  "version": "1.3.15-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 1cc69d9746053bf6a3c00ba844b9d99755b5a5cf Mon Sep 17 00:00:00 2001
From: Jasper Huang <jasper@expensify.com>
Date: Wed, 17 May 2023 15:42:20 -0700
Subject: [PATCH 2/2] Merge pull request #19148 from Expensify/chirag-bug-fix

using props reportID

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

diff --git a/src/pages/home/ReportScreen.js b/src/pages/home/ReportScreen.js
index 680b3d9dd3d3..5ae3b0e8e294 100644
--- a/src/pages/home/ReportScreen.js
+++ b/src/pages/home/ReportScreen.js
@@ -267,7 +267,7 @@ class ReportScreen extends React.Component {
                     }
                 >
                     <FullPageNotFoundView
-                        shouldShow={(!reportID && !this.props.report.isLoadingReportActions && !isLoading) || shouldHideReport}
+                        shouldShow={(!this.props.report.reportID && !this.props.report.isLoadingReportActions && !isLoading) || shouldHideReport}
                         subtitleKey="notFound.noAccess"
                         shouldShowCloseButton={false}
                         shouldShowBackButton={this.props.isSmallScreenWidth}