From f808818f6a621838c4fec37869fbbf5a5096c1bd Mon Sep 17 00:00:00 2001 From: OSBotify <76178356+OSBotify@users.noreply.github.com> Date: Tue, 22 Feb 2022 13:22:36 -0800 Subject: [PATCH 1/2] Merge pull request #7866 from Expensify/version-BUILD-8582db08e7c6cac2cd5424ff52e462b7204d67df (cherry picked from commit c0ea782bacf59ed76b7e865e10dbca981b530307) --- 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 a50a048baa3d..477dfc9dcb61 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 1001013901 - versionName "1.1.39-1" + versionCode 1001013902 + versionName "1.1.39-2" } splits { abi { diff --git a/ios/NewExpensify/Info.plist b/ios/NewExpensify/Info.plist index c05ce345a545..f4b6641979ca 100644 --- a/ios/NewExpensify/Info.plist +++ b/ios/NewExpensify/Info.plist @@ -31,7 +31,7 @@ CFBundleVersion - 1.1.39.1 + 1.1.39.2 ITSAppUsesNonExemptEncryption LSApplicationQueriesSchemes diff --git a/ios/NewExpensifyTests/Info.plist b/ios/NewExpensifyTests/Info.plist index 680934b44f8f..c928da93cf49 100644 --- a/ios/NewExpensifyTests/Info.plist +++ b/ios/NewExpensifyTests/Info.plist @@ -19,6 +19,6 @@ CFBundleSignature ???? CFBundleVersion - 1.1.39.1 + 1.1.39.2 diff --git a/package-lock.json b/package-lock.json index 3b01c8f569f6..1ee3214bfc16 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "new.expensify", - "version": "1.1.39-1", + "version": "1.1.39-2", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index 0cfc13254b38..4df3779c520d 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "new.expensify", - "version": "1.1.39-1", + "version": "1.1.39-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 099a4762ba742eb4c46bbc58b186eb89dacbb0db Mon Sep 17 00:00:00 2001 From: Nathalie Kuoch Date: Tue, 22 Feb 2022 22:11:20 +0100 Subject: [PATCH 2/2] Merge pull request #7782 from parasharrajat/fix-textinput-crash fix: crash when value is `undefined` (cherry picked from commit 8582db08e7c6cac2cd5424ff52e462b7204d67df) --- src/components/TextInput/BaseTextInput.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/components/TextInput/BaseTextInput.js b/src/components/TextInput/BaseTextInput.js index 330a39ed0587..043d49904e72 100644 --- a/src/components/TextInput/BaseTextInput.js +++ b/src/components/TextInput/BaseTextInput.js @@ -58,7 +58,8 @@ class BaseTextInput extends Component { componentDidUpdate() { // Activate or deactivate the label when value is changed programmatically from outside - if (this.value === this.props.value) { + // Only update when value prop is provided + if (this.props.value === undefined || this.value === this.props.value) { return; }