From 5ff91c82e00fe80cff4bbed56c0a07287fc76741 Mon Sep 17 00:00:00 2001
From: OSBotify <76178356+OSBotify@users.noreply.github.com>
Date: Wed, 11 May 2022 14:58:39 -0700
Subject: [PATCH 1/2] Merge pull request #8954 from
Expensify/version-BUILD-1dca77adc2fb40bb61db2e966e85870200730430
Update version to 1.1.57-14 on main
(cherry picked from commit 0d93b3d06bf92d1ef892ff6dd423a1b3212d6fb1)
---
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 b0b0f3836d96..910905528bc8 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 1001015713
- versionName "1.1.57-13"
+ versionCode 1001015714
+ versionName "1.1.57-14"
}
splits {
abi {
diff --git a/ios/NewExpensify/Info.plist b/ios/NewExpensify/Info.plist
index 9e6079cbf90c..bb8ff56a2a5f 100644
--- a/ios/NewExpensify/Info.plist
+++ b/ios/NewExpensify/Info.plist
@@ -30,7 +30,7 @@
CFBundleVersion
- 1.1.57.13
+ 1.1.57.14
ITSAppUsesNonExemptEncryption
LSApplicationQueriesSchemes
diff --git a/ios/NewExpensifyTests/Info.plist b/ios/NewExpensifyTests/Info.plist
index 98126414a6f1..ea5e20e35fb7 100644
--- a/ios/NewExpensifyTests/Info.plist
+++ b/ios/NewExpensifyTests/Info.plist
@@ -19,6 +19,6 @@
CFBundleSignature
????
CFBundleVersion
- 1.1.57.13
+ 1.1.57.14
diff --git a/package-lock.json b/package-lock.json
index 614451940cc7..acf7db94f0fd 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
{
"name": "new.expensify",
- "version": "1.1.57-13",
+ "version": "1.1.57-14",
"lockfileVersion": 1,
"requires": true,
"dependencies": {
diff --git a/package.json b/package.json
index d36ca3cd961d..2a0084e452ea 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "new.expensify",
- "version": "1.1.57-13",
+ "version": "1.1.57-14",
"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 6c0ccaa5da7c4d6003dd7e7dc2a9db3e0f8c58c6 Mon Sep 17 00:00:00 2001
From: Carlos Martins
Date: Wed, 11 May 2022 23:46:24 +0200
Subject: [PATCH 2/2] Merge pull request #8953 from
Expensify/revert-8591-sn_bug-iouamountpage-return-key
Revert "Keep focus on textinput field after pressing enter when button is disabled"
(cherry picked from commit 1dca77adc2fb40bb61db2e966e85870200730430)
---
src/pages/iou/steps/IOUAmountPage.js | 12 ------------
1 file changed, 12 deletions(-)
diff --git a/src/pages/iou/steps/IOUAmountPage.js b/src/pages/iou/steps/IOUAmountPage.js
index fd415c7b6913..5ebccbbcb6ee 100755
--- a/src/pages/iou/steps/IOUAmountPage.js
+++ b/src/pages/iou/steps/IOUAmountPage.js
@@ -75,7 +75,6 @@ class IOUAmountPage extends React.Component {
this.updateAmount = this.updateAmount.bind(this);
this.stripCommaFromAmount = this.stripCommaFromAmount.bind(this);
this.focusTextInput = this.focusTextInput.bind(this);
- this.focusEmptyInput = this.focusEmptyInput.bind(this);
this.state = {
amount: props.selectedAmount,
@@ -94,16 +93,6 @@ class IOUAmountPage extends React.Component {
this.focusTextInput();
}
- /**
- * Keep TextInput focused if no amount is entered.
- */
- focusEmptyInput() {
- if (this.state.amount !== '') {
- return;
- }
- this.textInput.focus();
- }
-
/**
* Focus text input
*/
@@ -247,7 +236,6 @@ class IOUAmountPage extends React.Component {
value={formattedAmount}
placeholder={this.props.numberFormat(0)}
keyboardType={CONST.KEYBOARD_TYPE.NUMBER_PAD}
- onBlur={this.focusEmptyInput}
/>