From d0523719863282cf8afb603916604826fd65860d Mon Sep 17 00:00:00 2001 From: OSBotify <76178356+OSBotify@users.noreply.github.com> Date: Tue, 16 Nov 2021 20:25:35 -0800 Subject: [PATCH 1/2] Merge pull request #6342 from Expensify/version-BUILD-bde9be13f9b466c4bc1dd6eab26a10057a0d3f4d (cherry picked from commit c3ba59bac53b65d00616dc779eea077825026b4d) --- 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 bd984effdaf..c66a335d5f7 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -149,8 +149,8 @@ android { minSdkVersion rootProject.ext.minSdkVersion targetSdkVersion rootProject.ext.targetSdkVersion multiDexEnabled rootProject.ext.multiDexEnabled - versionCode 1001011503 - versionName "1.1.15-3" + versionCode 1001011504 + versionName "1.1.15-4" } splits { abi { diff --git a/ios/NewExpensify/Info.plist b/ios/NewExpensify/Info.plist index 01c5149ce65..766cbcb069f 100644 --- a/ios/NewExpensify/Info.plist +++ b/ios/NewExpensify/Info.plist @@ -31,7 +31,7 @@ CFBundleVersion - 1.1.15.3 + 1.1.15.4 ITSAppUsesNonExemptEncryption LSApplicationQueriesSchemes diff --git a/ios/NewExpensifyTests/Info.plist b/ios/NewExpensifyTests/Info.plist index 20af83376e3..a20994ecd2b 100644 --- a/ios/NewExpensifyTests/Info.plist +++ b/ios/NewExpensifyTests/Info.plist @@ -19,6 +19,6 @@ CFBundleSignature ???? CFBundleVersion - 1.1.15.3 + 1.1.15.4 diff --git a/package-lock.json b/package-lock.json index c5d2fc415d0..95d097f73fb 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "new.expensify", - "version": "1.1.15-3", + "version": "1.1.15-4", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index e90fa41b4ca..8cf6bbc4943 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "new.expensify", - "version": "1.1.15-3", + "version": "1.1.15-4", "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 b31ba3b17c86a1cbd671f063bb7bfbb618d729f0 Mon Sep 17 00:00:00 2001 From: Rory Abraham <47436092+roryabraham@users.noreply.github.com> Date: Tue, 16 Nov 2021 20:23:13 -0800 Subject: [PATCH 2/2] Merge pull request #6341 from Expensify/joe-fix-input-translate (cherry picked from commit bde9be13f9b466c4bc1dd6eab26a10057a0d3f4d) --- src/components/ExpensiTextInput/BaseExpensiTextInput.js | 1 + 1 file changed, 1 insertion(+) diff --git a/src/components/ExpensiTextInput/BaseExpensiTextInput.js b/src/components/ExpensiTextInput/BaseExpensiTextInput.js index abfbfd1bcdd..3462064303f 100644 --- a/src/components/ExpensiTextInput/BaseExpensiTextInput.js +++ b/src/components/ExpensiTextInput/BaseExpensiTextInput.js @@ -198,6 +198,7 @@ class BaseExpensiTextInput extends Component { onBlur={this.onBlur} onChangeText={this.setValue} onPressOut={this.props.onPress} + translateX={this.props.translateX} />