From 2f352661fa99dbef3ad3b33bc6d4078df85eb335 Mon Sep 17 00:00:00 2001
From: OSBotify <76178356+OSBotify@users.noreply.github.com>
Date: Wed, 24 Aug 2022 15:33:30 -0400
Subject: [PATCH 1/2] Merge pull request #10548 from
Expensify/version-BUILD-BBD1FC55-C233-452D-88CF-52474670AFBC
Update version to 1.1.89-2 on main
(cherry picked from commit 5d48ab634051aed24fb76e1df09ee2db1a32f6fc)
---
android/app/build.gradle | 4 ++--
ios/NewExpensify/Info.plist | 2 +-
ios/NewExpensifyTests/Info.plist | 2 +-
package-lock.json | 4 ++--
package.json | 2 +-
5 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/android/app/build.gradle b/android/app/build.gradle
index 2962511323b5..4d64b62fb247 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -155,8 +155,8 @@ android {
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
multiDexEnabled rootProject.ext.multiDexEnabled
- versionCode 1001018901
- versionName "1.1.89-1"
+ versionCode 1001018902
+ versionName "1.1.89-2"
buildConfigField "boolean", "IS_NEW_ARCHITECTURE_ENABLED", isNewArchitectureEnabled().toString()
if (isNewArchitectureEnabled()) {
diff --git a/ios/NewExpensify/Info.plist b/ios/NewExpensify/Info.plist
index 42cef4d9f51b..d0962a39b6ba 100644
--- a/ios/NewExpensify/Info.plist
+++ b/ios/NewExpensify/Info.plist
@@ -30,7 +30,7 @@
CFBundleVersion
- 1.1.89.1
+ 1.1.89.2
ITSAppUsesNonExemptEncryption
LSApplicationQueriesSchemes
diff --git a/ios/NewExpensifyTests/Info.plist b/ios/NewExpensifyTests/Info.plist
index dbb5ffc2835f..73f311838261 100644
--- a/ios/NewExpensifyTests/Info.plist
+++ b/ios/NewExpensifyTests/Info.plist
@@ -19,6 +19,6 @@
CFBundleSignature
????
CFBundleVersion
- 1.1.89.1
+ 1.1.89.2
diff --git a/package-lock.json b/package-lock.json
index 31faac76d02d..9564e13975c4 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
{
"name": "new.expensify",
- "version": "1.1.89-1",
+ "version": "1.1.89-2",
"lockfileVersion": 2,
"requires": true,
"packages": {
"": {
"name": "new.expensify",
- "version": "1.1.89-1",
+ "version": "1.1.89-2",
"hasInstallScript": true,
"license": "MIT",
"dependencies": {
diff --git a/package.json b/package.json
index c093451374ae..287c38cc30a6 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "new.expensify",
- "version": "1.1.89-1",
+ "version": "1.1.89-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 9af45024549c4d04cf6ceb79e272cb54493f9611 Mon Sep 17 00:00:00 2001
From: Rory Abraham <47436092+roryabraham@users.noreply.github.com>
Date: Wed, 24 Aug 2022 21:23:01 +0200
Subject: [PATCH 2/2] Merge pull request #10546 from
Expensify/Rory-FixPaymentsPageBug
(cherry picked from commit df44a2fa278875ced36449cfbbd056e4bc682de8)
---
.../KeyboardSpacer/BaseKeyboardSpacer.js | 18 +-----------------
1 file changed, 1 insertion(+), 17 deletions(-)
diff --git a/src/components/KeyboardSpacer/BaseKeyboardSpacer.js b/src/components/KeyboardSpacer/BaseKeyboardSpacer.js
index 0b1974c10901..ed72169f4e7a 100644
--- a/src/components/KeyboardSpacer/BaseKeyboardSpacer.js
+++ b/src/components/KeyboardSpacer/BaseKeyboardSpacer.js
@@ -1,23 +1,10 @@
import React, {PureComponent} from 'react';
import {
- Dimensions, Keyboard, LayoutAnimation, View,
+ Dimensions, Keyboard, View,
} from 'react-native';
import * as StyleUtils from '../../styles/StyleUtils';
import {propTypes, defaultProps} from './BaseKeyboardSpacerPropTypes';
-const defaultAnimation = {
- duration: 500,
- create: {
- duration: 300,
- type: LayoutAnimation.Types.easeInEaseOut,
- property: LayoutAnimation.Properties.opacity,
- },
- update: {
- type: LayoutAnimation.Types.spring,
- springDamping: 200,
- },
-};
-
class BaseKeyboardSpacer extends PureComponent {
constructor(props) {
super(props);
@@ -52,7 +39,6 @@ class BaseKeyboardSpacer extends PureComponent {
return;
}
- LayoutAnimation.configureNext(defaultAnimation);
const screenHeight = Dimensions.get('window').height;
const keyboardSpace = (screenHeight - event.endCoordinates.screenY) + this.props.topSpacing;
this.setState({
@@ -66,8 +52,6 @@ class BaseKeyboardSpacer extends PureComponent {
* @param {Object} [event] - A Keyboard Event.
*/
resetKeyboardSpace() {
- LayoutAnimation.configureNext(defaultAnimation);
-
this.setState({
keyboardSpace: 0,
}, this.props.onToggle(false, 0));