From 1433235f1f3da9fbd7e4ac575a164432914e5292 Mon Sep 17 00:00:00 2001
From: ginsuma <13113013+ginsuma@users.noreply.github.com>
Date: Wed, 20 Sep 2023 12:47:58 +0700
Subject: [PATCH 1/2] Fix different grayness in MoneyRequestView and TaskView

---
 .../ReportActionItem/MoneyRequestView.js      | 16 ++++++++-------
 src/pages/home/report/ReportActionItem.js     | 20 ++++++++-----------
 2 files changed, 17 insertions(+), 19 deletions(-)

diff --git a/src/components/ReportActionItem/MoneyRequestView.js b/src/components/ReportActionItem/MoneyRequestView.js
index d8b15653d8af..aff4159bbcdb 100644
--- a/src/components/ReportActionItem/MoneyRequestView.js
+++ b/src/components/ReportActionItem/MoneyRequestView.js
@@ -108,13 +108,15 @@ function MoneyRequestView({report, parentReport, shouldShowHorizontalRule, trans
             </View>
 
             {hasReceipt && (
-                <View style={styles.moneyRequestViewImage}>
-                    <ReportActionItemImage
-                        thumbnail={receiptURIs.thumbnail}
-                        image={receiptURIs.image}
-                        enablePreviewModal
-                    />
-                </View>
+                <OfflineWithFeedback pendingAction={lodashGet(transaction, 'pendingAction')}>
+                    <View style={styles.moneyRequestViewImage}>
+                        <ReportActionItemImage
+                            thumbnail={receiptURIs.thumbnail}
+                            image={receiptURIs.image}
+                            enablePreviewModal
+                        />
+                    </View>
+                </OfflineWithFeedback>
             )}
             <OfflineWithFeedback pendingAction={lodashGet(transaction, 'pendingFields.amount') || lodashGet(transaction, 'pendingAction')}>
                 <MenuItemWithTopDescription
diff --git a/src/pages/home/report/ReportActionItem.js b/src/pages/home/report/ReportActionItem.js
index 8cf8fd78371d..567eee1d6c79 100644
--- a/src/pages/home/report/ReportActionItem.js
+++ b/src/pages/home/report/ReportActionItem.js
@@ -511,12 +511,10 @@ function ReportActionItem(props) {
                         checkIfContextMenuActive: toggleContextMenuFromActiveReportAction,
                     }}
                 >
-                    <OfflineWithFeedback pendingAction={props.action.pendingAction}>
-                        <MoneyRequestView
-                            report={props.report}
-                            shouldShowHorizontalRule={!props.shouldHideThreadDividerLine}
-                        />
-                    </OfflineWithFeedback>
+                    <MoneyRequestView
+                        report={props.report}
+                        shouldShowHorizontalRule={!props.shouldHideThreadDividerLine}
+                    />
                 </ShowContextMenuContext.Provider>
             );
         }
@@ -538,12 +536,10 @@ function ReportActionItem(props) {
             }
 
             return (
-                <OfflineWithFeedback pendingAction={props.action.pendingAction}>
-                    <TaskView
-                        report={props.report}
-                        shouldShowHorizontalRule={!props.shouldHideThreadDividerLine}
-                    />
-                </OfflineWithFeedback>
+                <TaskView
+                    report={props.report}
+                    shouldShowHorizontalRule={!props.shouldHideThreadDividerLine}
+                />
             );
         }
         if (ReportUtils.isExpenseReport(props.report) || ReportUtils.isIOUReport(props.report)) {

From 6f2fbfcabe8ab623377b5e506190248b8b639577 Mon Sep 17 00:00:00 2001
From: ginsuma <13113013+ginsuma@users.noreply.github.com>
Date: Wed, 20 Sep 2023 16:45:18 +0700
Subject: [PATCH 2/2] Clean code

---
 src/components/ReportActionItem/MoneyRequestView.js | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/components/ReportActionItem/MoneyRequestView.js b/src/components/ReportActionItem/MoneyRequestView.js
index aff4159bbcdb..6e46ee25359e 100644
--- a/src/components/ReportActionItem/MoneyRequestView.js
+++ b/src/components/ReportActionItem/MoneyRequestView.js
@@ -96,6 +96,8 @@ function MoneyRequestView({report, parentReport, shouldShowHorizontalRule, trans
     }
 
     const isDistanceRequest = TransactionUtils.isDistanceRequest(transaction);
+    const pendingAction = lodashGet(transaction, 'pendingAction');
+    const getPendingFieldAction = (fieldPath) => lodashGet(transaction, fieldPath) || pendingAction;
 
     return (
         <View>
@@ -108,7 +110,7 @@ function MoneyRequestView({report, parentReport, shouldShowHorizontalRule, trans
             </View>
 
             {hasReceipt && (
-                <OfflineWithFeedback pendingAction={lodashGet(transaction, 'pendingAction')}>
+                <OfflineWithFeedback pendingAction={pendingAction}>
                     <View style={styles.moneyRequestViewImage}>
                         <ReportActionItemImage
                             thumbnail={receiptURIs.thumbnail}
@@ -118,7 +120,7 @@ function MoneyRequestView({report, parentReport, shouldShowHorizontalRule, trans
                     </View>
                 </OfflineWithFeedback>
             )}
-            <OfflineWithFeedback pendingAction={lodashGet(transaction, 'pendingFields.amount') || lodashGet(transaction, 'pendingAction')}>
+            <OfflineWithFeedback pendingAction={getPendingFieldAction('pendingFields.amount')}>
                 <MenuItemWithTopDescription
                     title={formattedTransactionAmount ? formattedTransactionAmount.toString() : ''}
                     shouldShowTitleIcon={isSettled}
@@ -133,7 +135,7 @@ function MoneyRequestView({report, parentReport, shouldShowHorizontalRule, trans
                     subtitleTextStyle={styles.textLabelError}
                 />
             </OfflineWithFeedback>
-            <OfflineWithFeedback pendingAction={lodashGet(transaction, 'pendingFields.comment') || lodashGet(transaction, 'pendingAction')}>
+            <OfflineWithFeedback pendingAction={getPendingFieldAction('pendingFields.comment')}>
                 <MenuItemWithTopDescription
                     description={translate('common.description')}
                     shouldParseTitle
@@ -146,7 +148,7 @@ function MoneyRequestView({report, parentReport, shouldShowHorizontalRule, trans
                     numberOfLinesTitle={0}
                 />
             </OfflineWithFeedback>
-            <OfflineWithFeedback pendingAction={lodashGet(transaction, 'pendingFields.created') || lodashGet(transaction, 'pendingAction')}>
+            <OfflineWithFeedback pendingAction={getPendingFieldAction('pendingFields.created')}>
                 <MenuItemWithTopDescription
                     description={translate('common.date')}
                     title={transactionDate}
@@ -159,7 +161,7 @@ function MoneyRequestView({report, parentReport, shouldShowHorizontalRule, trans
                     subtitleTextStyle={styles.textLabelError}
                 />
             </OfflineWithFeedback>
-            <OfflineWithFeedback pendingAction={lodashGet(transaction, 'pendingFields.merchant') || lodashGet(transaction, 'pendingAction')}>
+            <OfflineWithFeedback pendingAction={getPendingFieldAction('pendingFields.merchant')}>
                 <MenuItemWithTopDescription
                     description={isDistanceRequest ? translate('common.distance') : translate('common.merchant')}
                     title={transactionMerchant}