Merge pull request #55916 from Expensify/revert-55383-update-settleme…

…nt-button-condition

Revert "Update settlement button condition"

(cherry picked from commit f87d0de)

(CP triggered by yuwenmemon)

src/components/MoneyReportHeader.tsx

@@ -41,7 +41,6 @@ import {
     isPending,
     isReceiptBeingScanned,
     shouldShowBrokenConnectionViolation as shouldShowBrokenConnectionViolationTransactionUtils,
-    shouldShowRTERViolationMessage,
 } from '@libs/TransactionUtils';
 import variables from '@styles/variables';
 import {
@@ -185,7 +184,7 @@ function MoneyReportHeader({policy, report: moneyRequestReport, transactionThrea
     const shouldShowSettlementButton =
         !shouldShowSubmitButton &&
         (shouldShowPayButton || shouldShowApproveButton) &&
-        !shouldShowRTERViolationMessage(transactions) &&
+        !hasAllPendingRTERViolations &&
         !shouldShowExportIntegrationButton &&
         !shouldShowBrokenConnectionViolation;
 

src/components/ReportActionItem/ReportPreview.tsx

@@ -70,12 +70,13 @@ import StringUtils from '@libs/StringUtils';
 import {
     getDescription,
     getMerchant,
+    getTransactionViolations,
+    hasPendingUI,
     isCardTransaction,
     isPartialMerchant,
     isPending,
     isReceiptBeingScanned,
     shouldShowBrokenConnectionViolation as shouldShowBrokenConnectionViolationTransactionUtils,
-    shouldShowRTERViolationMessage,
 } from '@libs/TransactionUtils';
 import type {ContextMenuAnchor} from '@pages/home/report/ContextMenu/ReportActionContextMenu';
 import variables from '@styles/variables';
@@ -235,7 +236,7 @@ function ReportPreview({
     const lastThreeTransactions = transactions?.slice(-3) ?? [];
     const lastTransaction = transactions?.at(0);
     const lastThreeReceipts = lastThreeTransactions.map((transaction) => ({...getThumbnailAndImageURIs(transaction), transaction}));
-    const showRTERViolationMessage = shouldShowRTERViolationMessage(transactions);
+    const showRTERViolationMessage = numberOfRequests === 1 && hasPendingUI(lastTransaction, getTransactionViolations(lastTransaction?.transactionID, transactionViolations));
     const transactionIDList = [lastTransaction?.transactionID].filter((transactionID): transactionID is string => transactionID !== undefined);
     const shouldShowBrokenConnectionViolation = numberOfRequests === 1 && shouldShowBrokenConnectionViolationTransactionUtils(transactionIDList, iouReport, policy);
     let formattedMerchant = numberOfRequests === 1 ? getMerchant(lastTransaction) : null;

src/libs/TransactionUtils/index.ts

@@ -1366,10 +1366,6 @@ function getAllSortedTransactions(iouReportID?: string): Array<OnyxEntry<Transac
     });
 }
 
-function shouldShowRTERViolationMessage(transactions?: Transaction[]) {
-    return transactions?.length === 1 && hasPendingUI(transactions?.at(0), getTransactionViolations(transactions?.at(0)?.transactionID, allTransactionViolations));
-}
-
 export {
     buildOptimisticTransaction,
     calculateTaxAmount,
@@ -1456,7 +1452,6 @@ export {
     getFormattedPostedDate,
     getCategoryTaxCodeAndAmount,
     isPerDiemRequest,
-    shouldShowRTERViolationMessage,
 };
 
 export type {TransactionChanges};

tests/unit/TransactionUtilsTest.ts

@@ -241,15 +241,4 @@ describe('TransactionUtils', () => {
             expect(updatedTransaction.taxAmount).toBe(5);
         });
     });
-
-    describe('shouldShowRTERViolationMessage', () => {
-        it('should return true if transaction is receipt being scanned', () => {
-            const transaction = generateTransaction({
-                receipt: {
-                    state: CONST.IOU.RECEIPT_STATE.SCANREADY,
-                },
-            });
-            expect(TransactionUtils.shouldShowRTERViolationMessage([transaction])).toBe(true);
-        });
-    });
 });