From b8ccd199ca000efa65b39cb6c3e248eb95555aa3 Mon Sep 17 00:00:00 2001
From: phivh <phivhdev@gmail.com>
Date: Sat, 7 May 2022 15:38:59 +0700
Subject: [PATCH 1/2] Fix android navigation back

---
 src/components/HeaderWithCloseButton.js | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/components/HeaderWithCloseButton.js b/src/components/HeaderWithCloseButton.js
index 4680d1974083..dc9dcb62d233 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 && (
                 <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} />

From 8ebb9a0f4aa3e8a7210d2a22bd3869435b1a99af Mon Sep 17 00:00:00 2001
From: phivh <phivhdev@gmail.com>
Date: Sun, 8 May 2022 19:35:08 +0700
Subject: [PATCH 2/2] Cleanup

---
 src/components/HeaderWithCloseButton.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/HeaderWithCloseButton.js b/src/components/HeaderWithCloseButton.js
index dc9dcb62d233..ef8588709c34 100755
--- a/src/components/HeaderWithCloseButton.js
+++ b/src/components/HeaderWithCloseButton.js
@@ -12,7 +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';
+import VirtualKeyboard from '../libs/VirtualKeyboard';
 
 const propTypes = {
     /** Title of the Header */
@@ -115,7 +115,7 @@ const HeaderWithCloseButton = props => (
                 <Tooltip text={props.translate('common.back')}>
                     <TouchableOpacity
                         onPress={() => {
-                            if (virtualKeyboard.isOpen()) {
+                            if (VirtualKeyboard.isOpen()) {
                                 Keyboard.dismiss();
                             }
                             props.onBackButtonPress();