Merge pull request #9007 from Expensify/OSBotify-cherry-pick-staging-…

…9002

🍒 Cherry pick PR #9002 to staging 🍒

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 {

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>

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>

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.",

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} />

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} />