From 9e4d5da697a71051d70e0cee42cc66018fec6347 Mon Sep 17 00:00:00 2001
From: FitseTLT <engfitsum@gmail.com>
Date: Tue, 13 Aug 2024 23:36:35 +0300
Subject: [PATCH 1/3] prevented displaying disabled tag in money request view

---
 src/components/ReportActionItem/MoneyRequestView.tsx | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/components/ReportActionItem/MoneyRequestView.tsx b/src/components/ReportActionItem/MoneyRequestView.tsx
index 13376c05a0f..1d2facdecd4 100644
--- a/src/components/ReportActionItem/MoneyRequestView.tsx
+++ b/src/components/ReportActionItem/MoneyRequestView.tsx
@@ -412,7 +412,13 @@ function MoneyRequestView({
         ...parentReportAction?.errors,
     };
 
-    const tagList = policyTagLists.map(({name, orderWeight}, index) => {
+    const tagList = policyTagLists.map(({name, orderWeight, tags}, index) => {
+        const tag = TransactionUtils.getTagForDisplay(updatedTransaction ?? transaction, index);
+        const shouldShowTag = !!tag || OptionsListUtils.hasEnabledOptions(tags);
+        if (!shouldShowTag) {
+            return null;
+        }
+
         const tagError = getErrorForField(
             'tag',
             {
@@ -429,7 +435,7 @@ function MoneyRequestView({
             >
                 <MenuItemWithTopDescription
                     description={name ?? translate('common.tag')}
-                    title={TransactionUtils.getTagForDisplay(updatedTransaction ?? transaction, index)}
+                    title={tag}
                     interactive={canEdit && !readonly}
                     shouldShowRightIcon={canEdit && !readonly}
                     titleStyle={styles.flex1}

From 88a7418ae67ac090b273c20158273ffeeada8e4e Mon Sep 17 00:00:00 2001
From: FitseTLT <engfitsum@gmail.com>
Date: Wed, 14 Aug 2024 00:38:52 +0300
Subject: [PATCH 2/3] fix lint

---
 src/components/ReportActionItem/MoneyRequestView.tsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/ReportActionItem/MoneyRequestView.tsx b/src/components/ReportActionItem/MoneyRequestView.tsx
index 1d2facdecd4..d7c693ea844 100644
--- a/src/components/ReportActionItem/MoneyRequestView.tsx
+++ b/src/components/ReportActionItem/MoneyRequestView.tsx
@@ -414,8 +414,8 @@ function MoneyRequestView({
 
     const tagList = policyTagLists.map(({name, orderWeight, tags}, index) => {
         const tag = TransactionUtils.getTagForDisplay(updatedTransaction ?? transaction, index);
-        const shouldShowTag = !!tag || OptionsListUtils.hasEnabledOptions(tags);
-        if (!shouldShowTag) {
+        const shouldShow = !!tag || OptionsListUtils.hasEnabledOptions(tags);
+        if (!shouldShow) {
             return null;
         }
 

From c4adb96aecbfda021a549bc39b73b93676a310d2 Mon Sep 17 00:00:00 2001
From: FitseTLT <engfitsum@gmail.com>
Date: Thu, 15 Aug 2024 23:02:11 +0300
Subject: [PATCH 3/3] reused tagForDisplay variable

---
 src/components/ReportActionItem/MoneyRequestView.tsx | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/components/ReportActionItem/MoneyRequestView.tsx b/src/components/ReportActionItem/MoneyRequestView.tsx
index d7c693ea844..20450a434e9 100644
--- a/src/components/ReportActionItem/MoneyRequestView.tsx
+++ b/src/components/ReportActionItem/MoneyRequestView.tsx
@@ -413,8 +413,8 @@ function MoneyRequestView({
     };
 
     const tagList = policyTagLists.map(({name, orderWeight, tags}, index) => {
-        const tag = TransactionUtils.getTagForDisplay(updatedTransaction ?? transaction, index);
-        const shouldShow = !!tag || OptionsListUtils.hasEnabledOptions(tags);
+        const tagForDisplay = TransactionUtils.getTagForDisplay(updatedTransaction ?? transaction, index);
+        const shouldShow = !!tagForDisplay || OptionsListUtils.hasEnabledOptions(tags);
         if (!shouldShow) {
             return null;
         }
@@ -426,7 +426,7 @@ function MoneyRequestView({
                 tagListName: name,
             },
             PolicyUtils.hasDependentTags(policy, policyTagList),
-            TransactionUtils.getTagForDisplay(updatedTransaction ?? transaction, index),
+            tagForDisplay,
         );
         return (
             <OfflineWithFeedback
@@ -435,7 +435,7 @@ function MoneyRequestView({
             >
                 <MenuItemWithTopDescription
                     description={name ?? translate('common.tag')}
-                    title={tag}
+                    title={tagForDisplay}
                     interactive={canEdit && !readonly}
                     shouldShowRightIcon={canEdit && !readonly}
                     titleStyle={styles.flex1}