From 8e5460f0925f1a1be3d20c90179b284c4dc07e57 Mon Sep 17 00:00:00 2001
From: Krishna Gupta <belivethatkg@gmail.com>
Date: Fri, 10 May 2024 16:11:38 +0530
Subject: [PATCH 1/2] fix: [Held requests] Approval popup for a report with
 hold expense has X Close option it.

Signed-off-by: Krishna Gupta <belivethatkg@gmail.com>
---
 src/components/DecisionModal.tsx | 32 ++++----------------------------
 1 file changed, 4 insertions(+), 28 deletions(-)

diff --git a/src/components/DecisionModal.tsx b/src/components/DecisionModal.tsx
index fde188fc70f..385bcdbf593 100644
--- a/src/components/DecisionModal.tsx
+++ b/src/components/DecisionModal.tsx
@@ -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 */
@@ -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 (
@@ -55,26 +47,10 @@ function DecisionModal({title, prompt = '', firstOptionText, secondOptionText, o
         >
             <View style={[styles.m5]}>
                 <View>
-                    <View style={[styles.flexRow, styles.mb4]}>
-                        <Header
-                            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>
-
+                    <Header
+                        title={title}
+                        containerStyles={[styles.alignItemsCenter, styles.mb4]}
+                    />
                     <Text>{prompt}</Text>
                 </View>
                 {firstOptionText && (

From e33fc84a82b618c1bbcb0ac71db5657bf99149f9 Mon Sep 17 00:00:00 2001
From: Krishna Gupta <belivethatkg@gmail.com>
Date: Sat, 11 May 2024 08:46:16 +0530
Subject: [PATCH 2/2] fix: missing header in native platforms.

Signed-off-by: Krishna Gupta <belivethatkg@gmail.com>
---
 src/components/DecisionModal.tsx | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/components/DecisionModal.tsx b/src/components/DecisionModal.tsx
index 385bcdbf593..065099867e1 100644
--- a/src/components/DecisionModal.tsx
+++ b/src/components/DecisionModal.tsx
@@ -47,10 +47,12 @@ function DecisionModal({title, prompt = '', firstOptionText, secondOptionText, o
         >
             <View style={[styles.m5]}>
                 <View>
-                    <Header
-                        title={title}
-                        containerStyles={[styles.alignItemsCenter, styles.mb4]}
-                    />
+                    <View style={[styles.flexRow, styles.mb4]}>
+                        <Header
+                            title={title}
+                            containerStyles={[styles.alignItemsCenter]}
+                        />
+                    </View>
                     <Text>{prompt}</Text>
                 </View>
                 {firstOptionText && (