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

…-11240

🍒 Cherry pick PR #11240 to staging 🍒

android/app/build.gradle

@@ -155,8 +155,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1001020500
-        versionName "1.2.5-0"
+        versionCode 1001020501
+        versionName "1.2.5-1"
         buildConfigField "boolean", "IS_NEW_ARCHITECTURE_ENABLED", isNewArchitectureEnabled().toString()
 
         if (isNewArchitectureEnabled()) {

ios/NewExpensify/Info.plist

@@ -30,7 +30,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>1.2.5.0</string>
+	<string>1.2.5.1</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.2.5.0</string>
+	<string>1.2.5.1</string>
 </dict>
 </plist>

package.json

@@ -1,6 +1,6 @@
 {
   "name": "new.expensify",
-  "version": "1.2.5-0",
+  "version": "1.2.5-1",
   "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/OptionsSelector/BaseOptionsSelector.js

@@ -41,10 +41,6 @@ class BaseOptionsSelector extends Component {
         this.state = {
             allOptions,
             focusedIndex: this.props.shouldTextInputAppearBelowOptions ? allOptions.length : 0,
-            selection: {
-                start: this.props.value.length,
-                end: this.props.value.length,
-            },
         };
     }
 
@@ -206,7 +202,7 @@ class BaseOptionsSelector extends Component {
     selectRow(option, ref) {
         if (this.props.shouldFocusOnSelectRow) {
             // Input is permanently focused on native platforms, so we always highlight the text inside of it
-            this.setState({selection: {start: 0, end: this.props.value.length}});
+            this.textInput.setNativeProps({selection: {start: 0, end: this.props.value.length}});
             if (this.relatedTarget && ref === findNodeHandle(this.relatedTarget)) {
                 this.textInput.focus();
             }
@@ -236,7 +232,12 @@ class BaseOptionsSelector extends Component {
                 ref={el => this.textInput = el}
                 value={this.props.value}
                 label={this.props.textInputLabel}
-                onChangeText={this.props.onChangeText}
+                onChangeText={(text) => {
+                    if (this.props.shouldFocusOnSelectRow) {
+                        this.textInput.setNativeProps({selection: null});
+                    }
+                    this.props.onChangeText(text);
+                }}
                 placeholder={this.props.placeholderText || this.props.translate('optionsSelector.nameEmailOrPhoneNumber')}
                 onBlur={(e) => {
                     if (!this.props.shouldFocusOnSelectRow) {
@@ -246,8 +247,6 @@ class BaseOptionsSelector extends Component {
                 }}
                 selectTextOnFocus
                 blurOnSubmit={Boolean(this.state.allOptions.length)}
-                selection={this.state.selection}
-                onSelectionChange={e => this.setState({selection: e.nativeEvent.selection})}
             />
         );
         const optionsList = this.props.shouldShowOptions ? (