Skip to content

fix update settings button title in web #46269

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Julesssss merged 3 commits into from
Aug 20, 2024
Merged

fix update settings button title in web #46269

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
496110e
fix update settings button title in web
tienifr Jul 26, 2024
b251c17
fix lint
tienifr Jul 26, 2024
157bd5a
Merge branch 'main' of https://github.com/tienifr/App into fix/45431
tienifr Jul 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 17 additions & 3 deletions src/components/LocationPermissionModal/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,9 @@ import ConfirmModal from '@components/ConfirmModal';
import * as Illustrations from '@components/Icon/Illustrations';
import useLocalize from '@hooks/useLocalize';
import useThemeStyles from '@hooks/useThemeStyles';
import getPlatform from '@libs/getPlatform';
import {getLocationPermission, requestLocationPermission} from '@pages/iou/request/step/IOURequestStepScan/LocationPermission';
import CONST from '@src/CONST';
import type {LocationPermissionModalProps} from './types';

function LocationPermissionModal({startPermissionFlow, resetPermissionFlow, onDeny, onGrant}: LocationPermissionModalProps) {
Expand All @@ -15,6 +17,8 @@ function LocationPermissionModal({startPermissionFlow, resetPermissionFlow, onDe
const styles = useThemeStyles();
const {translate} = useLocalize();

const isWeb = getPlatform() === CONST.PLATFORM.WEB;

useEffect(() => {
if (!startPermissionFlow) {
return;
Expand All @@ -32,8 +36,10 @@ function LocationPermissionModal({startPermissionFlow, resetPermissionFlow, onDe
}, [startPermissionFlow]);

const handledBlockedPermission = (cb: () => void) => () => {
if (hasError && Linking.openSettings) {
Linking.openSettings();
if (hasError) {
if (Linking.openSettings) {
Linking.openSettings();
}
setShowModal(false);
setHasError(false);
resetPermissionFlow();
Expand Down Expand Up @@ -63,12 +69,20 @@ function LocationPermissionModal({startPermissionFlow, resetPermissionFlow, onDe
setHasError(false);
};

const getConfirmText = (): string => {
if (!hasError) {
return translate('common.continue');
}

return isWeb ? translate('common.buttonConfirm') : translate('common.settings');
Copy link
Copy Markdown
Member

@s77rt s77rt Oct 21, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What about desktop? Aren't we supposed to use the "Got it" message as well?

};

return (
<ConfirmModal
isVisible={showModal}
onConfirm={grantLocationPermission}
onCancel={skipLocationPermission}
confirmText={hasError ? translate('common.settings') : translate('common.continue')}
confirmText={getConfirmText()}
cancelText={translate('common.notNow')}
prompt={translate(hasError ? 'receipt.locationErrorMessage' : 'receipt.locationAccessMessage')}
promptStyles={[styles.textLabelSupportingEmptyValue, styles.mb4]}
Expand Down