From a73efc157aa971a6d97ee75328489ac7a6d5e554 Mon Sep 17 00:00:00 2001 From: Tim Golen Date: Tue, 12 Oct 2021 11:49:26 -0600 Subject: [PATCH 1/2] Close sidebar when going to concierge chat --- src/pages/workspace/travel/WorkspaceTravelPage.js | 2 +- src/pages/workspace/travel/WorkspaceTravelVBAView.js | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/pages/workspace/travel/WorkspaceTravelPage.js b/src/pages/workspace/travel/WorkspaceTravelPage.js index 3e23c251f4fb..9c3fe3f0983f 100644 --- a/src/pages/workspace/travel/WorkspaceTravelPage.js +++ b/src/pages/workspace/travel/WorkspaceTravelPage.js @@ -25,7 +25,7 @@ const WorkspaceTravelPage = ({translate, route}) => ( > {(hasVBA, policyID) => ( <> - {!hasVBA ? ( + {hasVBA ? ( ) : ( diff --git a/src/pages/workspace/travel/WorkspaceTravelVBAView.js b/src/pages/workspace/travel/WorkspaceTravelVBAView.js index 15d040736025..59449bc5854c 100644 --- a/src/pages/workspace/travel/WorkspaceTravelVBAView.js +++ b/src/pages/workspace/travel/WorkspaceTravelVBAView.js @@ -13,6 +13,7 @@ import {RocketOrange} from '../../../components/Icon/Illustrations'; import WorkspaceSection from '../WorkspaceSection'; import {openSignedInLink} from '../../../libs/actions/App'; import {navigateToConciergeChat} from '../../../libs/actions/Report'; +import Navigation from '../../../libs/Navigation/Navigation'; const propTypes = { ...withLocalizePropTypes, @@ -32,7 +33,10 @@ const WorkspaceTravelVBAView = ({translate}) => ( }, { title: translate('workspace.travel.bookTravelWithConcierge'), - onPress: navigateToConciergeChat, + onPress: () => { + Navigation.dismissModal(); + navigateToConciergeChat(); + }, icon: Concierge, shouldShowRightIcon: true, }, From 645637274b4854ec45dbeab9aa30dd498ce41aaa Mon Sep 17 00:00:00 2001 From: Tim Golen Date: Tue, 12 Oct 2021 12:20:40 -0600 Subject: [PATCH 2/2] Remove testing logic --- src/pages/workspace/travel/WorkspaceTravelPage.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/workspace/travel/WorkspaceTravelPage.js b/src/pages/workspace/travel/WorkspaceTravelPage.js index 9c3fe3f0983f..3e23c251f4fb 100644 --- a/src/pages/workspace/travel/WorkspaceTravelPage.js +++ b/src/pages/workspace/travel/WorkspaceTravelPage.js @@ -25,7 +25,7 @@ const WorkspaceTravelPage = ({translate, route}) => ( > {(hasVBA, policyID) => ( <> - {hasVBA ? ( + {!hasVBA ? ( ) : (