From 334c55a937fec06c1ae1b280437acf1139eba937 Mon Sep 17 00:00:00 2001
From: OSBotify <76178356+OSBotify@users.noreply.github.com>
Date: Fri, 13 May 2022 14:37:13 -0700
Subject: [PATCH 1/2] Merge pull request #9006 from
 Expensify/version-BUILD-251df8bf4cc1d96ef1f064a5fa49a0097218397d

Update version to 1.1.60-2 on main

(cherry picked from commit 71a96f1b0c3facd50f7cc723416affd5ed2df2a7)
---
 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 3e9acea53eb..7115eca45c2 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 1001016001
-        versionName "1.1.60-1"
+        versionCode 1001016002
+        versionName "1.1.60-2"
     }
     splits {
         abi {
diff --git a/ios/NewExpensify/Info.plist b/ios/NewExpensify/Info.plist
index 3e57cb9c48b..0caefd27c94 100644
--- a/ios/NewExpensify/Info.plist
+++ b/ios/NewExpensify/Info.plist
@@ -30,7 +30,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>1.1.60.1</string>
+	<string>1.1.60.2</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LSApplicationQueriesSchemes</key>
diff --git a/ios/NewExpensifyTests/Info.plist b/ios/NewExpensifyTests/Info.plist
index 713fd2aaf85..7def85669fd 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.60.1</string>
+	<string>1.1.60.2</string>
 </dict>
 </plist>
diff --git a/package-lock.json b/package-lock.json
index e41e6908393..f786f364297 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "new.expensify",
-  "version": "1.1.60-1",
+  "version": "1.1.60-2",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index cf9d9939217..5551cd135f9 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "new.expensify",
-  "version": "1.1.60-1",
+  "version": "1.1.60-2",
   "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 c98d2527ebff687b188523a78f5bc134823b952b Mon Sep 17 00:00:00 2001
From: Francois Laithier <francois@expensify.com>
Date: Fri, 13 May 2022 14:25:07 -0700
Subject: [PATCH 2/2] Merge pull request #9002 from
 Expensify/chirag-loadMoreChats-fix

Loads more chats fix

(cherry picked from commit 251df8bf4cc1d96ef1f064a5fa49a0097218397d)
---
 src/pages/home/report/ReportActionsList.js | 5 ++++-
 src/pages/home/report/ReportActionsView.js | 2 ++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/pages/home/report/ReportActionsList.js b/src/pages/home/report/ReportActionsList.js
index 2648769e0a5..4af69adc667 100644
--- a/src/pages/home/report/ReportActionsList.js
+++ b/src/pages/home/report/ReportActionsList.js
@@ -56,6 +56,9 @@ const propTypes = {
     /** Callback executed on scroll */
     onScroll: PropTypes.func.isRequired,
 
+    /** Function to load more chats */
+    loadMoreChats: PropTypes.func.isRequired,
+
     ...withDrawerPropTypes,
     ...windowDimensionsPropTypes,
 };
@@ -165,7 +168,7 @@ class ReportActionsList extends React.Component {
                 keyExtractor={this.keyExtractor}
                 initialRowHeight={32}
                 initialNumToRender={this.calculateInitialNumToRender()}
-                onEndReached={this.loadMoreChats}
+                onEndReached={this.props.loadMoreChats}
                 onEndReachedThreshold={0.75}
                 ListFooterComponent={this.props.isLoadingReportActions
                     ? <ActivityIndicator size="small" color={themeColors.spinner} />
diff --git a/src/pages/home/report/ReportActionsView.js b/src/pages/home/report/ReportActionsView.js
index 877868f0cd8..ef0520b143f 100755
--- a/src/pages/home/report/ReportActionsView.js
+++ b/src/pages/home/report/ReportActionsView.js
@@ -110,6 +110,7 @@ class ReportActionsView extends React.Component {
         this.toggleFloatingMessageCounter = this.toggleFloatingMessageCounter.bind(this);
         this.updateNewMarkerPosition = this.updateNewMarkerPosition.bind(this);
         this.updateMessageCounterCount = this.updateMessageCounterCount.bind(this);
+        this.loadMoreChats = this.loadMoreChats.bind(this);
         this.recordTimeToMeasureItemLayout = this.recordTimeToMeasureItemLayout.bind(this);
         this.scrollToBottomAndUpdateLastRead = this.scrollToBottomAndUpdateLastRead.bind(this);
         this.updateNewMarkerAndMarkReadOnce = _.once(this.updateNewMarkerAndMarkRead.bind(this));
@@ -417,6 +418,7 @@ class ReportActionsView extends React.Component {
                     sortedReportActions={this.sortedReportActions}
                     mostRecentIOUReportSequenceNumber={this.mostRecentIOUReportSequenceNumber}
                     isLoadingReportActions={this.props.isLoadingReportActions}
+                    loadMoreChats={this.loadMoreChats}
                 />
                 <PopoverReportActionContextMenu ref={ReportActionContextMenu.contextMenuRef} />
                 <EmojiPicker ref={EmojiPickerAction.emojiPickerRef} />