From 38a852c6639d09510cd0cd3fd88fe59a0bedb91a Mon Sep 17 00:00:00 2001
From: OSBotify <76178356+OSBotify@users.noreply.github.com>
Date: Fri, 9 Jul 2021 09:39:32 -0700
Subject: [PATCH 1/2] Merge pull request #3948 from
 Expensify/version-BUILD-2db53ecdca5e2762a5c394aef895123fb0f5f332

(cherry picked from commit 263ce68a2fc2df530ac88c047c71d4609dbc5ae0)
---
 android/app/build.gradle          | 4 ++--
 ios/ExpensifyCash/Info.plist      | 2 +-
 ios/ExpensifyCashTests/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 ea27891555d7..e0c4ad0ef2b4 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -148,8 +148,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1001007601
-        versionName "1.0.76-1"
+        versionCode 1001007602
+        versionName "1.0.76-2"
     }
     splits {
         abi {
diff --git a/ios/ExpensifyCash/Info.plist b/ios/ExpensifyCash/Info.plist
index 38e304c3f1d5..a4c2a01c027f 100644
--- a/ios/ExpensifyCash/Info.plist
+++ b/ios/ExpensifyCash/Info.plist
@@ -30,7 +30,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>1.0.76.1</string>
+	<string>1.0.76.2</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LSApplicationQueriesSchemes</key>
diff --git a/ios/ExpensifyCashTests/Info.plist b/ios/ExpensifyCashTests/Info.plist
index 8d4d2455e09b..d54a7ac013cf 100644
--- a/ios/ExpensifyCashTests/Info.plist
+++ b/ios/ExpensifyCashTests/Info.plist
@@ -19,6 +19,6 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>1.0.76.1</string>
+	<string>1.0.76.2</string>
 </dict>
 </plist>
diff --git a/package-lock.json b/package-lock.json
index 1ffc3b2610ad..599741eada21 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "expensify.cash",
-  "version": "1.0.76-1",
+  "version": "1.0.76-2",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 0ab95bfd8b56..1ccf92470989 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "expensify.cash",
-  "version": "1.0.76-1",
+  "version": "1.0.76-2",
   "author": "Expensify, Inc.",
   "homepage": "https://expensify.cash",
   "description": "Expensify.cash is the next generation of Expensify: a reimagination of payments based atop a foundation of chat.",

From 28814e5a3de7b2c7d60e17597700bae5d2fb5292 Mon Sep 17 00:00:00 2001
From: Rory Abraham <47436092+roryabraham@users.noreply.github.com>
Date: Thu, 8 Jul 2021 11:10:25 -0700
Subject: [PATCH 2/2] Merge pull request #3908 from rdjuric/transitionFix

Improves transition when changing chats

(cherry picked from commit b1f09a3b276ea6b4771f285879d0ffa161f707ce)
---
 src/pages/home/ReportScreen.js | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)

diff --git a/src/pages/home/ReportScreen.js b/src/pages/home/ReportScreen.js
index 259ccaf20de5..0020eebdc831 100644
--- a/src/pages/home/ReportScreen.js
+++ b/src/pages/home/ReportScreen.js
@@ -34,15 +34,6 @@ class ReportScreen extends React.Component {
         this.storeCurrentlyViewedReport();
     }
 
-    componentDidUpdate(prevProps) {
-        const reportChanged = this.props.route.params.reportID !== prevProps.route.params.reportID;
-
-        if (reportChanged) {
-            this.prepareTransition();
-            this.storeCurrentlyViewedReport();
-        }
-    }
-
     componentWillUnmount() {
         clearTimeout(this.loadingTimerId);
     }
@@ -73,7 +64,7 @@ class ReportScreen extends React.Component {
         this.setState({isLoading: true});
 
         clearTimeout(this.loadingTimerId);
-        this.loadingTimerId = setTimeout(() => this.setState({isLoading: false}), 300);
+        this.loadingTimerId = setTimeout(() => this.setState({isLoading: false}), 150);
     }
 
     /**
@@ -94,7 +85,7 @@ class ReportScreen extends React.Component {
 
                 <FullScreenLoadingIndicator visible={this.shouldShowLoader()} />
 
-                <ReportView reportID={this.getReportID()} />
+                {!this.shouldShowLoader() && <ReportView reportID={this.getReportID()} />}
             </ScreenWrapper>
         );
     }