diff --git a/src/components/HeaderWithCloseButton.js b/src/components/HeaderWithCloseButton.js index 4680d1974083..ef8588709c34 100755 --- 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 && ( { + if (VirtualKeyboard.isOpen()) { + Keyboard.dismiss(); + } + props.onBackButtonPress(); + }} style={[styles.touchableButtonImage]} >