Merge pull request #8897 from phivh/fix/android-navigation-back

Fix android navigation back
Expensify · May 10, 2022 · 3cdd9a2 · 3cdd9a2
2 parents 8d46ec7 + 8ebb9a0
commit 3cdd9a2
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/src/components/HeaderWithCloseButton.js b/src/components/HeaderWithCloseButton.js
@@ -1,7 +1,7 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import {
-    View, TouchableOpacity,
+    View, TouchableOpacity, Keyboard,
 } from 'react-native';
 import styles from '../styles/styles';
 import Header from './Header';
@@ -12,6 +12,7 @@ import * as Expensicons from './Icon/Expensicons';
 import withLocalize, {withLocalizePropTypes} from './withLocalize';
 import Tooltip from './Tooltip';
 import ThreeDotsMenu, {ThreeDotsMenuItemPropTypes} from './ThreeDotsMenu';
+import VirtualKeyboard from '../libs/VirtualKeyboard';
 
 const propTypes = {
     /** Title of the Header */
@@ -113,7 +114,12 @@ const HeaderWithCloseButton = props => (
             {props.shouldShowBackButton && (
                 <Tooltip text={props.translate('common.back')}>
                     <TouchableOpacity
-                        onPress={props.onBackButtonPress}
+                        onPress={() => {
+                            if (VirtualKeyboard.isOpen()) {
+                                Keyboard.dismiss();
+                            }
+                            props.onBackButtonPress();
+                        }}
                         style={[styles.touchableButtonImage]}
                     >
                         <Icon src={Expensicons.BackArrow} />