Merge pull request #3268 from Expensify/main

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 {

ios/ExpensifyCash/Info.plist

@@ -30,7 +30,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>1.0.58.4</string>
+	<string>1.0.58.5</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LSApplicationQueriesSchemes</key>

ios/ExpensifyCashTests/Info.plist

@@ -19,6 +19,6 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>1.0.58.4</string>
+	<string>1.0.58.5</string>
 </dict>
 </plist>

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.",

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 !== '') {