Merge pull request #9372 from Expensify/OSBotify-cherry-pick-staging-…

…9369

🍒 Cherry pick PR #9369 to staging 🍒

android/app/build.gradle

@@ -152,8 +152,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1001017401
-        versionName "1.1.74-1"
+        versionCode 1001017402
+        versionName "1.1.74-2"
     }
     splits {
         abi {

ios/NewExpensify/Info.plist

@@ -30,7 +30,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>1.1.74.1</string>
+	<string>1.1.74.2</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LSApplicationQueriesSchemes</key>

ios/NewExpensifyTests/Info.plist

@@ -19,6 +19,6 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>1.1.74.1</string>
+	<string>1.1.74.2</string>
 </dict>
 </plist>

package.json

@@ -1,6 +1,6 @@
 {
   "name": "new.expensify",
-  "version": "1.1.74-1",
+  "version": "1.1.74-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.",

src/components/TextInput/BaseTextInput.js

@@ -63,9 +63,8 @@ class BaseTextInput extends Component {
 
     componentDidUpdate() {
         // Activate or deactivate the label when value is changed programmatically from outside
-        // Only update when value prop is provided
-        const inputValue = this.props.value || this.input.value;
-        if (_.isEmpty(inputValue) || this.state.value === inputValue) {
+        const inputValue = _.isUndefined(this.props.value) ? this.input.value : this.props.value;
+        if (_.isUndefined(inputValue) || this.state.value === inputValue) {
             return;
         }