Skip to content
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

Jump to bottom

fix: [Held requests] Approval popup for a report with hold expense has X Close option it. #41975

Merged
merged 2 commits into from
May 13, 2024
Merged

fix: [Held requests] Approval popup for a report with hold expense has X Close option it. #41975

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8e5460f
fix: [Held requests] Approval popup for a report with hold expense ha…
Krishna2323 May 10, 2024
e33fc84
fix: missing header in native platforms.
Krishna2323 May 11, 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
22 changes: 0 additions & 22 deletions src/components/DecisionModal.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,11 @@
import React from 'react';
import {View} from 'react-native';
import useLocalize from '@hooks/useLocalize';
import useTheme from '@hooks/useTheme';
import useThemeStyles from '@hooks/useThemeStyles';
import CONST from '@src/CONST';
import Button from './Button';
import Header from './Header';
import Icon from './Icon';
import * as Expensicons from './Icon/Expensicons';
import Modal from './Modal';
import PressableWithoutFeedback from './Pressable/PressableWithoutFeedback';
import Text from './Text';
import Tooltip from './Tooltip';

type DecisionModalProps = {
/** Title describing purpose of modal */
Expand Down Expand Up @@ -43,8 +37,6 @@ type DecisionModalProps = {
};

function DecisionModal({title, prompt = '', firstOptionText, secondOptionText, onFirstOptionSubmit, onSecondOptionSubmit, isSmallScreenWidth, onClose, isVisible}: DecisionModalProps) {
const {translate} = useLocalize();
const theme = useTheme();
const styles = useThemeStyles();

return (
Expand All @@ -60,21 +52,7 @@ function DecisionModal({title, prompt = '', firstOptionText, secondOptionText, o
title={title}
containerStyles={[styles.alignItemsCenter]}
/>
<Tooltip text={translate('common.close')}>
<PressableWithoutFeedback
onPress={onClose}
style={[styles.touchableButtonImage]}
accessibilityRole={CONST.ACCESSIBILITY_ROLE.BUTTON}
accessibilityLabel={translate('common.close')}
>
<Icon
src={Expensicons.Close}
fill={theme.icon}
/>
</PressableWithoutFeedback>
</Tooltip>
</View>

<Text>{prompt}</Text>
</View>
{firstOptionText && (
Expand Down
Loading