From c9b793ad5c509af95a894e267b4a7e794c1014e2 Mon Sep 17 00:00:00 2001 From: nkdengineer Date: Wed, 22 May 2024 14:40:45 +0700 Subject: [PATCH 1/4] fix: navigate back directed to Workflows page instead of Get assistance page --- src/pages/GetAssistancePage.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/GetAssistancePage.tsx b/src/pages/GetAssistancePage.tsx index 3d2aac1f7870b..b543524fc68e2 100644 --- a/src/pages/GetAssistancePage.tsx +++ b/src/pages/GetAssistancePage.tsx @@ -37,7 +37,7 @@ function GetAssistancePage({route, account}: GetAssistancePageProps) { const menuItems: MenuItemWithLink[] = [ { title: translate('getAssistancePage.chatWithConcierge'), - onPress: () => Report.navigateToConciergeChat(true), + onPress: () => Report.navigateToConciergeChat(), icon: Expensicons.ChatBubble, shouldShowRightIcon: true, wrapperStyle: [styles.cardMenuItem], From bf2ad0b415bb4b1fc492e7ed3ddf8cd47377e293 Mon Sep 17 00:00:00 2001 From: nkdengineer Date: Wed, 22 May 2024 15:24:59 +0700 Subject: [PATCH 2/4] fix logic in get assistance page --- ios/Podfile.lock | 2 +- src/pages/GetAssistancePage.tsx | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/ios/Podfile.lock b/ios/Podfile.lock index d0155051fc3b9..723d46b1f1682 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -2577,4 +2577,4 @@ SPEC CHECKSUMS: PODFILE CHECKSUM: a25a81f2b50270f0c0bd0aff2e2ebe4d0b4ec06d -COCOAPODS: 1.13.0 +COCOAPODS: 1.14.3 diff --git a/src/pages/GetAssistancePage.tsx b/src/pages/GetAssistancePage.tsx index b543524fc68e2..1fe0ca330624a 100644 --- a/src/pages/GetAssistancePage.tsx +++ b/src/pages/GetAssistancePage.tsx @@ -13,6 +13,7 @@ import Section from '@components/Section'; import Text from '@components/Text'; import useLocalize from '@hooks/useLocalize'; import useThemeStyles from '@hooks/useThemeStyles'; +import * as DeviceCapabilities from '@libs/DeviceCapabilities'; import Navigation from '@libs/Navigation/Navigation'; import type {SettingsNavigatorParamList} from '@libs/Navigation/types'; import * as Link from '@userActions/Link'; @@ -34,10 +35,11 @@ function GetAssistancePage({route, account}: GetAssistancePageProps) { const styles = useThemeStyles(); const {translate} = useLocalize(); const navigateBackTo = route?.params.backTo || ROUTES.SETTINGS_CONTACT_METHODS.getRoute(); + const canUseTouchScreen = DeviceCapabilities.canUseTouchScreen(); const menuItems: MenuItemWithLink[] = [ { title: translate('getAssistancePage.chatWithConcierge'), - onPress: () => Report.navigateToConciergeChat(), + onPress: () => Report.navigateToConciergeChat(!canUseTouchScreen), icon: Expensicons.ChatBubble, shouldShowRightIcon: true, wrapperStyle: [styles.cardMenuItem], From 7cf8181b46478df2810bad0184723b593959a526 Mon Sep 17 00:00:00 2001 From: nkdengineer Date: Wed, 22 May 2024 15:28:09 +0700 Subject: [PATCH 3/4] revert version pod file --- ios/Podfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ios/Podfile.lock b/ios/Podfile.lock index 723d46b1f1682..d0155051fc3b9 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -2577,4 +2577,4 @@ SPEC CHECKSUMS: PODFILE CHECKSUM: a25a81f2b50270f0c0bd0aff2e2ebe4d0b4ec06d -COCOAPODS: 1.14.3 +COCOAPODS: 1.13.0 From 4f745fa343bf11026c611a1e26ef58a7f0384503 Mon Sep 17 00:00:00 2001 From: nkdengineer Date: Mon, 27 May 2024 16:04:03 +0700 Subject: [PATCH 4/4] update logic show assistance page --- src/pages/GetAssistancePage.tsx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/pages/GetAssistancePage.tsx b/src/pages/GetAssistancePage.tsx index 1fe0ca330624a..ac623bcc0115c 100644 --- a/src/pages/GetAssistancePage.tsx +++ b/src/pages/GetAssistancePage.tsx @@ -13,7 +13,7 @@ import Section from '@components/Section'; import Text from '@components/Text'; import useLocalize from '@hooks/useLocalize'; import useThemeStyles from '@hooks/useThemeStyles'; -import * as DeviceCapabilities from '@libs/DeviceCapabilities'; +import useWindowDimensions from '@hooks/useWindowDimensions'; import Navigation from '@libs/Navigation/Navigation'; import type {SettingsNavigatorParamList} from '@libs/Navigation/types'; import * as Link from '@userActions/Link'; @@ -35,11 +35,11 @@ function GetAssistancePage({route, account}: GetAssistancePageProps) { const styles = useThemeStyles(); const {translate} = useLocalize(); const navigateBackTo = route?.params.backTo || ROUTES.SETTINGS_CONTACT_METHODS.getRoute(); - const canUseTouchScreen = DeviceCapabilities.canUseTouchScreen(); + const {isLargeScreenWidth} = useWindowDimensions(); const menuItems: MenuItemWithLink[] = [ { title: translate('getAssistancePage.chatWithConcierge'), - onPress: () => Report.navigateToConciergeChat(!canUseTouchScreen), + onPress: () => Report.navigateToConciergeChat(isLargeScreenWidth), icon: Expensicons.ChatBubble, shouldShowRightIcon: true, wrapperStyle: [styles.cardMenuItem],