Merge pull request #11744 from Expensify/update-staging-from-main

Update version to 1.2.13-1 on staging
Expensify · Oct 11, 2022 · 70b7939 · 70b7939
2 parents d5e1c95 + 2c7e1b6
commit 70b7939
Show file tree

Hide file tree

Showing 8 changed files with 18 additions and 7 deletions.
diff --git a/android/app/build.gradle b/android/app/build.gradle
@@ -156,8 +156,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1001021300
-        versionName "1.2.13-0"
+        versionCode 1001021301
+        versionName "1.2.13-1"
         buildConfigField "boolean", "IS_NEW_ARCHITECTURE_ENABLED", isNewArchitectureEnabled().toString()
 
         if (isNewArchitectureEnabled()) {

diff --git a/ios/NewExpensify/Info.plist b/ios/NewExpensify/Info.plist
@@ -30,7 +30,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>1.2.13.0</string>
+	<string>1.2.13.1</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LSApplicationQueriesSchemes</key>

diff --git a/ios/NewExpensifyTests/Info.plist b/ios/NewExpensifyTests/Info.plist
@@ -19,6 +19,6 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>1.2.13.0</string>
+	<string>1.2.13.1</string>
 </dict>
 </plist>
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "new.expensify",
-  "version": "1.2.13-0",
+  "version": "1.2.13-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.",

diff --git a/src/components/Checkbox.js b/src/components/Checkbox.js
@@ -25,6 +25,9 @@ const propTypes = {
     /** Additional styles to add to checkbox button */
     style: stylePropTypes,
 
+    /** Callback that is called when mousedown is triggered. */
+    onMouseDown: PropTypes.func,
+
     /** A ref to forward to the Pressable */
     forwardedRef: PropTypes.oneOfType([
         PropTypes.func,
@@ -39,6 +42,7 @@ const defaultProps = {
     style: [],
     forwardedRef: undefined,
     children: null,
+    onMouseDown: undefined,
 };
 
 class Checkbox extends React.Component {
@@ -85,6 +89,7 @@ class Checkbox extends React.Component {
             <Pressable
                 disabled={this.props.disabled}
                 onPress={this.firePressHandlerOnClick}
+                onMouseDown={this.props.onMouseDown}
                 onFocus={this.onFocus}
                 onBlur={this.onBlur}
                 ref={this.props.forwardedRef}

diff --git a/src/components/TextInput/BaseTextInput.js b/src/components/TextInput/BaseTextInput.js
@@ -263,6 +263,7 @@ class BaseTextInput extends Component {
                                         }}
                                         // eslint-disable-next-line
                                         {...inputProps}
+                                        autoCorrect={this.props.secureTextEntry ? false : this.props.autoCorrect}
                                         placeholder={placeholder}
                                         placeholderTextColor={themeColors.placeholderText}
                                         underlineColorAndroid="transparent"
@@ -291,6 +292,7 @@ class BaseTextInput extends Component {
                                         <Checkbox
                                             style={styles.secureInputShowPasswordButton}
                                             onPress={this.togglePasswordVisibility}
+                                            onMouseDown={e => e.preventDefault()}
                                         >
                                             <Icon
                                                 src={this.state.passwordHidden ? Expensicons.Eye : Expensicons.EyeDisabled}

diff --git a/src/components/TextInput/baseTextInputPropTypes.js b/src/components/TextInput/baseTextInputPropTypes.js
@@ -55,6 +55,9 @@ const propTypes = {
     /** Prefix character */
     prefixCharacter: PropTypes.string,
 
+    /** Whether autoCorrect functionality should enable  */
+    autoCorrect: PropTypes.bool,
+
     /** Form props */
     /** The ID used to uniquely identify the input in a Form */
     inputID: PropTypes.string,
@@ -79,6 +82,7 @@ const defaultProps = {
     textInputContainerStyles: [],
     inputStyle: [],
     autoFocus: false,
+    autoCorrect: true,
 
     /**
      * To be able to function as either controlled or uncontrolled component we should not