From 57d06d21d5b397ed4bc2452f3fc999be40bfd09d Mon Sep 17 00:00:00 2001
From: tienifr <christianwen18@gmail.com>
Date: Mon, 27 Nov 2023 13:58:09 +0700
Subject: [PATCH] fix: get assistance page always backs to workspace list page
 after reload

---
 src/ROUTES.ts                                | 2 +-
 src/components/HeaderWithBackButton/index.js | 2 +-
 src/pages/GetAssistancePage.js               | 3 ++-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/ROUTES.ts b/src/ROUTES.ts
index 26589a3db0e0..f498b4b42ba8 100644
--- a/src/ROUTES.ts
+++ b/src/ROUTES.ts
@@ -35,7 +35,7 @@ export default {
     VALIDATE_LOGIN: 'v/:accountID/:validateCode',
     GET_ASSISTANCE: {
         route: 'get-assistance/:taskID',
-        getRoute: (taskID: string) => `get-assistance/${taskID}`,
+        getRoute: (taskID: string, backTo: string) => getUrlWithBackToParam(`get-assistance/${taskID}`, backTo),
     },
     UNLINK_LOGIN: 'u/:accountID/:validateCode',
     APPLE_SIGN_IN: 'sign-in-with-apple',
diff --git a/src/components/HeaderWithBackButton/index.js b/src/components/HeaderWithBackButton/index.js
index edb3b8d26831..f743a154ae79 100755
--- a/src/components/HeaderWithBackButton/index.js
+++ b/src/components/HeaderWithBackButton/index.js
@@ -134,7 +134,7 @@ function HeaderWithBackButton({
                         <Tooltip text={translate('getAssistancePage.questionMarkButtonTooltip')}>
                             <PressableWithoutFeedback
                                 disabled={shouldDisableGetAssistanceButton}
-                                onPress={singleExecution(waitForNavigate(() => Navigation.navigate(ROUTES.GET_ASSISTANCE.getRoute(guidesCallTaskID))))}
+                                onPress={singleExecution(waitForNavigate(() => Navigation.navigate(ROUTES.GET_ASSISTANCE.getRoute(guidesCallTaskID, Navigation.getActiveRoute()))))}
                                 style={[styles.touchableButtonImage]}
                                 role="button"
                                 accessibilityLabel={translate('getAssistancePage.questionMarkButtonTooltip')}
diff --git a/src/pages/GetAssistancePage.js b/src/pages/GetAssistancePage.js
index b801a91af728..08c9a6bf6815 100644
--- a/src/pages/GetAssistancePage.js
+++ b/src/pages/GetAssistancePage.js
@@ -45,6 +45,7 @@ const defaultProps = {
 
 function GetAssistancePage(props) {
     const styles = useThemeStyles();
+    const navigateBackTo = lodashGet(props.route, 'params.backTo', ROUTES.SETTINGS_CONTACT_METHODS);
     const menuItems = [
         {
             title: props.translate('getAssistancePage.chatWithConcierge'),
@@ -82,7 +83,7 @@ function GetAssistancePage(props) {
         <ScreenWrapper testID={GetAssistancePage.displayName}>
             <HeaderWithBackButton
                 title={props.translate('getAssistancePage.title')}
-                onBackButtonPress={() => Navigation.goBack(ROUTES.SETTINGS_WORKSPACES)}
+                onBackButtonPress={() => Navigation.goBack(navigateBackTo)}
             />
             <ScrollView>
                 <Section