From 53e3ae8bc685cf29314872422732bada5f2e17bb Mon Sep 17 00:00:00 2001
From: dukenv0307 <dukenv0307@gmail.com>
Date: Fri, 2 Feb 2024 10:28:33 +0700
Subject: [PATCH] revert hard code and rename variable

---
 ...oraryForRefactorRequestConfirmationList.js |  2 +-
 .../iou/request/step/IOURequestStepTag.js     | 23 +++++++++++--------
 2 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/src/components/MoneyTemporaryForRefactorRequestConfirmationList.js b/src/components/MoneyTemporaryForRefactorRequestConfirmationList.js
index 8dc9d3e419c0..122001861827 100755
--- a/src/components/MoneyTemporaryForRefactorRequestConfirmationList.js
+++ b/src/components/MoneyTemporaryForRefactorRequestConfirmationList.js
@@ -258,7 +258,7 @@ function MoneyTemporaryForRefactorRequestConfirmationList({
     const shouldCalculateDistanceAmount = isDistanceRequest && iouAmount === 0;
 
     // A flag for showing the categories field
-    const shouldShowCategories = iouCategory || OptionsListUtils.hasEnabledOptions(_.values(policyCategories));
+    const shouldShowCategories = isPolicyExpenseChat && (iouCategory || OptionsListUtils.hasEnabledOptions(_.values(policyCategories)));
 
     // A flag and a toggler for showing the rest of the form fields
     const [shouldExpandFields, toggleShouldExpandFields] = useReducer((state) => !state, false);
diff --git a/src/pages/iou/request/step/IOURequestStepTag.js b/src/pages/iou/request/step/IOURequestStepTag.js
index e4390c5abbde..1297b98a0814 100644
--- a/src/pages/iou/request/step/IOURequestStepTag.js
+++ b/src/pages/iou/request/step/IOURequestStepTag.js
@@ -56,7 +56,7 @@ function IOURequestStepTag({
     const tagListKey = _.first(_.keys(policyTags));
     const policyTagListName = PolicyUtils.getTagListName(policyTags) || translate('common.tag');
     const isEditing = action === CONST.IOU.ACTION.EDIT;
-    const isBillSplit = iouType === CONST.IOU.TYPE.SPLIT;
+    const isSplitBill = iouType === CONST.IOU.TYPE.SPLIT;
 
     const navigateBack = () => {
         Navigation.goBack(backTo || ROUTES.HOME);
@@ -69,7 +69,7 @@ function IOURequestStepTag({
     const updateTag = (selectedTag) => {
         const isSelectedTag = selectedTag.searchText === tag;
         const updatedTag = !isSelectedTag ? selectedTag.searchText : '';
-        if (isBillSplit) {
+        if (isSplitBill) {
             IOU.setDraftSplitTransaction(transactionID, {tag: selectedTag.searchText});
             navigateBack();
             return;
@@ -90,13 +90,18 @@ function IOURequestStepTag({
             shouldShowWrapper
             testID={IOURequestStepTag.displayName}
         >
-            <Text style={[styles.ph5, styles.pv3]}>{translate('iou.tagSelection', {tagName: policyTagListName})}</Text>
-            <TagPicker
-                policyID={report.policyID}
-                tag={tagListKey}
-                selectedTag={tag || ''}
-                onSubmit={updateTag}
-            />
+            {({insets}) => (
+                <>
+                    <Text style={[styles.ph5, styles.pv3]}>{translate('iou.tagSelection', {tagName: policyTagListName})}</Text>
+                    <TagPicker
+                        policyID={report.policyID}
+                        tag={tagListKey}
+                        selectedTag={tag || ''}
+                        onSubmit={updateTag}
+                        insets={insets}
+                    />
+                </>
+            )}
         </StepScreenWrapper>
     );
 }