From 28dc688fc370d2db62c13ae3c4a33a80e31ad525 Mon Sep 17 00:00:00 2001 From: Aditya Pratap Singh Hada <49001649+apshada@users.noreply.github.com> Date: Tue, 3 Oct 2023 14:39:01 +0530 Subject: [PATCH] Mm 28872 configure links (#7551) * Fix: configured help link redirect according to location * Fix: import statements --- app/screens/settings/settings.tsx | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/app/screens/settings/settings.tsx b/app/screens/settings/settings.tsx index 8916b56a4..9d9df1101 100644 --- a/app/screens/settings/settings.tsx +++ b/app/screens/settings/settings.tsx @@ -3,20 +3,20 @@ import React, {useCallback, useEffect, useMemo} from 'react'; import {useIntl} from 'react-intl'; -import {Alert, Platform, View} from 'react-native'; +import {Platform, View} from 'react-native'; +import {handleGotoLocation} from '@actions/remote/command'; import CompassIcon from '@components/compass_icon'; import SettingContainer from '@components/settings/container'; import SettingItem from '@components/settings/item'; import {Screens} from '@constants'; -import {useServerDisplayName} from '@context/server'; +import {useServerDisplayName, useServerUrl} from '@context/server'; import {useTheme} from '@context/theme'; import useAndroidHardwareBackHandler from '@hooks/android_back_handler'; import useNavButtonPressed from '@hooks/navigation_button_pressed'; import {dismissModal, goToScreen, setButtons} from '@screens/navigation'; import {preventDoubleTap} from '@utils/tap'; import {changeOpacity, makeStyleSheetFromTheme} from '@utils/theme'; -import {tryOpenURL} from '@utils/url'; import ReportProblem from './report_problem'; @@ -53,6 +53,7 @@ type SettingsProps = { const Settings = ({componentId, helpLink, showHelp, siteName}: SettingsProps) => { const theme = useTheme(); const intl = useIntl(); + const serverUrl = useServerUrl(); const serverDisplayName = useServerDisplayName(); const serverName = siteName || serverDisplayName; @@ -109,14 +110,7 @@ const Settings = ({componentId, helpLink, showHelp, siteName}: SettingsProps) => const openHelp = preventDoubleTap(() => { if (helpLink) { - const onError = () => { - Alert.alert( - intl.formatMessage({id: 'mobile.link.error.title', defaultMessage: 'Error'}), - intl.formatMessage({id: 'mobile.link.error.text', defaultMessage: 'Unable to open the link.'}), - ); - }; - - tryOpenURL(helpLink, onError); + handleGotoLocation(serverUrl, intl, helpLink); } });