From fd58e80147a8291353c73125e3514bb7ed7ca170 Mon Sep 17 00:00:00 2001 From: Alex Beaman Date: Tue, 1 Jun 2021 10:10:41 +0200 Subject: [PATCH 1/2] Fix auto focus input on iou pages --- src/pages/iou/steps/IOUAmountPage.js | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/src/pages/iou/steps/IOUAmountPage.js b/src/pages/iou/steps/IOUAmountPage.js index a320b5c1a4f3..aa266e1ddd17 100755 --- a/src/pages/iou/steps/IOUAmountPage.js +++ b/src/pages/iou/steps/IOUAmountPage.js @@ -3,6 +3,7 @@ import { View, Text, TouchableOpacity, + InteractionManager, } from 'react-native'; import PropTypes from 'prop-types'; import {withOnyx} from 'react-native-onyx'; @@ -47,13 +48,6 @@ const propTypes = { /** Window Dimensions Props */ ...windowDimensionsPropTypes, - /** react-navigation object */ - navigation: PropTypes.shape({ - - /** Allows us to add a listener for the navigation transition end */ - addListener: PropTypes.func, - }).isRequired, - /* Onyx Props */ /** Holds data related to IOU view state, rather than the underlying IOU data. */ @@ -83,7 +77,7 @@ class IOUAmountPage extends React.Component { componentDidMount() { // Component is not initialized yet due to navigation transitions // Wait until interactions are complete before trying to focus or attach listener - this.props.navigation.addListener('transitionEnd', () => { + InteractionManager.runAfterInteractions(() => { // Setup and attach keypress handler for navigating to the next screen this.unsubscribe = KeyboardShortcut.subscribe('Enter', () => { if (this.state.amount !== '') { From 22d6f52bfa8cb3e5abf067af65ee66e31aededc3 Mon Sep 17 00:00:00 2001 From: OSBotify Date: Tue, 1 Jun 2021 16:37:31 +0000 Subject: [PATCH 2/2] Update version to 1.0.58-5 --- 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 eff00b9238c9..a2ad424e4b81 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 1001005804 - versionName "1.0.58-4" + versionCode 1001005805 + versionName "1.0.58-5" } splits { abi { diff --git a/ios/ExpensifyCash/Info.plist b/ios/ExpensifyCash/Info.plist index a06c83ca6ced..ad8d1d3f26ad 100644 --- a/ios/ExpensifyCash/Info.plist +++ b/ios/ExpensifyCash/Info.plist @@ -30,7 +30,7 @@ CFBundleVersion - 1.0.58.4 + 1.0.58.5 ITSAppUsesNonExemptEncryption LSApplicationQueriesSchemes diff --git a/ios/ExpensifyCashTests/Info.plist b/ios/ExpensifyCashTests/Info.plist index e2c75f224f37..2aa4c11e63f3 100644 --- a/ios/ExpensifyCashTests/Info.plist +++ b/ios/ExpensifyCashTests/Info.plist @@ -19,6 +19,6 @@ CFBundleSignature ???? CFBundleVersion - 1.0.58.4 + 1.0.58.5 diff --git a/package-lock.json b/package-lock.json index eb849b66b455..e8b0b81a1fcb 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "expensify.cash", - "version": "1.0.58-4", + "version": "1.0.58-5", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index 2e78607c643a..5f8c8187ace3 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "expensify.cash", - "version": "1.0.58-4", + "version": "1.0.58-5", "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.",