From 6535a5d0bd88aa8b08f452d34c0dc558531440e9 Mon Sep 17 00:00:00 2001
From: OSBotify <76178356+OSBotify@users.noreply.github.com>
Date: Thu, 29 Jul 2021 09:25:54 -0700
Subject: [PATCH 1/2] Merge pull request #4305 from
Expensify/version-BUILD-53793a0eb1feebcb5c2ee17cdfbbd1ac51f44b0c
(cherry picked from commit 9f15c144bd0c0c716ee4655f8e7946e30588ac1a)
---
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 dee913e78e97f..7468a78780921 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -150,8 +150,8 @@ android {
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
multiDexEnabled rootProject.ext.multiDexEnabled
- versionCode 1001008101
- versionName "1.0.81-1"
+ versionCode 1001008103
+ versionName "1.0.81-3"
}
splits {
abi {
diff --git a/ios/ExpensifyCash/Info.plist b/ios/ExpensifyCash/Info.plist
index 790b90b03b32d..ed8938afed34a 100644
--- a/ios/ExpensifyCash/Info.plist
+++ b/ios/ExpensifyCash/Info.plist
@@ -30,7 +30,7 @@
CFBundleVersion
- 1.0.81.1
+ 1.0.81.3
ITSAppUsesNonExemptEncryption
LSApplicationQueriesSchemes
diff --git a/ios/ExpensifyCashTests/Info.plist b/ios/ExpensifyCashTests/Info.plist
index 135fb4f426e22..ac439ff2064ba 100644
--- a/ios/ExpensifyCashTests/Info.plist
+++ b/ios/ExpensifyCashTests/Info.plist
@@ -19,6 +19,6 @@
CFBundleSignature
????
CFBundleVersion
- 1.0.81.1
+ 1.0.81.3
diff --git a/package-lock.json b/package-lock.json
index 2bff44ebdf79b..c148d68249397 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
{
"name": "expensify.cash",
- "version": "1.0.81-1",
+ "version": "1.0.81-3",
"lockfileVersion": 1,
"requires": true,
"dependencies": {
diff --git a/package.json b/package.json
index d742ee0f86576..3bb5c5544a1a3 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "expensify.cash",
- "version": "1.0.81-1",
+ "version": "1.0.81-3",
"author": "Expensify, Inc.",
"homepage": "https://new.expensify.com",
"description": "Expensify.cash is the next generation of Expensify: a reimagination of payments based atop a foundation of chat.",
From 47527f89e6b12fb1e13d9feba4c73568b39f8ec8 Mon Sep 17 00:00:00 2001
From: Marc Glasser
Date: Thu, 29 Jul 2021 06:23:35 -1000
Subject: [PATCH 2/2] Merge pull request #4300 from
Expensify/marcaaron-fixOptionsList
Fix broken list components on staging
(cherry picked from commit 53793a0eb1feebcb5c2ee17cdfbbd1ac51f44b0c)
---
src/components/OptionsList.js | 19 +++++++++++--------
1 file changed, 11 insertions(+), 8 deletions(-)
diff --git a/src/components/OptionsList.js b/src/components/OptionsList.js
index cfb25b7e5e19a..715edea1c35c5 100644
--- a/src/components/OptionsList.js
+++ b/src/components/OptionsList.js
@@ -113,6 +113,7 @@ class OptionsList extends Component {
this.renderSectionHeader = this.renderSectionHeader.bind(this);
this.extractKey = this.extractKey.bind(this);
this.onScrollToIndexFailed = this.onScrollToIndexFailed.bind(this);
+ this.onViewableItemsChanged = this.onViewableItemsChanged.bind(this);
this.viewabilityConfig = {viewAreaCoveragePercentThreshold: 95};
this.didLayout = false;
}
@@ -137,6 +138,15 @@ class OptionsList extends Component {
return false;
}
+ onViewableItemsChanged() {
+ if (this.didLayout || !this.props.onLayout) {
+ return;
+ }
+
+ this.didLayout = true;
+ this.props.onLayout();
+ }
+
/**
* We must implement this method in order to use the ref.scrollToLocation() method.
* See: https://reactnative.dev/docs/sectionlist#scrolltolocation
@@ -238,14 +248,7 @@ class OptionsList extends Component {
maxToRenderPerBatch={5}
windowSize={5}
viewabilityConfig={this.viewabilityConfig}
- onViewableItemsChanged={() => {
- if (this.didLayout) {
- return;
- }
-
- this.didLayout = true;
- this.props.onLayout();
- }}
+ onViewableItemsChanged={this.onViewableItemsChanged}
/>
);