From 0c29d6336c1d6aecebea453e3e8c81c60b8f1da2 Mon Sep 17 00:00:00 2001 From: Prashant Mangukiya Date: Wed, 15 Sep 2021 21:30:12 +0530 Subject: [PATCH 01/14] Cursor focus set after selecting new currency to enter amount --- src/pages/iou/steps/IOUAmountPage.js | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/src/pages/iou/steps/IOUAmountPage.js b/src/pages/iou/steps/IOUAmountPage.js index b3b7b8655a87..0fbea5c92975 100755 --- a/src/pages/iou/steps/IOUAmountPage.js +++ b/src/pages/iou/steps/IOUAmountPage.js @@ -76,6 +76,7 @@ class IOUAmountPage extends React.Component { this.updateAmountNumberPad = this.updateAmountNumberPad.bind(this); this.updateAmount = this.updateAmount.bind(this); this.stripCommaFromAmount = this.stripCommaFromAmount.bind(this); + this.focusTextInput = this.focusTextInput.bind(this); this.state = { amount: props.selectedAmount, @@ -83,7 +84,20 @@ class IOUAmountPage extends React.Component { } componentDidMount() { - // Component is not initialized yet due to navigation transitions + this.focusTextInput(); + } + + componentDidUpdate(prevProps) { + if (this.props.iou.selectedCurrencyCode !== prevProps.iou.selectedCurrencyCode) { + this.focusTextInput(); + } + } + + /** + * Focus text input + */ + focusTextInput() { + // Component may not initialized due to navigation transitions // Wait until interactions are complete before trying to focus InteractionManager.runAfterInteractions(() => { // Focus text input From 66f269a912bc3493cbd53e7662d740dd2716c3ce Mon Sep 17 00:00:00 2001 From: Rajat Parashar Date: Fri, 15 Oct 2021 22:21:59 +0530 Subject: [PATCH 02/14] fix: bottom list is cut off in LHN --- src/components/Modal/index.ios.js | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/src/components/Modal/index.ios.js b/src/components/Modal/index.ios.js index 43087549409a..60b801b45879 100644 --- a/src/components/Modal/index.ios.js +++ b/src/components/Modal/index.ios.js @@ -1,5 +1,4 @@ import React from 'react'; -import {SafeAreaView} from 'react-native'; import withWindowDimensions from '../withWindowDimensions'; import BaseModal from './BaseModal'; import {propTypes, defaultProps} from './ModalPropTypes'; @@ -7,15 +6,12 @@ import {propTypes, defaultProps} from './ModalPropTypes'; // Only want to use on iOS. Avoids ScrollBar in the middle of the modal. // https://github.com/facebook/react-native/issues/26610 const Modal = props => ( - - - {props.children} - - - + {...props} + > + {props.children} + ); Modal.propTypes = propTypes; From 2b235686468e52c5bc4005a2e98ee051bb99e220 Mon Sep 17 00:00:00 2001 From: Rajat Parashar Date: Fri, 15 Oct 2021 22:57:38 +0530 Subject: [PATCH 03/14] remove comment --- src/components/Modal/index.ios.js | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/components/Modal/index.ios.js b/src/components/Modal/index.ios.js index 60b801b45879..060f8b730a35 100644 --- a/src/components/Modal/index.ios.js +++ b/src/components/Modal/index.ios.js @@ -3,8 +3,6 @@ import withWindowDimensions from '../withWindowDimensions'; import BaseModal from './BaseModal'; import {propTypes, defaultProps} from './ModalPropTypes'; -// Only want to use on iOS. Avoids ScrollBar in the middle of the modal. -// https://github.com/facebook/react-native/issues/26610 const Modal = props => ( Date: Tue, 19 Oct 2021 20:36:54 -0700 Subject: [PATCH 04/14] Adds background to label --- .../ExpensiTextInput/BaseExpensiTextInput.js | 26 ++++++++++++------- src/styles/styles.js | 10 +++++++ 2 files changed, 26 insertions(+), 10 deletions(-) diff --git a/src/components/ExpensiTextInput/BaseExpensiTextInput.js b/src/components/ExpensiTextInput/BaseExpensiTextInput.js index 04c92bf7f1e6..93e2b81ce313 100644 --- a/src/components/ExpensiTextInput/BaseExpensiTextInput.js +++ b/src/components/ExpensiTextInput/BaseExpensiTextInput.js @@ -171,16 +171,22 @@ class BaseExpensiTextInput extends Component { ]} > {hasLabel ? ( - + <> + {multiline ? ( + + ) : null} + + ) : null} { diff --git a/src/styles/styles.js b/src/styles/styles.js index a329fcba50a0..f888f38c5456 100644 --- a/src/styles/styles.js +++ b/src/styles/styles.js @@ -531,6 +531,15 @@ const styles = { fontFamily: fontFamily.GTA, width: '100%', }, + expensiTextInputLabelBackground: { + position: 'absolute', + top: 0, + width: '100%', + height: 28, + backgroundColor: themeColors.componentBG, + borderTopRightRadius: variables.componentBorderRadiusNormal, + borderTopLeftRadius: variables.componentBorderRadiusNormal, + }, expensiTextInputLabelDesktop: { transformOrigin: 'left center', }, @@ -550,6 +559,7 @@ const styles = { paddingBottom: 8, paddingHorizontal: 11.5, borderRadius: variables.componentBorderRadiusNormal, + zIndex: -1, }, expensiTextInputDesktop: addOutlineWidth({}, 0), expensiTextInputAndroid: left => ({ From cc08d6c72ed137f40b7a93d83285805135c2cf07 Mon Sep 17 00:00:00 2001 From: Alfredo Alcantara Date: Tue, 19 Oct 2021 21:00:33 -0700 Subject: [PATCH 05/14] Alingned closing bracket --- src/components/ExpensiTextInput/BaseExpensiTextInput.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/components/ExpensiTextInput/BaseExpensiTextInput.js b/src/components/ExpensiTextInput/BaseExpensiTextInput.js index 93e2b81ce313..787d1e9b39d2 100644 --- a/src/components/ExpensiTextInput/BaseExpensiTextInput.js +++ b/src/components/ExpensiTextInput/BaseExpensiTextInput.js @@ -173,8 +173,9 @@ class BaseExpensiTextInput extends Component { {hasLabel ? ( <> {multiline ? ( - + ) : null} Date: Wed, 20 Oct 2021 12:47:14 -0700 Subject: [PATCH 06/14] Changes label background height to correct height --- src/styles/styles.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/styles/styles.js b/src/styles/styles.js index f888f38c5456..4dbc0f5a53f4 100644 --- a/src/styles/styles.js +++ b/src/styles/styles.js @@ -535,7 +535,7 @@ const styles = { position: 'absolute', top: 0, width: '100%', - height: 28, + height: 25, backgroundColor: themeColors.componentBG, borderTopRightRadius: variables.componentBorderRadiusNormal, borderTopLeftRadius: variables.componentBorderRadiusNormal, From 863598257a932144ece609eb43becc354ed7f4b0 Mon Sep 17 00:00:00 2001 From: Alfredo Alcantara Date: Wed, 20 Oct 2021 12:49:28 -0700 Subject: [PATCH 07/14] Adds comment explaining the use of label background --- src/components/ExpensiTextInput/BaseExpensiTextInput.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/components/ExpensiTextInput/BaseExpensiTextInput.js b/src/components/ExpensiTextInput/BaseExpensiTextInput.js index 787d1e9b39d2..f79013bb6dda 100644 --- a/src/components/ExpensiTextInput/BaseExpensiTextInput.js +++ b/src/components/ExpensiTextInput/BaseExpensiTextInput.js @@ -172,6 +172,8 @@ class BaseExpensiTextInput extends Component { > {hasLabel ? ( <> + {/* Adding this background to the label only for multiline text input, + to prevent text overlaping with label when scrolling */} {multiline ? ( Date: Wed, 20 Oct 2021 12:53:18 -0700 Subject: [PATCH 08/14] Adds overflow prop to textinput container --- src/styles/styles.js | 1 + 1 file changed, 1 insertion(+) diff --git a/src/styles/styles.js b/src/styles/styles.js index 4dbc0f5a53f4..4488a4643d4a 100644 --- a/src/styles/styles.js +++ b/src/styles/styles.js @@ -521,6 +521,7 @@ const styles = { justifyContent: 'center', height: '100%', backgroundColor: themeColors.componentBG, + overflow: 'hidden', }, expensiTextInputLabel: { position: 'absolute', From e6e6f893ac94f77d5c25e239b5da23e07d3aea8a Mon Sep 17 00:00:00 2001 From: Alfredo Alcantara Date: Wed, 20 Oct 2021 13:22:47 -0700 Subject: [PATCH 09/14] Modifies styling syntax --- src/components/ExpensiTextInput/BaseExpensiTextInput.js | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/src/components/ExpensiTextInput/BaseExpensiTextInput.js b/src/components/ExpensiTextInput/BaseExpensiTextInput.js index f79013bb6dda..31f94248d571 100644 --- a/src/components/ExpensiTextInput/BaseExpensiTextInput.js +++ b/src/components/ExpensiTextInput/BaseExpensiTextInput.js @@ -172,13 +172,9 @@ class BaseExpensiTextInput extends Component { > {hasLabel ? ( <> - {/* Adding this background to the label only for multiline text input, + {/* Adding this background to the label only for multiline text input, to prevent text overlaping with label when scrolling */} - {multiline ? ( - - ) : null} + {multiline && } Date: Wed, 20 Oct 2021 21:45:54 +0000 Subject: [PATCH 10/14] Update version to 1.1.8-6 --- 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 a7d8d4a4cec5..93b6b0360ea7 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -150,8 +150,8 @@ android { minSdkVersion rootProject.ext.minSdkVersion targetSdkVersion rootProject.ext.targetSdkVersion multiDexEnabled rootProject.ext.multiDexEnabled - versionCode 1001010805 - versionName "1.1.8-5" + versionCode 1001010806 + versionName "1.1.8-6" } splits { abi { diff --git a/ios/NewExpensify/Info.plist b/ios/NewExpensify/Info.plist index 42ba651e3c3e..15654192cda6 100644 --- a/ios/NewExpensify/Info.plist +++ b/ios/NewExpensify/Info.plist @@ -31,7 +31,7 @@ CFBundleVersion - 1.1.8.5 + 1.1.8.6 ITSAppUsesNonExemptEncryption LSApplicationQueriesSchemes diff --git a/ios/NewExpensifyTests/Info.plist b/ios/NewExpensifyTests/Info.plist index 9a1d767f329f..6cda4a627daf 100644 --- a/ios/NewExpensifyTests/Info.plist +++ b/ios/NewExpensifyTests/Info.plist @@ -19,6 +19,6 @@ CFBundleSignature ???? CFBundleVersion - 1.1.8.5 + 1.1.8.6 diff --git a/package-lock.json b/package-lock.json index f1dd425c682a..1fc6f7b35140 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "new.expensify", - "version": "1.1.8-5", + "version": "1.1.8-6", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index 4959806c8e69..0ddf3bf5f20d 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "new.expensify", - "version": "1.1.8-5", + "version": "1.1.8-6", "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 ca45c1268c7a53fe86c9f8f7369e17bbf7337bd8 Mon Sep 17 00:00:00 2001 From: Luke Donahue Date: Wed, 20 Oct 2021 17:00:19 -0700 Subject: [PATCH 11/14] bumping Xcode version --- .github/workflows/e2e.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml index 30ea5497df76..323c4f095be5 100644 --- a/.github/workflows/e2e.yml +++ b/.github/workflows/e2e.yml @@ -6,7 +6,7 @@ on: branches-ignore: [staging, production] env: - DEVELOPER_DIR: /Applications/Xcode_12.5.app/Contents/Developer + DEVELOPER_DIR: /Applications/Xcode_12.5.1.app/Contents/Developer jobs: test: From 3774b4f61e5e885cff77983ace2d2abb22ff5e55 Mon Sep 17 00:00:00 2001 From: OSBotify Date: Thu, 21 Oct 2021 17:35:21 +0000 Subject: [PATCH 12/14] Update version to 1.1.8-7 --- 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 93b6b0360ea7..e2cf5074c8b5 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -150,8 +150,8 @@ android { minSdkVersion rootProject.ext.minSdkVersion targetSdkVersion rootProject.ext.targetSdkVersion multiDexEnabled rootProject.ext.multiDexEnabled - versionCode 1001010806 - versionName "1.1.8-6" + versionCode 1001010807 + versionName "1.1.8-7" } splits { abi { diff --git a/ios/NewExpensify/Info.plist b/ios/NewExpensify/Info.plist index 15654192cda6..8ebeb0e41cb0 100644 --- a/ios/NewExpensify/Info.plist +++ b/ios/NewExpensify/Info.plist @@ -31,7 +31,7 @@ CFBundleVersion - 1.1.8.6 + 1.1.8.7 ITSAppUsesNonExemptEncryption LSApplicationQueriesSchemes diff --git a/ios/NewExpensifyTests/Info.plist b/ios/NewExpensifyTests/Info.plist index 6cda4a627daf..45b2b4d331d3 100644 --- a/ios/NewExpensifyTests/Info.plist +++ b/ios/NewExpensifyTests/Info.plist @@ -19,6 +19,6 @@ CFBundleSignature ???? CFBundleVersion - 1.1.8.6 + 1.1.8.7 diff --git a/package-lock.json b/package-lock.json index 1fc6f7b35140..9c554146eb20 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "new.expensify", - "version": "1.1.8-6", + "version": "1.1.8-7", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index 0ddf3bf5f20d..9ec5c319ad56 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "new.expensify", - "version": "1.1.8-6", + "version": "1.1.8-7", "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 fd9b538a36a32fa098e33cfbc9b798d699648c86 Mon Sep 17 00:00:00 2001 From: Rory Abraham Date: Thu, 21 Oct 2021 10:49:37 -0700 Subject: [PATCH 13/14] Use XCode 12.5.1 --- .github/workflows/platformDeploy.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/platformDeploy.yml b/.github/workflows/platformDeploy.yml index cb581c22cd18..45a47d7503ff 100644 --- a/.github/workflows/platformDeploy.yml +++ b/.github/workflows/platformDeploy.yml @@ -10,7 +10,7 @@ on: env: SHOULD_DEPLOY_PRODUCTION: ${{ github.event_name == 'release' }} - DEVELOPER_DIR: /Applications/Xcode_12.5.app/Contents/Developer + DEVELOPER_DIR: /Applications/Xcode_12.5.1.app/Contents/Developer jobs: validateActor: From 3ba6769c5648bdd9e1f38260143227eb52616acc Mon Sep 17 00:00:00 2001 From: OSBotify Date: Thu, 21 Oct 2021 17:56:45 +0000 Subject: [PATCH 14/14] Update version to 1.1.8-8 --- 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 e2cf5074c8b5..ffa27793bdb1 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -150,8 +150,8 @@ android { minSdkVersion rootProject.ext.minSdkVersion targetSdkVersion rootProject.ext.targetSdkVersion multiDexEnabled rootProject.ext.multiDexEnabled - versionCode 1001010807 - versionName "1.1.8-7" + versionCode 1001010808 + versionName "1.1.8-8" } splits { abi { diff --git a/ios/NewExpensify/Info.plist b/ios/NewExpensify/Info.plist index 8ebeb0e41cb0..c2ee2ca52ecc 100644 --- a/ios/NewExpensify/Info.plist +++ b/ios/NewExpensify/Info.plist @@ -31,7 +31,7 @@ CFBundleVersion - 1.1.8.7 + 1.1.8.8 ITSAppUsesNonExemptEncryption LSApplicationQueriesSchemes diff --git a/ios/NewExpensifyTests/Info.plist b/ios/NewExpensifyTests/Info.plist index 45b2b4d331d3..800efa1603bd 100644 --- a/ios/NewExpensifyTests/Info.plist +++ b/ios/NewExpensifyTests/Info.plist @@ -19,6 +19,6 @@ CFBundleSignature ???? CFBundleVersion - 1.1.8.7 + 1.1.8.8 diff --git a/package-lock.json b/package-lock.json index 9c554146eb20..595afb20d835 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "new.expensify", - "version": "1.1.8-7", + "version": "1.1.8-8", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index 9ec5c319ad56..08854aea819c 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "new.expensify", - "version": "1.1.8-7", + "version": "1.1.8-8", "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.",