From 58a174256e1da02b19168ed71d34da2611acea11 Mon Sep 17 00:00:00 2001 From: OSBotify <76178356+OSBotify@users.noreply.github.com> Date: Wed, 11 May 2022 16:37:41 -0700 Subject: [PATCH 1/2] Merge pull request #8958 from Expensify/version-BUILD-8303e486a7c51724dd097af0995a97c9446a64fe Update version to 1.1.57-15 on main (cherry picked from commit a2f8cf96d095ded70a15d04ee69bd37be2638c14) --- 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 910905528bc8..ba9332d3bea3 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 1001015714 - versionName "1.1.57-14" + versionCode 1001015715 + versionName "1.1.57-15" } splits { abi { diff --git a/ios/NewExpensify/Info.plist b/ios/NewExpensify/Info.plist index bb8ff56a2a5f..fe969a8c488f 100644 --- a/ios/NewExpensify/Info.plist +++ b/ios/NewExpensify/Info.plist @@ -30,7 +30,7 @@ CFBundleVersion - 1.1.57.14 + 1.1.57.15 ITSAppUsesNonExemptEncryption LSApplicationQueriesSchemes diff --git a/ios/NewExpensifyTests/Info.plist b/ios/NewExpensifyTests/Info.plist index ea5e20e35fb7..3b57f471d2d3 100644 --- a/ios/NewExpensifyTests/Info.plist +++ b/ios/NewExpensifyTests/Info.plist @@ -19,6 +19,6 @@ CFBundleSignature ???? CFBundleVersion - 1.1.57.14 + 1.1.57.15 diff --git a/package-lock.json b/package-lock.json index acf7db94f0fd..7cc914d2574d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "new.expensify", - "version": "1.1.57-14", + "version": "1.1.57-15", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index 2a0084e452ea..98e48ec26483 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "new.expensify", - "version": "1.1.57-14", + "version": "1.1.57-15", "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 b68fa776665e3cd2d7bd00a04ce6e20f41a0a887 Mon Sep 17 00:00:00 2001 From: Aldo Canepa Garay <87341702+aldo-expensify@users.noreply.github.com> Date: Wed, 11 May 2022 19:11:18 -0400 Subject: [PATCH 2/2] Merge pull request #8957 from Expensify/marco-bindMissingMethod [CP Staging] bind scrollToBottomAndUpdateLastRead to "this" (cherry picked from commit 8303e486a7c51724dd097af0995a97c9446a64fe) --- src/pages/home/report/ReportActionsView.js | 1 + 1 file changed, 1 insertion(+) diff --git a/src/pages/home/report/ReportActionsView.js b/src/pages/home/report/ReportActionsView.js index 5b78c66c8810..877868f0cd82 100755 --- a/src/pages/home/report/ReportActionsView.js +++ b/src/pages/home/report/ReportActionsView.js @@ -111,6 +111,7 @@ class ReportActionsView extends React.Component { this.updateNewMarkerPosition = this.updateNewMarkerPosition.bind(this); this.updateMessageCounterCount = this.updateMessageCounterCount.bind(this); this.recordTimeToMeasureItemLayout = this.recordTimeToMeasureItemLayout.bind(this); + this.scrollToBottomAndUpdateLastRead = this.scrollToBottomAndUpdateLastRead.bind(this); this.updateNewMarkerAndMarkReadOnce = _.once(this.updateNewMarkerAndMarkRead.bind(this)); }