From 8ec30150e48f90c9e78776a61a3ca0832fb3f50f Mon Sep 17 00:00:00 2001 From: Dharamvir Singh Date: Tue, 25 May 2021 23:50:17 +0530 Subject: [PATCH 1/7] Fix - LoginScreen use email keyboard type and disable auto complete --- src/pages/signin/LoginForm.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/pages/signin/LoginForm.js b/src/pages/signin/LoginForm.js index 45acc8f69a08..a826d810d06d 100755 --- a/src/pages/signin/LoginForm.js +++ b/src/pages/signin/LoginForm.js @@ -83,6 +83,8 @@ class LoginForm extends React.Component { onChangeText={text => this.setState({login: text})} onSubmitEditing={this.validateAndSubmitForm} autoCapitalize="none" + autoCorrect="off" + keyboardType="email-address" placeholder={this.props.translate('loginForm.phoneOrEmail')} placeholderTextColor={themeColors.placeholderText} autoFocus={canFocusInputOnScreenFocus()} From 3fe43e785f5ff050d110b61441b84acf32b630f5 Mon Sep 17 00:00:00 2001 From: Dharamvir Singh Date: Fri, 28 May 2021 16:21:25 +0530 Subject: [PATCH 2/7] Fix - Login screen handle the keyboard type for react native and others platform --- src/libs/getEmailKeyboardType/index.js | 8 ++++++++ src/libs/getEmailKeyboardType/index.native.js | 8 ++++++++ src/pages/signin/LoginForm.js | 3 ++- 3 files changed, 18 insertions(+), 1 deletion(-) create mode 100644 src/libs/getEmailKeyboardType/index.js create mode 100644 src/libs/getEmailKeyboardType/index.native.js diff --git a/src/libs/getEmailKeyboardType/index.js b/src/libs/getEmailKeyboardType/index.js new file mode 100644 index 000000000000..1b75b94accb6 --- /dev/null +++ b/src/libs/getEmailKeyboardType/index.js @@ -0,0 +1,8 @@ + +/** + * * Return the defualt keyboard type when running on Web/Mobile-Web/Desktop + * @return {String | null} + */ +export default () => { + return 'default' +}; diff --git a/src/libs/getEmailKeyboardType/index.native.js b/src/libs/getEmailKeyboardType/index.native.js new file mode 100644 index 000000000000..5b0b01b06474 --- /dev/null +++ b/src/libs/getEmailKeyboardType/index.native.js @@ -0,0 +1,8 @@ + +/** + * Return the email-address keyboard type when running on native platforms. + * @return {String | null} + */ +export default () => { + return 'email-address' +}; diff --git a/src/pages/signin/LoginForm.js b/src/pages/signin/LoginForm.js index a826d810d06d..28f0bf181bce 100755 --- a/src/pages/signin/LoginForm.js +++ b/src/pages/signin/LoginForm.js @@ -16,6 +16,7 @@ import withWindowDimensions, {windowDimensionsPropTypes} from '../../components/ import compose from '../../libs/compose'; import canFocusInputOnScreenFocus from '../../libs/canFocusInputOnScreenFocus'; import withLocalize, {withLocalizePropTypes} from '../../components/withLocalize'; +import getEmailKeyboardType from '../../libs/getEmailKeyboardType' const propTypes = { /* Onyx Props */ @@ -84,7 +85,7 @@ class LoginForm extends React.Component { onSubmitEditing={this.validateAndSubmitForm} autoCapitalize="none" autoCorrect="off" - keyboardType="email-address" + keyboardType={getEmailKeyboardType()} placeholder={this.props.translate('loginForm.phoneOrEmail')} placeholderTextColor={themeColors.placeholderText} autoFocus={canFocusInputOnScreenFocus()} From 8739f64bd8b23fd566adccbc23172f377f39aeca Mon Sep 17 00:00:00 2001 From: Dharamvir Singh Date: Fri, 28 May 2021 17:19:32 +0530 Subject: [PATCH 3/7] Fix - Code review comments --- src/libs/getEmailKeyboardType/index.js | 4 ++-- src/libs/getEmailKeyboardType/index.native.js | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/libs/getEmailKeyboardType/index.js b/src/libs/getEmailKeyboardType/index.js index 1b75b94accb6..fd9890570a4c 100644 --- a/src/libs/getEmailKeyboardType/index.js +++ b/src/libs/getEmailKeyboardType/index.js @@ -1,7 +1,7 @@ /** - * * Return the defualt keyboard type when running on Web/Mobile-Web/Desktop - * @return {String | null} + * * Return the default keyboard type when running on Web/Desktop + * @return {String} */ export default () => { return 'default' diff --git a/src/libs/getEmailKeyboardType/index.native.js b/src/libs/getEmailKeyboardType/index.native.js index 5b0b01b06474..7f59110112c1 100644 --- a/src/libs/getEmailKeyboardType/index.native.js +++ b/src/libs/getEmailKeyboardType/index.native.js @@ -1,7 +1,7 @@ /** * Return the email-address keyboard type when running on native platforms. - * @return {String | null} + * @return {String} */ export default () => { return 'email-address' From 198083ebd8f6887ec4d39db359cbfe7b610b7692 Mon Sep 17 00:00:00 2001 From: Dharamvir Singh Date: Fri, 28 May 2021 17:41:14 +0530 Subject: [PATCH 4/7] Code review comment - code clean up --- src/libs/getEmailKeyboardType/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libs/getEmailKeyboardType/index.js b/src/libs/getEmailKeyboardType/index.js index fd9890570a4c..e76b7fd0030a 100644 --- a/src/libs/getEmailKeyboardType/index.js +++ b/src/libs/getEmailKeyboardType/index.js @@ -1,6 +1,6 @@ /** - * * Return the default keyboard type when running on Web/Desktop + * Return the default keyboard type when running on Web/Desktop * @return {String} */ export default () => { From c47220993c04f2e3e5511747a8c23f8791470a77 Mon Sep 17 00:00:00 2001 From: Dharamvir Singh Date: Fri, 28 May 2021 19:53:17 +0530 Subject: [PATCH 5/7] Code cleanup --- src/libs/getEmailKeyboardType/index.js | 2 +- src/libs/getEmailKeyboardType/index.native.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/libs/getEmailKeyboardType/index.js b/src/libs/getEmailKeyboardType/index.js index e76b7fd0030a..5ba746a03459 100644 --- a/src/libs/getEmailKeyboardType/index.js +++ b/src/libs/getEmailKeyboardType/index.js @@ -4,5 +4,5 @@ * @return {String} */ export default () => { - return 'default' + return 'default'; }; diff --git a/src/libs/getEmailKeyboardType/index.native.js b/src/libs/getEmailKeyboardType/index.native.js index 7f59110112c1..09f459fdb316 100644 --- a/src/libs/getEmailKeyboardType/index.native.js +++ b/src/libs/getEmailKeyboardType/index.native.js @@ -4,5 +4,5 @@ * @return {String} */ export default () => { - return 'email-address' + return 'email-address'; }; From 0359566de9f79608e73088fecaff2ec8567791bd Mon Sep 17 00:00:00 2001 From: Dharamvir Singh Date: Fri, 28 May 2021 20:06:04 +0530 Subject: [PATCH 6/7] Fixed the lint errors --- src/libs/getEmailKeyboardType/index.js | 4 +--- src/libs/getEmailKeyboardType/index.native.js | 4 +--- src/pages/signin/LoginForm.js | 2 +- 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/src/libs/getEmailKeyboardType/index.js b/src/libs/getEmailKeyboardType/index.js index 5ba746a03459..9d77eb437853 100644 --- a/src/libs/getEmailKeyboardType/index.js +++ b/src/libs/getEmailKeyboardType/index.js @@ -3,6 +3,4 @@ * Return the default keyboard type when running on Web/Desktop * @return {String} */ -export default () => { - return 'default'; -}; +export default () => 'default'; diff --git a/src/libs/getEmailKeyboardType/index.native.js b/src/libs/getEmailKeyboardType/index.native.js index 09f459fdb316..5f599436c8ae 100644 --- a/src/libs/getEmailKeyboardType/index.native.js +++ b/src/libs/getEmailKeyboardType/index.native.js @@ -3,6 +3,4 @@ * Return the email-address keyboard type when running on native platforms. * @return {String} */ -export default () => { - return 'email-address'; -}; +export default () => 'email-address'; diff --git a/src/pages/signin/LoginForm.js b/src/pages/signin/LoginForm.js index 28f0bf181bce..480ea8755319 100755 --- a/src/pages/signin/LoginForm.js +++ b/src/pages/signin/LoginForm.js @@ -16,7 +16,7 @@ import withWindowDimensions, {windowDimensionsPropTypes} from '../../components/ import compose from '../../libs/compose'; import canFocusInputOnScreenFocus from '../../libs/canFocusInputOnScreenFocus'; import withLocalize, {withLocalizePropTypes} from '../../components/withLocalize'; -import getEmailKeyboardType from '../../libs/getEmailKeyboardType' +import getEmailKeyboardType from '../../libs/getEmailKeyboardType'; const propTypes = { /* Onyx Props */ From 14f373fb221c97622f08918259e449d3e94b9e5f Mon Sep 17 00:00:00 2001 From: OSBotify Date: Fri, 28 May 2021 15:34:53 +0000 Subject: [PATCH 7/7] Update version to 1.0.56-3 --- android/app/build.gradle | 4 ++-- ios/ExpensifyCash/Info.plist | 2 +- ios/ExpensifyCashTests/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 d4f160e96d00..dec765eda1fa 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -148,8 +148,8 @@ android { minSdkVersion rootProject.ext.minSdkVersion targetSdkVersion rootProject.ext.targetSdkVersion multiDexEnabled rootProject.ext.multiDexEnabled - versionCode 1001005602 - versionName "1.0.56-2" + versionCode 1001005603 + versionName "1.0.56-3" } splits { abi { diff --git a/ios/ExpensifyCash/Info.plist b/ios/ExpensifyCash/Info.plist index 0e88c519871d..725ddee0124b 100644 --- a/ios/ExpensifyCash/Info.plist +++ b/ios/ExpensifyCash/Info.plist @@ -30,7 +30,7 @@ CFBundleVersion - 1.0.56.2 + 1.0.56.3 ITSAppUsesNonExemptEncryption LSApplicationQueriesSchemes diff --git a/ios/ExpensifyCashTests/Info.plist b/ios/ExpensifyCashTests/Info.plist index 40bf240325cf..9078ebed0411 100644 --- a/ios/ExpensifyCashTests/Info.plist +++ b/ios/ExpensifyCashTests/Info.plist @@ -19,6 +19,6 @@ CFBundleSignature ???? CFBundleVersion - 1.0.56.2 + 1.0.56.3 diff --git a/package-lock.json b/package-lock.json index 22cb46cf86ec..8967313881c0 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "expensify.cash", - "version": "1.0.56-2", + "version": "1.0.56-3", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index 887ff9bde295..43bc27085f1c 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "expensify.cash", - "version": "1.0.56-2", + "version": "1.0.56-3", "author": "Expensify, Inc.", "homepage": "https://expensify.cash", "description": "Expensify.cash is the next generation of Expensify: a reimagination of payments based atop a foundation of chat.",