From 5326a6fb962cf837f9eaabbbeccd044de2f8996f Mon Sep 17 00:00:00 2001
From: Jan Nowakowski <janeknowakowski9@gmail.com>
Date: Mon, 7 Apr 2025 12:19:23 +0200
Subject: [PATCH 01/42] Add report preview actions to new preview component

---
 .../MoneyRequestReportPreviewContent.tsx      | 187 ++++++++++--------
 1 file changed, 100 insertions(+), 87 deletions(-)

diff --git a/src/components/ReportActionItem/MoneyRequestReportPreview/MoneyRequestReportPreviewContent.tsx b/src/components/ReportActionItem/MoneyRequestReportPreview/MoneyRequestReportPreviewContent.tsx
index 6f11b89f10a6e..7e0eb9db6fc67 100644
--- a/src/components/ReportActionItem/MoneyRequestReportPreview/MoneyRequestReportPreviewContent.tsx
+++ b/src/components/ReportActionItem/MoneyRequestReportPreview/MoneyRequestReportPreviewContent.tsx
@@ -28,10 +28,12 @@ import useThemeStyles from '@hooks/useThemeStyles';
 import ControlSelection from '@libs/ControlSelection';
 import {convertToDisplayString} from '@libs/CurrencyUtils';
 import {canUseTouchScreen} from '@libs/DeviceCapabilities';
+import Navigation from '@libs/Navigation/Navigation';
+import Performance from '@libs/Performance';
 import {getConnectedIntegration} from '@libs/PolicyUtils';
+import getReportPreviewAction from '@libs/ReportPreviewActionUtils';
 import {
     areAllRequestsBeingSmartScanned as areAllRequestsBeingSmartScannedReportUtils,
-    canBeExported,
     getBankAccountRoute,
     getDisplayNameForParticipant,
     getInvoicePayerName,
@@ -50,7 +52,6 @@ import {
     hasUpdatedTotal,
     hasViolations,
     hasWarningTypeViolations,
-    isAllowedToApproveExpenseReport,
     isAllowedToSubmitDraftExpenseReport,
     isInvoiceReport as isInvoiceReportUtils,
     isInvoiceRoom as isInvoiceRoomReportUtils,
@@ -61,18 +62,11 @@ import {
     isTripRoom as isTripRoomReportUtils,
     isWaitingForSubmissionFromCurrentUser as isWaitingForSubmissionFromCurrentUserReportUtils,
 } from '@libs/ReportUtils';
-import {
-    getMerchant,
-    hasPendingUI,
-    isCardTransaction,
-    isPartialMerchant,
-    isPending,
-    isReceiptBeingScanned,
-    shouldShowBrokenConnectionViolationForMultipleTransactions,
-} from '@libs/TransactionUtils';
+import {getMerchant, hasPendingUI, isCardTransaction, isPartialMerchant, isPending, isReceiptBeingScanned} from '@libs/TransactionUtils';
 import colors from '@styles/theme/colors';
 import variables from '@styles/variables';
-import {approveMoneyRequest, canApproveIOU, canIOUBePaid as canIOUBePaidIOUActions, canSubmitReport, payInvoice, payMoneyRequest, submitReport} from '@userActions/IOU';
+import {approveMoneyRequest, canIOUBePaid as canIOUBePaidIOUActions, canSubmitReport, payInvoice, payMoneyRequest, submitReport} from '@userActions/IOU';
+import Timing from '@userActions/Timing';
 import CONST from '@src/CONST';
 import type {TranslationPaths} from '@src/languages/types';
 import ROUTES from '@src/ROUTES';
@@ -117,7 +111,6 @@ function MoneyRequestReportPreviewContent({
     reportPreviewStyles,
 }: MoneyRequestReportPreviewContentProps) {
     const lastTransaction = transactions?.at(0);
-    const transactionIDList = transactions?.map((reportTransaction) => reportTransaction.transactionID) ?? [];
     const theme = useTheme();
     const styles = useThemeStyles();
     const StyleUtils = useStyleUtils();
@@ -151,12 +144,8 @@ function MoneyRequestReportPreviewContent({
     );
 
     const canIOUBePaid = useMemo(() => getCanIOUBePaid(), [getCanIOUBePaid]);
-    const canIOUBePaidAndApproved = useMemo(() => getCanIOUBePaid(false, false), [getCanIOUBePaid]);
     const onlyShowPayElsewhere = useMemo(() => !canIOUBePaid && getCanIOUBePaid(true), [canIOUBePaid, getCanIOUBePaid]);
     const shouldShowPayButton = isPaidAnimationRunning || canIOUBePaid || onlyShowPayElsewhere;
-    const shouldShowApproveButton = useMemo(() => canApproveIOU(iouReport, policy), [iouReport, policy]) || isApprovedAnimationRunning;
-
-    const shouldDisableApproveButton = shouldShowApproveButton && !isAllowedToApproveExpenseReport(iouReport);
 
     const {nonHeldAmount, fullAmount, hasValidNonHeldAmount} = getNonHeldAndFullAmount(iouReport, shouldShowPayButton);
     const hasOnlyHeldExpenses = hasOnlyHeldExpensesReportUtils(iouReport?.reportID);
@@ -195,14 +184,12 @@ function MoneyRequestReportPreviewContent({
         (isReportOwner(iouReport) && hasReportViolations(iouReportID)) ||
         hasActionsWithErrors(iouReportID);
     const showRTERViolationMessage = numberOfRequests === 1 && hasPendingUI(lastTransaction, lastTransactionViolations);
-    const shouldShowBrokenConnectionViolation = numberOfRequests === 1 && shouldShowBrokenConnectionViolationForMultipleTransactions(transactionIDList, iouReport, policy, violations);
     let formattedMerchant = numberOfRequests === 1 ? getMerchant(lastTransaction) : undefined;
 
     if (isPartialMerchant(formattedMerchant ?? '')) {
         formattedMerchant = undefined;
     }
 
-    const isAdmin = policy?.role === CONST.POLICY.ROLE.ADMIN;
     const filteredTransactions = transactions?.filter((transaction) => transaction) ?? [];
     const shouldShowSubmitButton = canSubmitReport(iouReport, policy, filteredTransactions, violations);
     const shouldDisableSubmitButton = shouldShowSubmitButton && !isAllowedToSubmitDraftExpenseReport(iouReport);
@@ -314,8 +301,6 @@ function MoneyRequestReportPreviewContent({
 
     const bankAccountRoute = getBankAccountRoute(chatReport);
 
-    const shouldShowSettlementButton = !shouldShowSubmitButton && (shouldShowPayButton || shouldShowApproveButton) && !showRTERViolationMessage && !shouldShowBrokenConnectionViolation;
-
     const shouldShowRBR = hasErrors && !iouSettled;
 
     /*
@@ -345,7 +330,6 @@ function MoneyRequestReportPreviewContent({
      * Manual export
      */
     const connectedIntegration = getConnectedIntegration(policy);
-    const shouldShowExportIntegrationButton = !shouldShowPayButton && !shouldShowSubmitButton && connectedIntegration && isAdmin && canBeExported(iouReport);
 
     useEffect(() => {
         if (!isPaidAnimationRunning || isApprovedAnimationRunning) {
@@ -437,6 +421,99 @@ function MoneyRequestReportPreviewContent({
         />
     );
 
+    const openReportFromPreview = useCallback(() => {
+        if (!iouReportID) {
+            return;
+        }
+        Performance.markStart(CONST.TIMING.OPEN_REPORT_FROM_PREVIEW);
+        Timing.start(CONST.TIMING.OPEN_REPORT_FROM_PREVIEW);
+        Navigation.navigate(ROUTES.REPORT_WITH_ID.getRoute(iouReportID));
+    }, [iouReportID]);
+
+    const reportPreviewAction = useMemo(() => {
+        return getReportPreviewAction(violations, iouReport, policy, transactions);
+    }, [iouReport, policy, violations, transactions]);
+
+    const reportPreviewActions = {
+        [CONST.REPORT.REPORT_PREVIEW_ACTIONS.SUBMIT]: (
+            <Button
+                success={isWaitingForSubmissionFromCurrentUser}
+                text={translate('common.submit')}
+                onPress={() => submitReport(iouReport)}
+                isDisabled={shouldDisableSubmitButton}
+            />
+        ),
+        [CONST.REPORT.REPORT_PREVIEW_ACTIONS.APPROVE]: (
+            <Button
+                text={translate('iou.approve')}
+                success
+                onPress={() => confirmApproval()}
+                isDisabled={shouldDisableSubmitButton}
+            />
+        ),
+        [CONST.REPORT.REPORT_PREVIEW_ACTIONS.PAY]: (
+            <AnimatedSettlementButton
+                onlyShowPayElsewhere={onlyShowPayElsewhere}
+                currency={iouReport?.currency}
+                policyID={policyID}
+                chatReportID={chatReportID}
+                iouReport={iouReport}
+                onPress={confirmPayment}
+                enablePaymentsRoute={ROUTES.ENABLE_PAYMENTS}
+                addBankAccountRoute={bankAccountRoute}
+                shouldHidePaymentOptions={!shouldShowPayButton}
+                canIOUBePaid
+                formattedAmount={getSettlementAmount() ?? ''}
+                isPaidAnimationRunning={isPaidAnimationRunning}
+                isApprovedAnimationRunning={isApprovedAnimationRunning}
+                onAnimationFinish={stopAnimation}
+                onPaymentOptionsShow={onPaymentOptionsShow}
+                onPaymentOptionsHide={onPaymentOptionsHide}
+                kycWallAnchorAlignment={{
+                    horizontal: CONST.MODAL.ANCHOR_ORIGIN_HORIZONTAL.LEFT,
+                    vertical: CONST.MODAL.ANCHOR_ORIGIN_VERTICAL.BOTTOM,
+                }}
+                paymentMethodDropdownAnchorAlignment={{
+                    horizontal: CONST.MODAL.ANCHOR_ORIGIN_HORIZONTAL.RIGHT,
+                    vertical: CONST.MODAL.ANCHOR_ORIGIN_VERTICAL.BOTTOM,
+                }}
+                isDisabled={isOffline && !canAllowSettlement}
+                isLoading={!isOffline && !canAllowSettlement}
+            />
+        ),
+        [CONST.REPORT.REPORT_PREVIEW_ACTIONS.EXPORT_TO_ACCOUNTING]: connectedIntegration ? (
+            <ExportWithDropdownMenu
+                policy={policy}
+                report={iouReport}
+                connectionName={connectedIntegration}
+                wrapperStyle={styles.flexReset}
+                dropdownAnchorAlignment={{
+                    horizontal: CONST.MODAL.ANCHOR_ORIGIN_HORIZONTAL.RIGHT,
+                    vertical: CONST.MODAL.ANCHOR_ORIGIN_VERTICAL.BOTTOM,
+                }}
+            />
+        ) : null,
+        [CONST.REPORT.REPORT_PREVIEW_ACTIONS.REVIEW]: (
+            <Button
+                text={translate('common.review')}
+                onPress={() => openReportFromPreview()}
+                isDisabled={shouldDisableSubmitButton}
+                icon={Expensicons.DotIndicator}
+                iconFill={theme.danger}
+                iconHoverFill={theme.dangerHover}
+            />
+        ),
+        [CONST.REPORT.REPORT_PREVIEW_ACTIONS.VIEW]: (
+            <Button
+                text={translate('common.view')}
+                onPress={() => {
+                    openReportFromPreview();
+                }}
+                isDisabled={shouldDisableSubmitButton}
+            />
+        ),
+    };
+
     return (
         transactions.length > 0 && (
             <OfflineWithFeedback
@@ -579,71 +656,7 @@ function MoneyRequestReportPreviewContent({
                                             ))}
                                         </View>
                                     )}
-                                    {shouldShowSettlementButton && !shouldShowRBR && (
-                                        <AnimatedSettlementButton
-                                            onlyShowPayElsewhere={onlyShowPayElsewhere}
-                                            isPaidAnimationRunning={isPaidAnimationRunning}
-                                            isApprovedAnimationRunning={isApprovedAnimationRunning}
-                                            canIOUBePaid={canIOUBePaidAndApproved || isPaidAnimationRunning}
-                                            onAnimationFinish={stopAnimation}
-                                            formattedAmount={getSettlementAmount() ?? ''}
-                                            currency={iouReport?.currency}
-                                            policyID={policyID}
-                                            chatReportID={chatReportID}
-                                            iouReport={iouReport}
-                                            wrapperStyle={buttonMaxWidth}
-                                            onPress={confirmPayment}
-                                            onPaymentOptionsShow={onPaymentOptionsShow}
-                                            onPaymentOptionsHide={onPaymentOptionsHide}
-                                            confirmApproval={confirmApproval}
-                                            enablePaymentsRoute={ROUTES.ENABLE_PAYMENTS}
-                                            addBankAccountRoute={bankAccountRoute}
-                                            shouldHidePaymentOptions={!shouldShowPayButton}
-                                            shouldShowApproveButton={shouldShowApproveButton}
-                                            shouldDisableApproveButton={shouldDisableApproveButton}
-                                            kycWallAnchorAlignment={{
-                                                horizontal: CONST.MODAL.ANCHOR_ORIGIN_HORIZONTAL.LEFT,
-                                                vertical: CONST.MODAL.ANCHOR_ORIGIN_VERTICAL.BOTTOM,
-                                            }}
-                                            paymentMethodDropdownAnchorAlignment={{
-                                                horizontal: CONST.MODAL.ANCHOR_ORIGIN_HORIZONTAL.RIGHT,
-                                                vertical: CONST.MODAL.ANCHOR_ORIGIN_VERTICAL.BOTTOM,
-                                            }}
-                                            isDisabled={isOffline && !canAllowSettlement}
-                                            isLoading={!isOffline && !canAllowSettlement}
-                                        />
-                                    )}
-                                    {!!shouldShowExportIntegrationButton && !shouldShowSettlementButton && shouldShowRBR && (
-                                        <ExportWithDropdownMenu
-                                            policy={policy}
-                                            report={iouReport}
-                                            connectionName={connectedIntegration}
-                                            wrapperStyle={[buttonMaxWidth, styles.flexReset]}
-                                            dropdownAnchorAlignment={{
-                                                horizontal: CONST.MODAL.ANCHOR_ORIGIN_HORIZONTAL.RIGHT,
-                                                vertical: CONST.MODAL.ANCHOR_ORIGIN_VERTICAL.BOTTOM,
-                                            }}
-                                        />
-                                    )}
-                                    {!shouldShowSubmitButton && shouldShowRBR && (shouldShowSettlementButton || !!shouldShowExportIntegrationButton) && (
-                                        <Button
-                                            icon={Expensicons.DotIndicator}
-                                            iconFill={theme.danger}
-                                            iconHoverFill={theme.danger}
-                                            text={translate('common.review', {amount: shouldShowSettlementButton ? getSettlementAmount() : ''})}
-                                            onPress={() => {}}
-                                            style={buttonMaxWidth}
-                                        />
-                                    )}
-                                    {shouldShowSubmitButton && (
-                                        <Button
-                                            success={isWaitingForSubmissionFromCurrentUser}
-                                            text={translate('common.submit')}
-                                            style={buttonMaxWidth}
-                                            onPress={() => iouReport && submitReport(iouReport)}
-                                            isDisabled={shouldDisableSubmitButton}
-                                        />
-                                    )}
+                                    <View style={[buttonMaxWidth]}>{reportPreviewActions[reportPreviewAction]}</View>
                                 </View>
                             </View>
                         </View>

From 6ca8a5f1fda612fc169a559a8fd8d95ddb374c2f Mon Sep 17 00:00:00 2001
From: Jan Nowakowski <janeknowakowski9@gmail.com>
Date: Wed, 9 Apr 2025 15:00:53 +0200
Subject: [PATCH 02/42] Fix several blockers after PR-58084

---
 src/libs/ReportPreviewActionUtils.ts   | 10 +++++++++
 src/libs/ReportPrimaryActionUtils.ts   | 29 ++++++++++++++++++++++----
 src/libs/ReportSecondaryActionUtils.ts |  3 ++-
 3 files changed, 37 insertions(+), 5 deletions(-)

diff --git a/src/libs/ReportPreviewActionUtils.ts b/src/libs/ReportPreviewActionUtils.ts
index 13033f249e06c..ee10be454884a 100644
--- a/src/libs/ReportPreviewActionUtils.ts
+++ b/src/libs/ReportPreviewActionUtils.ts
@@ -6,8 +6,10 @@ import {isApprover as isApproverMember} from './actions/Policy/Member';
 import {getCurrentUserAccountID} from './actions/Report';
 import {arePaymentsEnabled, getConnectedIntegration, getCorrectedAutoReportingFrequency, hasAccountingConnections, hasIntegrationAutoSync, isPrefferedExporter} from './PolicyUtils';
 import {
+    getReportNameValuePairs,
     getReportTransactions,
     hasViolations as hasAnyViolations,
+    isArchivedReport,
     isClosedReport,
     isCurrentUserSubmitter,
     isExpenseReport,
@@ -53,9 +55,17 @@ function canPay(report: Report, violations: OnyxCollection<TransactionViolation[
     const isInvoice = isInvoiceReport(report);
     const isIOU = isIOUReport(report);
 
+    const reportNameValuePairs = getReportNameValuePairs(report.chatReportID);
+    const isChatReportArchived = isArchivedReport(reportNameValuePairs);
+
     if (!isReportPayer) {
         return false;
     }
+
+    if (isChatReportArchived) {
+        return false;
+    }
+
     return (isExpense && isPaymentsEnabled && (isApproved || isClosed) && !hasViolations) || ((isInvoice || isIOU) && isProcessing);
 }
 
diff --git a/src/libs/ReportPrimaryActionUtils.ts b/src/libs/ReportPrimaryActionUtils.ts
index 6d05e752102a3..e2c381488604f 100644
--- a/src/libs/ReportPrimaryActionUtils.ts
+++ b/src/libs/ReportPrimaryActionUtils.ts
@@ -14,7 +14,10 @@ import {
 } from './PolicyUtils';
 import {getAllReportActions, getOneTransactionThreadReportID} from './ReportActionsUtils';
 import {
+    getMoneyRequestSpendBreakdown,
     getParentReport,
+    getReportNameValuePairs,
+    isArchivedReport,
     isClosedReport as isClosedReportUtils,
     isCurrentUserSubmitter,
     isExpenseReport as isExpenseReportUtils,
@@ -55,6 +58,13 @@ function isApproveAction(report: Report, reportTransactions: Transaction[], poli
         return false;
     }
 
+    const isPreventSelfApprovalEnabled = policy?.preventSelfApproval;
+    const isReportSubmitter = isCurrentUserSubmitter(report.reportID);
+
+    if (isPreventSelfApprovalEnabled && isReportSubmitter) {
+        return false;
+    }
+
     const isOneExpenseReport = isExpenseReport && reportTransactions.length === 1;
     const isReportOnHold = reportTransactions.some(isOnHoldTransactionUtils);
     const isProcessingReport = isProcessingReportUtils(report);
@@ -73,13 +83,24 @@ function isPayAction(report: Report, policy?: Policy) {
     const arePaymentsEnabled = arePaymentsEnabledUtils(policy);
     const isReportApproved = isReportApprovedUtils({report});
     const isReportClosed = isClosedReportUtils(report);
-    const isReportFinished = isReportApproved || isReportClosed;
+    const isProcessingReport = isProcessingReportUtils(report);
 
-    if (isReportPayer && isExpenseReport && arePaymentsEnabled && isReportFinished) {
-        return true;
+    const isApprovalEnabled = policy ? policy.approvalMode && policy.approvalMode !== CONST.POLICY.APPROVAL_MODE.OPTIONAL : false;
+    const isSubmittedWithoutApprovalsEnabled = !isApprovalEnabled && isProcessingReport;
+
+    const isReportFinished = isReportApproved || isSubmittedWithoutApprovalsEnabled || isReportClosed;
+    const {reimbursableSpend} = getMoneyRequestSpendBreakdown(report);
+
+    const reportNameValuePairs = getReportNameValuePairs(report.chatReportID);
+    const isChatReportArchived = isArchivedReport(reportNameValuePairs);
+
+    if (isChatReportArchived) {
+        return false;
     }
 
-    const isProcessingReport = isProcessingReportUtils(report);
+    if (isReportPayer && isExpenseReport && arePaymentsEnabled && isReportFinished && reimbursableSpend > 0) {
+        return true;
+    }
 
     if (!isProcessingReport) {
         return false;
diff --git a/src/libs/ReportSecondaryActionUtils.ts b/src/libs/ReportSecondaryActionUtils.ts
index 57befeb64ee60..c0091f947e521 100644
--- a/src/libs/ReportSecondaryActionUtils.ts
+++ b/src/libs/ReportSecondaryActionUtils.ts
@@ -329,11 +329,12 @@ function isChangeWorkspaceAction(report: Report, reportTransactions: Transaction
 
 function isDeleteAction(report: Report, reportTransactions: Transaction[]): boolean {
     const isExpenseReport = isExpenseReportUtils(report);
+    const isIOUReport = isIOUReportUtils(report);
 
     // This should be removed when is merged https://github.com/Expensify/App/pull/58020
     const isSingleTransaction = reportTransactions.length === 1;
 
-    if (!isExpenseReport || !isSingleTransaction) {
+    if ((!isExpenseReport && !isIOUReport) || !isSingleTransaction) {
         return false;
     }
 

From d2be1d55ec997436042029a084d681bfcfe335e9 Mon Sep 17 00:00:00 2001
From: Jan Nowakowski <janeknowakowski9@gmail.com>
Date: Wed, 9 Apr 2025 15:28:47 +0200
Subject: [PATCH 03/42] fix test

---
 tests/unit/ReportPrimaryActionUtilsTest.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tests/unit/ReportPrimaryActionUtilsTest.ts b/tests/unit/ReportPrimaryActionUtilsTest.ts
index 6910c0ac3232d..b48ab9f1fbfff 100644
--- a/tests/unit/ReportPrimaryActionUtilsTest.ts
+++ b/tests/unit/ReportPrimaryActionUtilsTest.ts
@@ -94,6 +94,7 @@ describe('getPrimaryAction', () => {
             type: CONST.REPORT.TYPE.EXPENSE,
             ownerAccountID: CURRENT_USER_ACCOUNT_ID,
             statusNum: CONST.REPORT.STATUS_NUM.CLOSED,
+            total: -300,
         } as unknown as Report;
         await Onyx.merge(`${ONYXKEYS.COLLECTION.REPORT}${REPORT_ID}`, report);
         const policy = {

From 6a890dc579623cfdcde677b644dbd2177c27e1a9 Mon Sep 17 00:00:00 2001
From: Jan Nowakowski <janeknowakowski9@gmail.com>
Date: Wed, 9 Apr 2025 16:11:10 +0200
Subject: [PATCH 04/42] Further fixes

---
 src/libs/ReportPreviewActionUtils.ts   | 7 +++++++
 src/libs/ReportSecondaryActionUtils.ts | 7 +++++++
 2 files changed, 14 insertions(+)

diff --git a/src/libs/ReportPreviewActionUtils.ts b/src/libs/ReportPreviewActionUtils.ts
index 5165fe238c808..f98876beeebc0 100644
--- a/src/libs/ReportPreviewActionUtils.ts
+++ b/src/libs/ReportPreviewActionUtils.ts
@@ -6,6 +6,7 @@ import {isApprover as isApproverMember} from './actions/Policy/Member';
 import {getCurrentUserAccountID} from './actions/Report';
 import {arePaymentsEnabled, getConnectedIntegration, getCorrectedAutoReportingFrequency, hasAccountingConnections, hasIntegrationAutoSync, isPrefferedExporter} from './PolicyUtils';
 import {
+    getMoneyRequestSpendBreakdown,
     getReportNameValuePairs,
     getReportTransactions,
     hasViolations as hasAnyViolations,
@@ -58,6 +59,12 @@ function canPay(report: Report, violations: OnyxCollection<TransactionViolation[
     const reportNameValuePairs = getReportNameValuePairs(report.chatReportID);
     const isChatReportArchived = isArchivedReport(reportNameValuePairs);
 
+    const {reimbursableSpend} = getMoneyRequestSpendBreakdown(report);
+
+    if (reimbursableSpend <= 0) {
+        return false;
+    }
+
     if (!isReportPayer) {
         return false;
     }
diff --git a/src/libs/ReportSecondaryActionUtils.ts b/src/libs/ReportSecondaryActionUtils.ts
index c0091f947e521..0fec251dd4d39 100644
--- a/src/libs/ReportSecondaryActionUtils.ts
+++ b/src/libs/ReportSecondaryActionUtils.ts
@@ -66,6 +66,13 @@ function isApproveAction(report: Report, reportTransactions: Transaction[], viol
     const isProcessingReport = isProcessingReportUtils(report);
     const reportHasDuplicatedTransactions = reportTransactions.some((transaction) => isDuplicate(transaction.transactionID));
 
+    const isPreventSelfApprovalEnabled = policy?.preventSelfApproval;
+    const isReportSubmitter = isCurrentUserSubmitter(report.reportID);
+
+    if (isPreventSelfApprovalEnabled && isReportSubmitter) {
+        return false;
+    }
+
     if (isExpenseReport && isReportApprover && isProcessingReport && reportHasDuplicatedTransactions) {
         return true;
     }

From c36fc9d7f727c9b16baf287d4d66015573c8dd61 Mon Sep 17 00:00:00 2001
From: Jan Nowakowski <janeknowakowski9@gmail.com>
Date: Thu, 10 Apr 2025 10:15:30 +0200
Subject: [PATCH 05/42] Revert "revert 58084"

This reverts commit 3daab6ebece8c42fdd6752a006130733bf464561.
---
 src/CONST.ts                                  |  17 +
 src/components/AvatarWithDisplayName.tsx      |  19 +-
 src/components/MoneyReportHeader.tsx          | 583 +++++++++++-------
 src/components/MoneyRequestHeader.tsx         | 198 ++++--
 .../ExportWithDropdownMenu.tsx                |  28 +-
 .../ReportActionItem/ReportPreview.tsx        | 164 ++---
 src/languages/en.ts                           |   5 +-
 src/languages/es.ts                           |   3 +-
 src/libs/PolicyUtils.ts                       |  18 +-
 src/libs/ReportPreviewActionUtils.ts          | 114 ++++
 src/libs/ReportPrimaryActionUtils.ts          | 149 ++++-
 src/libs/ReportSecondaryActionUtils.ts        | 145 +++--
 src/libs/ReportUtils.ts                       |   8 +-
 src/libs/TransactionUtils/index.ts            |  23 +-
 src/libs/actions/IOU.ts                       |   8 +-
 src/libs/actions/Policy/Policy.ts             |   4 +-
 src/pages/ReportDetailsPage.tsx               | 200 +-----
 .../home/report/ReportDetailsExportPage.tsx   |   2 +-
 .../EnforceActionExportRestrictions.ts        |   5 -
 tests/actions/ReportPreviewActionUtilsTest.ts | 174 ++++++
 .../ReportPrimaryActionUtilsTest.ts           | 155 ++++-
 tests/unit/ReportSecondaryActionUtilsTest.ts  | 207 +++++--
 22 files changed, 1495 insertions(+), 734 deletions(-)
 create mode 100644 src/libs/ReportPreviewActionUtils.ts
 create mode 100644 tests/actions/ReportPreviewActionUtilsTest.ts
 rename tests/{actions => unit}/ReportPrimaryActionUtilsTest.ts (55%)

diff --git a/src/CONST.ts b/src/CONST.ts
index 66b354d24f69f..1b75c84196331 100755
--- a/src/CONST.ts
+++ b/src/CONST.ts
@@ -1160,10 +1160,27 @@ const CONST = {
             APPROVE: 'approve',
             PAY: 'pay',
             EXPORT_TO_ACCOUNTING: 'exportToAccounting',
+            REMOVE_HOLD: 'removeHold',
+            MARK_AS_CASH: 'markAsCash',
+        },
+        TRANSACTION_PRIMARY_ACTIONS: {
             REMOVE_HOLD: 'removeHold',
             REVIEW_DUPLICATES: 'reviewDuplicates',
             MARK_AS_CASH: 'markAsCash',
         },
+        REPORT_PREVIEW_ACTIONS: {
+            VIEW: 'view',
+            REVIEW: 'review',
+            SUBMIT: 'submit',
+            APPROVE: 'approve',
+            PAY: 'pay',
+            EXPORT_TO_ACCOUNTING: 'exportToAccounting',
+        },
+        TRANSACTION_SECONDARY_ACTIONS: {
+            HOLD: 'hold',
+            VIEW_DETAILS: 'viewDetails',
+            DELETE: 'delete',
+        },
         ACTIONS: {
             LIMIT: 50,
             // OldDot Actions render getMessage from Web-Expensify/lib/Report/Action PHP files via getMessageOfOldDotReportAction in ReportActionsUtils.ts
diff --git a/src/components/AvatarWithDisplayName.tsx b/src/components/AvatarWithDisplayName.tsx
index fb6eb080740bd..b1e735676d015 100644
--- a/src/components/AvatarWithDisplayName.tsx
+++ b/src/components/AvatarWithDisplayName.tsx
@@ -30,7 +30,6 @@ import ROUTES from '@src/ROUTES';
 import type {Policy, Report} from '@src/types/onyx';
 import type {Icon} from '@src/types/onyx/OnyxCommon';
 import {getButtonRole} from './Button/utils';
-import CaretWrapper from './CaretWrapper';
 import DisplayNames from './DisplayNames';
 import {FallbackAvatar} from './Icon/Expensicons';
 import MultipleAvatars from './MultipleAvatars';
@@ -155,16 +154,14 @@ function AvatarWithDisplayName({policy, report, isAnonymous = false, size = CONS
                         </View>
                     </PressableWithoutFeedback>
                     <View style={[styles.flex1, styles.flexColumn]}>
-                        <CaretWrapper>
-                            <DisplayNames
-                                fullTitle={title}
-                                displayNamesWithTooltips={displayNamesWithTooltips}
-                                tooltipEnabled
-                                numberOfLines={1}
-                                textStyles={[isAnonymous ? styles.headerAnonymousFooter : styles.headerText, styles.pre]}
-                                shouldUseFullTitle={isMoneyRequestOrReport || isAnonymous}
-                            />
-                        </CaretWrapper>
+                        <DisplayNames
+                            fullTitle={title}
+                            displayNamesWithTooltips={displayNamesWithTooltips}
+                            tooltipEnabled
+                            numberOfLines={1}
+                            textStyles={[isAnonymous ? styles.headerAnonymousFooter : styles.headerText, styles.pre]}
+                            shouldUseFullTitle={isMoneyRequestOrReport || isAnonymous}
+                        />
                         {Object.keys(parentNavigationSubtitleData).length > 0 && (
                             <ParentNavigationSubtitle
                                 parentNavigationSubtitleData={parentNavigationSubtitleData}
diff --git a/src/components/MoneyReportHeader.tsx b/src/components/MoneyReportHeader.tsx
index f61c566818515..203e2bc5cc989 100644
--- a/src/components/MoneyReportHeader.tsx
+++ b/src/components/MoneyReportHeader.tsx
@@ -1,26 +1,30 @@
 import {useRoute} from '@react-navigation/native';
-import React, {useCallback, useEffect, useMemo, useRef, useState} from 'react';
+import React, {useCallback, useEffect, useMemo, useState} from 'react';
 import {View} from 'react-native';
 import type {OnyxEntry} from 'react-native-onyx';
 import {useOnyx} from 'react-native-onyx';
+import type {ValueOf} from 'type-fest';
 import useLocalize from '@hooks/useLocalize';
 import useNetwork from '@hooks/useNetwork';
 import usePaymentAnimations from '@hooks/usePaymentAnimations';
 import useResponsiveLayout from '@hooks/useResponsiveLayout';
 import useTheme from '@hooks/useTheme';
 import useThemeStyles from '@hooks/useThemeStyles';
-import {exportReportToCSV} from '@libs/actions/Report';
+import {exportReportToCSV, exportToIntegration, markAsManuallyExported} from '@libs/actions/Report';
 import {convertToDisplayString} from '@libs/CurrencyUtils';
 import Navigation from '@libs/Navigation/Navigation';
 import {buildOptimisticNextStepForPreventSelfApprovalsEnabled} from '@libs/NextStepUtils';
 import {getConnectedIntegration} from '@libs/PolicyUtils';
-import {getIOUActionForTransactionID, getOriginalMessage, isDeletedAction, isMoneyRequestAction, isTrackExpenseAction} from '@libs/ReportActionsUtils';
+import {getIOUActionForTransactionID, getOriginalMessage, getReportAction, isDeletedAction, isMoneyRequestAction} from '@libs/ReportActionsUtils';
+import {getReportPrimaryAction} from '@libs/ReportPrimaryActionUtils';
+import {getSecondaryReportActions} from '@libs/ReportSecondaryActionUtils';
 import {
-    canBeExported,
     canDeleteCardTransactionByLiabilityType,
     canDeleteTransaction,
+    changeMoneyRequestHoldStatus,
     getArchiveReason,
     getBankAccountRoute,
+    getIntegrationIcon,
     getMoneyRequestSpendBreakdown,
     getNonHeldAndFullAmount,
     getTransactionsWithReceipts,
@@ -28,42 +32,38 @@ import {
     hasOnlyHeldExpenses as hasOnlyHeldExpensesReportUtils,
     hasUpdatedTotal,
     isAllowedToApproveExpenseReport,
-    isAllowedToSubmitDraftExpenseReport,
     isArchivedReportWithID,
+    isExported as isExportedUtils,
     isInvoiceReport,
     isProcessingReport,
-    isReportApproved,
     isReportOwner,
-    isWaitingForSubmissionFromCurrentUser as isWaitingForSubmissionFromCurrentUserReportUtils,
-    navigateBackOnDeleteTransaction,
+    navigateToDetailsPage,
     reportTransactionsSelector,
 } from '@libs/ReportUtils';
 import {
     allHavePendingRTERViolation,
-    checkIfShouldShowMarkAsCashButton,
     getTransaction,
     hasDuplicateTransactions,
-    isDuplicate as isDuplicateTransactionUtils,
     isExpensifyCardTransaction,
     isOnHold as isOnHoldTransactionUtils,
     isPayAtEndExpense as isPayAtEndExpenseTransactionUtils,
     isPending,
     isReceiptBeingScanned,
     shouldShowBrokenConnectionViolationForMultipleTransactions,
-    shouldShowRTERViolationMessage,
 } from '@libs/TransactionUtils';
 import variables from '@styles/variables';
 import {
     approveMoneyRequest,
     canApproveIOU,
+    cancelPayment,
     canIOUBePaid as canIOUBePaidAction,
-    canSubmitReport,
     deleteMoneyRequest,
-    deleteTrackExpense,
+    getNavigationUrlOnMoneyRequestDelete,
     getNextApproverAccountID,
     payInvoice,
     payMoneyRequest,
     submitReport,
+    unapproveExpenseReport,
     unholdRequest,
 } from '@userActions/IOU';
 import {markAsCash as markAsCashAction} from '@userActions/Transaction';
@@ -80,6 +80,7 @@ import isLoadingOnyxValue from '@src/types/utils/isLoadingOnyxValue';
 import BrokenConnectionDescription from './BrokenConnectionDescription';
 import Button from './Button';
 import ButtonWithDropdownMenu from './ButtonWithDropdownMenu';
+import type {DropdownOption} from './ButtonWithDropdownMenu/types';
 import ConfirmModal from './ConfirmModal';
 import DecisionModal from './DecisionModal';
 import DelegateNoAccessModal from './DelegateNoAccessModal';
@@ -94,7 +95,6 @@ import MoneyRequestHeaderStatusBar from './MoneyRequestHeaderStatusBar';
 import {useMoneyRequestReportContext} from './MoneyRequestReportView/MoneyRequestReportContext';
 import type {ActionHandledType} from './ProcessMoneyReportHoldMenu';
 import ProcessMoneyReportHoldMenu from './ProcessMoneyReportHoldMenu';
-import ExportWithDropdownMenu from './ReportActionItem/ExportWithDropdownMenu';
 import AnimatedSettlementButton from './SettlementButton/AnimatedSettlementButton';
 
 type MoneyReportHeaderProps = {
@@ -128,43 +128,42 @@ function MoneyReportHeader({policy, report: moneyRequestReport, transactionThrea
     // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
     const [nextStep] = useOnyx(`${ONYXKEYS.COLLECTION.NEXT_STEP}${moneyRequestReport?.reportID || CONST.DEFAULT_NUMBER_ID}`);
     const [transactionThreadReport] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${transactionThreadReportID}`);
-    const [session] = useOnyx(ONYXKEYS.SESSION);
     const requestParentReportAction = useMemo(() => {
         if (!reportActions || !transactionThreadReport?.parentReportActionID) {
             return null;
         }
         return reportActions.find((action): action is OnyxTypes.ReportAction<typeof CONST.REPORT.ACTIONS.TYPE.IOU> => action.reportActionID === transactionThreadReport.parentReportActionID);
     }, [reportActions, transactionThreadReport?.parentReportActionID]);
-    const [transactions] = useOnyx(ONYXKEYS.COLLECTION.TRANSACTION, {
+    const [transactions = []] = useOnyx(ONYXKEYS.COLLECTION.TRANSACTION, {
         selector: (_transactions) => reportTransactionsSelector(_transactions, moneyRequestReport?.reportID),
         initialValue: [],
     });
     const [transaction] = useOnyx(`${ONYXKEYS.COLLECTION.TRANSACTION}${isMoneyRequestAction(requestParentReportAction) && getOriginalMessage(requestParentReportAction)?.IOUTransactionID}`);
     const [dismissedHoldUseExplanation, dismissedHoldUseExplanationResult] = useOnyx(ONYXKEYS.NVP_DISMISSED_HOLD_USE_EXPLANATION, {initialValue: true});
     const isLoadingHoldUseExplained = isLoadingOnyxValue(dismissedHoldUseExplanationResult);
+    const [session] = useOnyx(ONYXKEYS.SESSION);
+
+    const isExported = isExportedUtils(reportActions);
+    const [markAsExportedModalVisible, setMarkAsExportedModalVisible] = useState(false);
 
-    const {isPaidAnimationRunning, isApprovedAnimationRunning, stopAnimation, startAnimation, startApprovedAnimation} = usePaymentAnimations();
+    const [downloadErrorModalVisible, setDownloadErrorModalVisible] = useState(false);
+    const [isCancelPaymentModalVisible, setIsCancelPaymentModalVisible] = useState(false);
+    const [isDeleteModalVisible, setIsDeleteModalVisible] = useState(false);
+
+    const {isPaidAnimationRunning, isApprovedAnimationRunning, startAnimation, stopAnimation, startApprovedAnimation} = usePaymentAnimations();
     const styles = useThemeStyles();
     const theme = useTheme();
-    const [isDeleteRequestModalVisible, setIsDeleteRequestModalVisible] = useState(false);
     const {translate} = useLocalize();
     const {isOffline} = useNetwork();
     const {reimbursableSpend} = getMoneyRequestSpendBreakdown(moneyRequestReport);
     const isOnHold = isOnHoldTransactionUtils(transaction);
-    const isDeletedParentAction = !!requestParentReportAction && isDeletedAction(requestParentReportAction);
-    const isDuplicate = isDuplicateTransactionUtils(transaction?.transactionID) && (!isReportApproved({report: moneyRequestReport}) || isApprovedAnimationRunning);
 
-    // Only the requestor can delete the request, admins can only edit it.
-    const isActionOwner =
-        typeof requestParentReportAction?.actorAccountID === 'number' && typeof session?.accountID === 'number' && requestParentReportAction.actorAccountID === session?.accountID;
-    const canDeleteRequest = isActionOwner && canDeleteTransaction(moneyRequestReport) && !isDeletedParentAction;
     const [isHoldMenuVisible, setIsHoldMenuVisible] = useState(false);
     const [paymentType, setPaymentType] = useState<PaymentMethodType>();
     const [requestType, setRequestType] = useState<ActionHandledType>();
     const canAllowSettlement = hasUpdatedTotal(moneyRequestReport, policy);
     const policyType = policy?.type;
     const connectedIntegration = getConnectedIntegration(policy);
-    const navigateBackToAfterDelete = useRef<Route>();
     const hasScanningReceipt = getTransactionsWithReceipts(moneyRequestReport?.reportID).some((t) => isReceiptBeingScanned(t));
     const hasOnlyPendingTransactions = useMemo(() => {
         return !!transactions && transactions.length > 0 && transactions.every((t) => isExpensifyCardTransaction(t) && isPending(t));
@@ -290,12 +289,8 @@ function MoneyReportHeader({policy, report: moneyRequestReport, transactionThrea
     const shouldShowSelectedTransactionsButton = !!selectedTransactionsOptions.length;
 
     const canIOUBePaid = useMemo(() => getCanIOUBePaid(), [getCanIOUBePaid]);
-    const canIOUBePaidAndApproved = useMemo(() => getCanIOUBePaid(false, false), [getCanIOUBePaid]);
     const onlyShowPayElsewhere = useMemo(() => !canIOUBePaid && getCanIOUBePaid(true), [canIOUBePaid, getCanIOUBePaid]);
 
-    const shouldShowMarkAsCashButton =
-        !!transactionThreadReportID && checkIfShouldShowMarkAsCashButton(hasAllPendingRTERViolations, shouldShowBrokenConnectionViolation, moneyRequestReport, policy);
-
     const shouldShowPayButton = isPaidAnimationRunning || canIOUBePaid || onlyShowPayElsewhere;
 
     const shouldShowApproveButton = useMemo(
@@ -305,22 +300,6 @@ function MoneyReportHeader({policy, report: moneyRequestReport, transactionThrea
 
     const shouldDisableApproveButton = shouldShowApproveButton && !isAllowedToApproveExpenseReport(moneyRequestReport);
 
-    const isAdmin = policy?.role === CONST.POLICY.ROLE.ADMIN;
-
-    const filteredTransactions = transactions?.filter((t) => t) ?? [];
-    const shouldShowSubmitButton = canSubmitReport(moneyRequestReport, policy, filteredTransactions, violations);
-
-    const shouldShowExportIntegrationButton = !shouldShowPayButton && !shouldShowSubmitButton && connectedIntegration && isAdmin && canBeExported(moneyRequestReport);
-
-    const shouldShowSettlementButton =
-        !shouldShowSelectedTransactionsButton &&
-        !shouldShowSubmitButton &&
-        (shouldShowPayButton || shouldShowApproveButton) &&
-        !shouldShowRTERViolationMessage(transactions) &&
-        !shouldShowExportIntegrationButton &&
-        !shouldShowBrokenConnectionViolation;
-
-    const shouldDisableSubmitButton = shouldShowSubmitButton && !isAllowedToSubmitDraftExpenseReport(moneyRequestReport);
     const isFromPaidPolicy = policyType === CONST.POLICY.TYPE.TEAM || policyType === CONST.POLICY.TYPE.CORPORATE;
 
     const hasDuplicates = hasDuplicateTransactions(moneyRequestReport?.reportID);
@@ -335,21 +314,11 @@ function MoneyReportHeader({policy, report: moneyRequestReport, transactionThrea
     const optimisticNextStep = isSubmitterSameAsNextApprover && policy?.preventSelfApproval ? buildOptimisticNextStepForPreventSelfApprovalsEnabled() : nextStep;
 
     const shouldShowNextStep = isFromPaidPolicy && !!optimisticNextStep?.message?.length && !shouldShowStatusBar;
-    const shouldShowAnyButton =
-        shouldShowSelectedTransactionsButton ||
-        isDuplicate ||
-        shouldShowSettlementButton ||
-        shouldShowApproveButton ||
-        shouldShowSubmitButton ||
-        shouldShowNextStep ||
-        shouldShowMarkAsCashButton ||
-        shouldShowExportIntegrationButton;
     const bankAccountRoute = getBankAccountRoute(chatReport);
     const formattedAmount = convertToDisplayString(reimbursableSpend, moneyRequestReport?.currency);
     const {nonHeldAmount, fullAmount, hasValidNonHeldAmount} = getNonHeldAndFullAmount(moneyRequestReport, shouldShowPayButton);
     const isAnyTransactionOnHold = hasHeldExpensesReportUtils(moneyRequestReport?.reportID);
     const displayedAmount = isAnyTransactionOnHold && canAllowSettlement && hasValidNonHeldAmount ? nonHeldAmount : formattedAmount;
-    const isMoreContentShown = shouldShowNextStep || shouldShowStatusBar || (shouldShowAnyButton && shouldUseNarrowLayout);
     const {isDelegateAccessRestricted} = useDelegateUserDetails();
     const [isNoDelegateAccessMenuVisible, setIsNoDelegateAccessMenuVisible] = useState(false);
     const [isLoadingReportData] = useOnyx(ONYXKEYS.IS_LOADING_REPORT_DATA);
@@ -391,19 +360,6 @@ function MoneyReportHeader({policy, report: moneyRequestReport, transactionThrea
         }
     };
 
-    const deleteTransaction = useCallback(() => {
-        if (requestParentReportAction) {
-            const iouTransactionID = isMoneyRequestAction(requestParentReportAction) ? getOriginalMessage(requestParentReportAction)?.IOUTransactionID : undefined;
-            if (isTrackExpenseAction(requestParentReportAction)) {
-                navigateBackToAfterDelete.current = deleteTrackExpense(moneyRequestReport?.reportID, iouTransactionID, requestParentReportAction, true);
-            } else {
-                navigateBackToAfterDelete.current = deleteMoneyRequest(iouTransactionID, requestParentReportAction, true);
-            }
-        }
-
-        setIsDeleteRequestModalVisible(false);
-    }, [moneyRequestReport?.reportID, requestParentReportAction, setIsDeleteRequestModalVisible]);
-
     const markAsCash = useCallback(() => {
         if (!requestParentReportAction) {
             return;
@@ -417,6 +373,14 @@ function MoneyReportHeader({policy, report: moneyRequestReport, transactionThrea
         markAsCashAction(iouTransactionID, reportID);
     }, [requestParentReportAction, transactionThreadReport?.reportID]);
 
+    const confirmManualExport = useCallback(() => {
+        if (!connectedIntegration || !moneyRequestReport) {
+            throw new Error('Missing data');
+        }
+
+        markAsManuallyExported(moneyRequestReport.reportID, connectedIntegration);
+    }, [connectedIntegration, moneyRequestReport]);
+
     const getStatusIcon: (src: IconAsset) => React.ReactNode = (src) => (
         <Icon
             src={src}
@@ -467,18 +431,7 @@ function MoneyReportHeader({policy, report: moneyRequestReport, transactionThrea
     };
 
     const statusBarProps = getStatusBarProps();
-    const shouldAddGapToContents =
-        shouldUseNarrowLayout &&
-        (isDuplicate || shouldShowSettlementButton || !!shouldShowExportIntegrationButton || shouldShowSubmitButton || shouldShowMarkAsCashButton) &&
-        (!!statusBarProps || shouldShowNextStep);
-
-    // The submit button should be success green colour only if the user is the submitter and the policy does not have Scheduled Submit turned on
-    const isWaitingForSubmissionFromCurrentUser = useMemo(() => isWaitingForSubmissionFromCurrentUserReportUtils(chatReport, policy), [chatReport, policy]);
-
-    const shouldDuplicateButtonBeSuccess = useMemo(
-        () => isDuplicate && !shouldShowSettlementButton && !shouldShowExportIntegrationButton && !shouldShowSubmitButton && !shouldShowMarkAsCashButton,
-        [isDuplicate, shouldShowSettlementButton, shouldShowExportIntegrationButton, shouldShowSubmitButton, shouldShowMarkAsCashButton],
-    );
+    const shouldAddGapToContents = shouldUseNarrowLayout && (!!statusBarProps || shouldShowNextStep);
 
     useEffect(() => {
         // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
@@ -488,21 +441,238 @@ function MoneyReportHeader({policy, report: moneyRequestReport, transactionThrea
         Navigation.navigate(ROUTES.PROCESS_MONEY_REQUEST_HOLD.getRoute(Navigation.getReportRHPActiveRoute()));
     }, [dismissedHoldUseExplanation, isLoadingHoldUseExplained, isOnHold]);
 
-    useEffect(() => {
-        if (canDeleteRequest) {
-            return;
+    const primaryAction = useMemo(() => {
+        // It's necessary to allow payment animation to finish before button is changed
+        if (isPaidAnimationRunning) {
+            return CONST.REPORT.PRIMARY_ACTIONS.PAY;
+        }
+        if (!moneyRequestReport) {
+            return '';
+        }
+        return getReportPrimaryAction(moneyRequestReport, transactions, violations, policy);
+    }, [isPaidAnimationRunning, moneyRequestReport, policy, transactions, violations]);
+
+    const primaryActionsImplementation = {
+        [CONST.REPORT.PRIMARY_ACTIONS.SUBMIT]: (
+            <Button
+                success
+                text={translate('common.submit')}
+                onPress={() => {
+                    if (!moneyRequestReport) {
+                        return;
+                    }
+                    submitReport(moneyRequestReport);
+                }}
+            />
+        ),
+        [CONST.REPORT.PRIMARY_ACTIONS.APPROVE]: (
+            <Button
+                success
+                onPress={confirmApproval}
+                text={translate('iou.approve')}
+            />
+        ),
+        [CONST.REPORT.PRIMARY_ACTIONS.PAY]: (
+            <AnimatedSettlementButton
+                isPaidAnimationRunning={isPaidAnimationRunning}
+                isApprovedAnimationRunning={isApprovedAnimationRunning}
+                onAnimationFinish={stopAnimation}
+                canIOUBePaid
+                onlyShowPayElsewhere={onlyShowPayElsewhere}
+                currency={moneyRequestReport?.currency}
+                confirmApproval={confirmApproval}
+                policyID={moneyRequestReport?.policyID}
+                chatReportID={chatReport?.reportID}
+                iouReport={moneyRequestReport}
+                onPress={confirmPayment}
+                enablePaymentsRoute={ROUTES.ENABLE_PAYMENTS}
+                addBankAccountRoute={bankAccountRoute}
+                shouldHidePaymentOptions={!shouldShowPayButton}
+                shouldShowApproveButton={shouldShowApproveButton}
+                shouldDisableApproveButton={shouldDisableApproveButton}
+                formattedAmount={!hasOnlyHeldExpenses ? displayedAmount : ''}
+                isDisabled={isOffline && !canAllowSettlement}
+                isLoading={!isOffline && !canAllowSettlement}
+            />
+        ),
+        [CONST.REPORT.PRIMARY_ACTIONS.EXPORT_TO_ACCOUNTING]: (
+            <Button
+                success
+                // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+                text={translate('workspace.common.exportIntegrationSelected', {connectionName: connectedIntegration!})}
+                onPress={() => {
+                    if (!connectedIntegration || !moneyRequestReport) {
+                        return;
+                    }
+                    exportToIntegration(moneyRequestReport.reportID, connectedIntegration);
+                }}
+            />
+        ),
+        [CONST.REPORT.PRIMARY_ACTIONS.REMOVE_HOLD]: (
+            <Button
+                success
+                text={translate('iou.unhold')}
+                onPress={() => {
+                    const parentReportAction = getReportAction(moneyRequestReport?.parentReportID, moneyRequestReport?.parentReportActionID);
+
+                    const moneyRequestAction = transactionThreadReportID ? requestParentReportAction : parentReportAction;
+                    if (!moneyRequestAction) {
+                        return;
+                    }
+
+                    changeMoneyRequestHoldStatus(moneyRequestAction);
+                }}
+            />
+        ),
+        [CONST.REPORT.PRIMARY_ACTIONS.MARK_AS_CASH]: (
+            <Button
+                success
+                text={translate('iou.markAsCash')}
+                onPress={markAsCash}
+            />
+        ),
+    };
+
+    const secondaryActions = useMemo(() => {
+        if (!moneyRequestReport) {
+            return [];
         }
+        return getSecondaryReportActions(moneyRequestReport, transactions, violations, policy);
+    }, [moneyRequestReport, policy, transactions, violations]);
+
+    const secondaryActionsImplemenation: Record<ValueOf<typeof CONST.REPORT.SECONDARY_ACTIONS>, DropdownOption<ValueOf<typeof CONST.REPORT.SECONDARY_ACTIONS>>> = {
+        [CONST.REPORT.SECONDARY_ACTIONS.VIEW_DETAILS]: {
+            value: CONST.REPORT.SECONDARY_ACTIONS.VIEW_DETAILS,
+            text: translate('iou.viewDetails'),
+            icon: Expensicons.Info,
+            onSelected: () => {
+                navigateToDetailsPage(moneyRequestReport, Navigation.getReportRHPActiveRoute());
+            },
+        },
+        [CONST.REPORT.SECONDARY_ACTIONS.DOWNLOAD]: {
+            value: CONST.REPORT.SECONDARY_ACTIONS.DOWNLOAD,
+            text: translate('common.download'),
+            icon: Expensicons.Download,
+            onSelected: () => {
+                if (!moneyRequestReport) {
+                    return;
+                }
+                exportReportToCSV({reportID: moneyRequestReport.reportID, transactionIDList: transactionIDs}, () => {
+                    setDownloadErrorModalVisible(true);
+                });
+            },
+        },
+        [CONST.REPORT.SECONDARY_ACTIONS.SUBMIT]: {
+            value: CONST.REPORT.SECONDARY_ACTIONS.SUBMIT,
+            text: translate('common.submit'),
+            icon: Expensicons.Send,
+            onSelected: () => {
+                if (!moneyRequestReport) {
+                    return;
+                }
+                submitReport(moneyRequestReport);
+            },
+        },
+        [CONST.REPORT.SECONDARY_ACTIONS.APPROVE]: {
+            text: translate('iou.approve'),
+            icon: Expensicons.ThumbsUp,
+            value: CONST.REPORT.SECONDARY_ACTIONS.APPROVE,
+            onSelected: () => {
+                if (!moneyRequestReport) {
+                    return;
+                }
+                approveMoneyRequest(moneyRequestReport);
+            },
+        },
+        [CONST.REPORT.SECONDARY_ACTIONS.UNAPPROVE]: {
+            text: translate('iou.unapprove'),
+            icon: Expensicons.CircularArrowBackwards,
+            value: CONST.REPORT.SECONDARY_ACTIONS.UNAPPROVE,
+            onSelected: () => {
+                if (isDelegateAccessRestricted) {
+                    setIsNoDelegateAccessMenuVisible(true);
+                    return;
+                }
+
+                unapproveExpenseReport(moneyRequestReport);
+            },
+        },
+        [CONST.REPORT.SECONDARY_ACTIONS.CANCEL_PAYMENT]: {
+            text: translate('iou.cancelPayment'),
+            icon: Expensicons.Clear,
+            value: CONST.REPORT.SECONDARY_ACTIONS.CANCEL_PAYMENT,
+            onSelected: () => {
+                setIsCancelPaymentModalVisible(true);
+            },
+        },
+        [CONST.REPORT.SECONDARY_ACTIONS.EXPORT_TO_ACCOUNTING]: {
+            // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+            text: translate('workspace.common.exportIntegrationSelected', {connectionName: connectedIntegration!}),
+            icon: getIntegrationIcon(connectedIntegration),
+            value: CONST.REPORT.SECONDARY_ACTIONS.EXPORT_TO_ACCOUNTING,
+            onSelected: () => {
+                if (!connectedIntegration || !moneyRequestReport) {
+                    throw new Error('Missing data');
+                }
+
+                exportToIntegration(moneyRequestReport.reportID, connectedIntegration);
+            },
+        },
+        [CONST.REPORT.SECONDARY_ACTIONS.MARK_AS_EXPORTED]: {
+            text: translate('workspace.common.markAsExported'),
+            icon: Expensicons.CheckCircle,
+            value: CONST.REPORT.SECONDARY_ACTIONS.MARK_AS_EXPORTED,
+            onSelected: () => {
+                if (isExported) {
+                    setMarkAsExportedModalVisible(true);
+                    return;
+                }
+                confirmManualExport();
+            },
+        },
+        [CONST.REPORT.SECONDARY_ACTIONS.HOLD]: {
+            text: translate('iou.hold'),
+            icon: Expensicons.Stopwatch,
+            value: CONST.REPORT.SECONDARY_ACTIONS.HOLD,
+            onSelected: () => {
+                if (!requestParentReportAction) {
+                    throw new Error('Parent action does not exist');
+                }
 
-        setIsDeleteRequestModalVisible(false);
-    }, [canDeleteRequest]);
+                changeMoneyRequestHoldStatus(requestParentReportAction);
+            },
+        },
+        [CONST.REPORT.SECONDARY_ACTIONS.CHANGE_WORKSPACE]: {
+            text: translate('iou.changeWorkspace'),
+            icon: Expensicons.Buildings,
+            value: CONST.REPORT.SECONDARY_ACTIONS.CHANGE_WORKSPACE,
+            onSelected: () => {
+                if (!moneyRequestReport) {
+                    return;
+                }
+                Navigation.navigate(ROUTES.REPORT_WITH_ID_CHANGE_WORKSPACE.getRoute(moneyRequestReport.reportID));
+            },
+        },
+        [CONST.REPORT.SECONDARY_ACTIONS.DELETE]: {
+            text: translate('common.delete'),
+            icon: Expensicons.Trashcan,
+            value: CONST.REPORT.SECONDARY_ACTIONS.DELETE,
+            onSelected: () => {
+                setIsDeleteModalVisible(true);
+            },
+        },
+    };
+
+    const applicableSecondaryActions = secondaryActions.map((action) => secondaryActionsImplemenation[action]);
 
     const shouldShowBackButton = shouldDisplayBackButton || shouldUseNarrowLayout;
 
+    const isMoreContentShown = shouldShowNextStep || !!statusBarProps;
+
     return (
         <View style={[styles.pt0, styles.borderBottom]}>
             <HeaderWithBackButton
                 shouldShowReportAvatarWithDisplay
-                shouldEnableDetailPageNavigation
                 shouldShowPinButton={false}
                 report={moneyRequestReport}
                 policy={policy}
@@ -510,88 +680,52 @@ function MoneyReportHeader({policy, report: moneyRequestReport, transactionThrea
                 shouldDisplaySearchRouter={shouldDisplaySearchRouter}
                 onBackButtonPress={onBackButtonPress}
                 shouldShowBorderBottom={false}
+                shouldEnableDetailPageNavigation
             >
-                {shouldShowSelectedTransactionsButton && !shouldUseNarrowLayout && (
-                    <View>
-                        <ButtonWithDropdownMenu
-                            onPress={() => null}
-                            options={selectedTransactionsOptions}
-                            customText={translate('workspace.common.selected', {count: selectedTransactionsID.length})}
-                            isSplitButton={false}
-                            shouldAlwaysShowDropdownMenu
-                        />
-                    </View>
-                )}
-                {!shouldShowSelectedTransactionsButton && isDuplicate && !shouldUseNarrowLayout && (
-                    <View style={[shouldDuplicateButtonBeSuccess ? styles.ml2 : styles.mh2]}>
-                        <Button
-                            success={shouldDuplicateButtonBeSuccess}
-                            text={translate('iou.reviewDuplicates')}
-                            style={styles.p0}
-                            onPress={() => {
-                                Navigation.navigate(ROUTES.TRANSACTION_DUPLICATE_REVIEW_PAGE.getRoute(transactionThreadReportID, Navigation.getReportRHPActiveRoute()));
-                            }}
-                        />
-                    </View>
-                )}
-                {!shouldShowSelectedTransactionsButton && shouldShowSettlementButton && !shouldUseNarrowLayout && (
-                    <View style={styles.pv2}>
-                        <AnimatedSettlementButton
-                            isPaidAnimationRunning={isPaidAnimationRunning}
-                            isApprovedAnimationRunning={isApprovedAnimationRunning}
-                            onAnimationFinish={stopAnimation}
-                            canIOUBePaid={canIOUBePaidAndApproved || isPaidAnimationRunning}
-                            onlyShowPayElsewhere={onlyShowPayElsewhere}
-                            currency={moneyRequestReport?.currency}
-                            confirmApproval={confirmApproval}
-                            policyID={moneyRequestReport?.policyID}
-                            chatReportID={chatReport?.reportID}
-                            iouReport={moneyRequestReport}
-                            onPress={confirmPayment}
-                            enablePaymentsRoute={ROUTES.ENABLE_PAYMENTS}
-                            addBankAccountRoute={bankAccountRoute}
-                            shouldHidePaymentOptions={!shouldShowPayButton}
-                            shouldShowApproveButton={shouldShowApproveButton}
-                            shouldDisableApproveButton={shouldDisableApproveButton}
-                            style={[styles.pv2]}
-                            formattedAmount={!hasOnlyHeldExpenses ? displayedAmount : ''}
-                            isDisabled={isOffline && !canAllowSettlement}
-                            isLoading={!isOffline && !canAllowSettlement}
-                        />
-                    </View>
-                )}
-                {!shouldShowSelectedTransactionsButton && !!shouldShowExportIntegrationButton && !shouldUseNarrowLayout && (
-                    <View style={[styles.pv2]}>
-                        <ExportWithDropdownMenu
-                            policy={policy}
-                            report={moneyRequestReport}
-                            connectionName={connectedIntegration}
-                        />
-                    </View>
-                )}
-                {!shouldShowSelectedTransactionsButton && !!moneyRequestReport && shouldShowSubmitButton && !shouldUseNarrowLayout && (
-                    <View style={styles.pv2}>
-                        <Button
-                            success={isWaitingForSubmissionFromCurrentUser}
-                            text={translate('common.submit')}
-                            style={[styles.mnw120, styles.pv2, styles.pr0]}
-                            onPress={() => submitReport(moneyRequestReport)}
-                            isDisabled={shouldDisableSubmitButton}
-                        />
-                    </View>
-                )}
-                {!shouldShowSelectedTransactionsButton && shouldShowMarkAsCashButton && !shouldUseNarrowLayout && (
-                    <View style={[styles.pv2]}>
-                        <Button
-                            success
-                            text={translate('iou.markAsCash')}
-                            style={[styles.pv2, styles.pr0]}
-                            onPress={markAsCash}
-                        />
+                {!shouldUseNarrowLayout && (
+                    <View style={[styles.flexRow, styles.gap2]}>
+                        {!!primaryAction && !shouldShowSelectedTransactionsButton && primaryActionsImplementation[primaryAction]}
+                        {!!applicableSecondaryActions.length && !shouldShowSelectedTransactionsButton && (
+                            <ButtonWithDropdownMenu
+                                success={false}
+                                onPress={() => {}}
+                                shouldAlwaysShowDropdownMenu
+                                customText={translate('common.more')}
+                                options={applicableSecondaryActions}
+                                isSplitButton={false}
+                            />
+                        )}
+                        {shouldShowSelectedTransactionsButton && !shouldUseNarrowLayout && (
+                            <View>
+                                <ButtonWithDropdownMenu
+                                    onPress={() => null}
+                                    options={selectedTransactionsOptions}
+                                    customText={translate('workspace.common.selected', {count: selectedTransactionsID.length})}
+                                    isSplitButton={false}
+                                    shouldAlwaysShowDropdownMenu
+                                />
+                            </View>
+                        )}
                     </View>
                 )}
             </HeaderWithBackButton>
-            {!!isMoreContentShown && (
+            {shouldUseNarrowLayout && (
+                <View style={[styles.flexRow, styles.gap2, styles.pb3, styles.ph5, styles.w100, styles.alignItemsCenter, styles.justifyContentCenter]}>
+                    {!!primaryAction && !shouldShowSelectedTransactionsButton && <View style={[styles.flexGrow4]}>{primaryActionsImplementation[primaryAction]}</View>}
+                    {!!applicableSecondaryActions.length && !shouldShowSelectedTransactionsButton && (
+                        <ButtonWithDropdownMenu
+                            success={false}
+                            onPress={() => {}}
+                            shouldAlwaysShowDropdownMenu
+                            customText={translate('common.more')}
+                            options={applicableSecondaryActions}
+                            isSplitButton={false}
+                            wrapperStyle={[!primaryAction && styles.flexGrow4]}
+                        />
+                    )}
+                </View>
+            )}
+            {isMoreContentShown && (
                 <View style={[styles.dFlex, styles.flexColumn, shouldAddGapToContents && styles.gap3, styles.pb3, styles.ph5]}>
                     <View style={[styles.dFlex, styles.w100, styles.flexRow, styles.gap3]}>
                         {shouldShowSelectedTransactionsButton && shouldUseNarrowLayout && (
@@ -604,65 +738,6 @@ function MoneyReportHeader({policy, report: moneyRequestReport, transactionThrea
                                 wrapperStyle={styles.w100}
                             />
                         )}
-
-                        {!shouldShowSelectedTransactionsButton && isDuplicate && shouldUseNarrowLayout && (
-                            <Button
-                                success={shouldDuplicateButtonBeSuccess}
-                                text={translate('iou.reviewDuplicates')}
-                                style={[styles.flex1, styles.pr0]}
-                                onPress={() => {
-                                    Navigation.navigate(ROUTES.TRANSACTION_DUPLICATE_REVIEW_PAGE.getRoute(transactionThreadReportID, Navigation.getReportRHPActiveRoute()));
-                                }}
-                            />
-                        )}
-                        {!shouldShowSelectedTransactionsButton && shouldShowSettlementButton && shouldUseNarrowLayout && (
-                            <AnimatedSettlementButton
-                                isPaidAnimationRunning={isPaidAnimationRunning}
-                                isApprovedAnimationRunning={isApprovedAnimationRunning}
-                                onAnimationFinish={stopAnimation}
-                                canIOUBePaid={canIOUBePaidAndApproved || isPaidAnimationRunning}
-                                wrapperStyle={[styles.flex1]}
-                                onlyShowPayElsewhere={onlyShowPayElsewhere}
-                                currency={moneyRequestReport?.currency}
-                                confirmApproval={confirmApproval}
-                                policyID={moneyRequestReport?.policyID}
-                                chatReportID={moneyRequestReport?.chatReportID}
-                                iouReport={moneyRequestReport}
-                                onPress={confirmPayment}
-                                enablePaymentsRoute={ROUTES.ENABLE_PAYMENTS}
-                                addBankAccountRoute={bankAccountRoute}
-                                shouldHidePaymentOptions={!shouldShowPayButton}
-                                shouldShowApproveButton={shouldShowApproveButton}
-                                formattedAmount={!hasOnlyHeldExpenses ? displayedAmount : ''}
-                                shouldDisableApproveButton={shouldDisableApproveButton}
-                                isDisabled={isOffline && !canAllowSettlement}
-                                isLoading={!isOffline && !canAllowSettlement}
-                            />
-                        )}
-                        {!shouldShowSelectedTransactionsButton && !!shouldShowExportIntegrationButton && shouldUseNarrowLayout && (
-                            <ExportWithDropdownMenu
-                                policy={policy}
-                                report={moneyRequestReport}
-                                connectionName={connectedIntegration}
-                            />
-                        )}
-                        {!shouldShowSelectedTransactionsButton && !!moneyRequestReport && shouldShowSubmitButton && shouldUseNarrowLayout && (
-                            <Button
-                                success={isWaitingForSubmissionFromCurrentUser}
-                                text={translate('common.submit')}
-                                style={[styles.flex1, styles.pr0]}
-                                onPress={() => submitReport(moneyRequestReport)}
-                                isDisabled={shouldDisableSubmitButton}
-                            />
-                        )}
-                        {!shouldShowSelectedTransactionsButton && shouldShowMarkAsCashButton && shouldUseNarrowLayout && (
-                            <Button
-                                success
-                                text={translate('iou.markAsCash')}
-                                style={[styles.flex1, styles.pr0]}
-                                onPress={markAsCash}
-                            />
-                        )}
                     </View>
                     {shouldShowNextStep && <MoneyReportHeaderStatusBar nextStep={optimisticNextStep} />}
                     {!!statusBarProps && (
@@ -698,19 +773,71 @@ function MoneyReportHeader({policy, report: moneyRequestReport, transactionThrea
                 isNoDelegateAccessMenuVisible={isNoDelegateAccessMenuVisible}
                 onClose={() => setIsNoDelegateAccessMenuVisible(false)}
             />
-
+            <DecisionModal
+                title={translate('common.downloadFailedTitle')}
+                prompt={translate('common.downloadFailedDescription')}
+                isSmallScreenWidth={isSmallScreenWidth}
+                onSecondOptionSubmit={() => setDownloadErrorModalVisible(false)}
+                secondOptionText={translate('common.buttonConfirm')}
+                isVisible={downloadErrorModalVisible}
+                onClose={() => setDownloadErrorModalVisible(false)}
+            />
+            <ConfirmModal
+                title={translate('iou.cancelPayment')}
+                isVisible={isCancelPaymentModalVisible}
+                onConfirm={() => {
+                    if (!chatReport) {
+                        return;
+                    }
+                    cancelPayment(moneyRequestReport, chatReport);
+                    setIsCancelPaymentModalVisible(false);
+                }}
+                onCancel={() => setIsCancelPaymentModalVisible(false)}
+                prompt={translate('iou.cancelPaymentConfirmation')}
+                confirmText={translate('iou.cancelPayment')}
+                cancelText={translate('common.dismiss')}
+                danger
+                shouldEnableNewFocusManagement
+            />
             <ConfirmModal
                 title={translate('iou.deleteExpense', {count: 1})}
-                isVisible={isDeleteRequestModalVisible}
-                onConfirm={deleteTransaction}
-                onCancel={() => setIsDeleteRequestModalVisible(false)}
-                onModalHide={() => navigateBackOnDeleteTransaction(navigateBackToAfterDelete.current)}
+                isVisible={isDeleteModalVisible}
+                onConfirm={() => {
+                    setIsDeleteModalVisible(false);
+                    let goBackRoute: Route | undefined;
+                    if (transactionThreadReportID) {
+                        if (!requestParentReportAction || !transaction?.transactionID) {
+                            throw new Error('Missing data!');
+                        }
+                        // it's deleting transacation but not the report which leads to bug (that is actually also on staging)
+                        deleteMoneyRequest(transaction?.transactionID, requestParentReportAction);
+                        goBackRoute = getNavigationUrlOnMoneyRequestDelete(transaction.transactionID, requestParentReportAction, false);
+                    }
+
+                    if (goBackRoute) {
+                        Navigation.navigate(goBackRoute);
+                    }
+                }}
+                onCancel={() => setIsDeleteModalVisible(false)}
                 prompt={translate('iou.deleteConfirmation', {count: 1})}
                 confirmText={translate('common.delete')}
                 cancelText={translate('common.cancel')}
                 danger
                 shouldEnableNewFocusManagement
             />
+            <ConfirmModal
+                title={translate('workspace.exportAgainModal.title')}
+                onConfirm={() => {
+                    confirmManualExport();
+                    setMarkAsExportedModalVisible(false);
+                }}
+                onCancel={() => setMarkAsExportedModalVisible(false)}
+                // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+                prompt={translate('workspace.exportAgainModal.description', {connectionName: connectedIntegration!, reportName: moneyRequestReport?.reportName ?? ''})}
+                confirmText={translate('workspace.exportAgainModal.confirmText')}
+                cancelText={translate('workspace.exportAgainModal.cancelText')}
+                isVisible={markAsExportedModalVisible}
+            />
             <DecisionModal
                 title={translate('common.downloadFailedTitle')}
                 prompt={translate('common.downloadFailedDescription')}
diff --git a/src/components/MoneyRequestHeader.tsx b/src/components/MoneyRequestHeader.tsx
index c5a4f27777f06..c47ea3c2fb803 100644
--- a/src/components/MoneyRequestHeader.tsx
+++ b/src/components/MoneyRequestHeader.tsx
@@ -1,18 +1,22 @@
 import {useRoute} from '@react-navigation/native';
 import type {ReactNode} from 'react';
-import React, {useCallback, useEffect} from 'react';
+import React, {useCallback, useEffect, useMemo, useState} from 'react';
 import {View} from 'react-native';
 import type {OnyxEntry} from 'react-native-onyx';
 import {useOnyx} from 'react-native-onyx';
+import type {ValueOf} from 'type-fest';
 import useLocalize from '@hooks/useLocalize';
 import useResponsiveLayout from '@hooks/useResponsiveLayout';
 import useTheme from '@hooks/useTheme';
 import useThemeStyles from '@hooks/useThemeStyles';
 import useTransactionViolations from '@hooks/useTransactionViolations';
+import {deleteMoneyRequest, getNavigationUrlOnMoneyRequestDelete} from '@libs/actions/IOU';
 import Navigation from '@libs/Navigation/Navigation';
 import {getOriginalMessage, isMoneyRequestAction} from '@libs/ReportActionsUtils';
+import {getTransactionThreadPrimaryAction} from '@libs/ReportPrimaryActionUtils';
+import {getSecondaryTransactionThreadActions} from '@libs/ReportSecondaryActionUtils';
+import {changeMoneyRequestHoldStatus, navigateToDetailsPage} from '@libs/ReportUtils';
 import {
-    checkIfShouldShowMarkAsCashButton,
     hasPendingRTERViolation as hasPendingRTERViolationTransactionUtils,
     hasReceipt,
     isDuplicate as isDuplicateTransactionUtils,
@@ -33,6 +37,10 @@ import type IconAsset from '@src/types/utils/IconAsset';
 import isLoadingOnyxValue from '@src/types/utils/isLoadingOnyxValue';
 import BrokenConnectionDescription from './BrokenConnectionDescription';
 import Button from './Button';
+import ButtonWithDropdownMenu from './ButtonWithDropdownMenu';
+import type {DropdownOption} from './ButtonWithDropdownMenu/types';
+import ConfirmModal from './ConfirmModal';
+import DecisionModal from './DecisionModal';
 import HeaderWithBackButton from './HeaderWithBackButton';
 import Icon from './Icon';
 import * as Expensicons from './Icon/Expensicons';
@@ -68,6 +76,8 @@ function MoneyRequestHeader({report, parentReportAction, policy, onBackButtonPre
     );
     const transactionViolations = useTransactionViolations(transaction?.transactionID);
 
+    const [isDeleteModalVisible, setIsDeleteModalVisible] = useState(false);
+    const [downloadErrorModalVisible, setDownloadErrorModalVisible] = useState(false);
     const [dismissedHoldUseExplanation, dismissedHoldUseExplanationResult] = useOnyx(ONYXKEYS.NVP_DISMISSED_HOLD_USE_EXPLANATION, {initialValue: true});
     const [isLoadingReportData] = useOnyx(ONYXKEYS.IS_LOADING_REPORT_DATA);
     const isLoadingHoldUseExplained = isLoadingOnyxValue(dismissedHoldUseExplanationResult);
@@ -85,7 +95,6 @@ function MoneyRequestHeader({report, parentReportAction, policy, onBackButtonPre
     const hasPendingRTERViolation = hasPendingRTERViolationTransactionUtils(transactionViolations);
 
     const shouldShowBrokenConnectionViolation = shouldShowBrokenConnectionViolationTransactionUtils(parentReport, policy, transactionViolations);
-    const shouldShowMarkAsCashButton = checkIfShouldShowMarkAsCashButton(hasPendingRTERViolation, shouldShowBrokenConnectionViolation, parentReport, policy);
 
     const markAsCash = useCallback(() => {
         markAsCashAction(transaction?.transactionID, reportID);
@@ -144,12 +153,89 @@ function MoneyRequestHeader({report, parentReportAction, policy, onBackButtonPre
         Navigation.navigate(ROUTES.PROCESS_MONEY_REQUEST_HOLD.getRoute(Navigation.getReportRHPActiveRoute()));
     }, [dismissedHoldUseExplanation, isLoadingHoldUseExplained, isOnHold]);
 
+    const primaryAction = useMemo(() => {
+        if (!report || !parentReport || !transaction) {
+            return '';
+        }
+        return getTransactionThreadPrimaryAction(report, parentReport, transaction, transactionViolations, policy);
+    }, [parentReport, policy, report, transaction, transactionViolations]);
+
+    const primaryActionImplementation = {
+        [CONST.REPORT.TRANSACTION_PRIMARY_ACTIONS.REMOVE_HOLD]: (
+            <Button
+                success
+                text={translate('iou.unhold')}
+                onPress={() => {
+                    changeMoneyRequestHoldStatus(parentReportAction);
+                }}
+            />
+        ),
+        [CONST.REPORT.TRANSACTION_PRIMARY_ACTIONS.REVIEW_DUPLICATES]: (
+            <Button
+                success
+                text={translate('iou.reviewDuplicates')}
+                onPress={() => {
+                    if (!reportID) {
+                        return;
+                    }
+                    Navigation.navigate(ROUTES.TRANSACTION_DUPLICATE_REVIEW_PAGE.getRoute(reportID, Navigation.getReportRHPActiveRoute()));
+                }}
+            />
+        ),
+        [CONST.REPORT.TRANSACTION_PRIMARY_ACTIONS.MARK_AS_CASH]: (
+            <Button
+                success
+                text={translate('iou.markAsCash')}
+                onPress={markAsCash}
+            />
+        ),
+    };
+
+    const secondaryActions = useMemo(() => {
+        if (!parentReport || !transaction) {
+            return [];
+        }
+        return getSecondaryTransactionThreadActions(parentReport, transaction);
+    }, [parentReport, transaction]);
+
+    const secondaryActionsImplementation: Record<ValueOf<typeof CONST.REPORT.TRANSACTION_SECONDARY_ACTIONS>, DropdownOption<ValueOf<typeof CONST.REPORT.TRANSACTION_SECONDARY_ACTIONS>>> = {
+        [CONST.REPORT.TRANSACTION_SECONDARY_ACTIONS.HOLD]: {
+            text: translate('iou.hold'),
+            icon: Expensicons.Stopwatch,
+            value: CONST.REPORT.TRANSACTION_SECONDARY_ACTIONS.HOLD,
+            onSelected: () => {
+                if (!parentReportAction) {
+                    throw new Error('Parent action does not exist');
+                }
+
+                changeMoneyRequestHoldStatus(parentReportAction);
+            },
+        },
+        [CONST.REPORT.TRANSACTION_SECONDARY_ACTIONS.VIEW_DETAILS]: {
+            value: CONST.REPORT.SECONDARY_ACTIONS.VIEW_DETAILS,
+            text: translate('iou.viewDetails'),
+            icon: Expensicons.Info,
+            onSelected: () => {
+                navigateToDetailsPage(report, Navigation.getReportRHPActiveRoute());
+            },
+        },
+        [CONST.REPORT.TRANSACTION_SECONDARY_ACTIONS.DELETE]: {
+            text: translate('common.delete'),
+            icon: Expensicons.Trashcan,
+            value: CONST.REPORT.SECONDARY_ACTIONS.DELETE,
+            onSelected: () => {
+                setIsDeleteModalVisible(true);
+            },
+        },
+    };
+
+    const applicableSecondaryActions = secondaryActions.map((action) => secondaryActionsImplementation[action]);
+
     return (
         <View style={[styles.pl0, styles.borderBottom]}>
             <HeaderWithBackButton
                 shouldShowBorderBottom={false}
                 shouldShowReportAvatarWithDisplay
-                shouldEnableDetailPageNavigation
                 shouldShowPinButton={false}
                 report={
                     reportID
@@ -164,53 +250,39 @@ function MoneyRequestHeader({report, parentReportAction, policy, onBackButtonPre
                 shouldShowBackButton={shouldUseNarrowLayout}
                 shouldDisplaySearchRouter={shouldDisplaySearchRouter}
                 onBackButtonPress={onBackButtonPress}
+                shouldEnableDetailPageNavigation
             >
-                {shouldShowMarkAsCashButton && !shouldUseNarrowLayout && (
-                    <Button
-                        success
-                        text={translate('iou.markAsCash')}
-                        style={[styles.p0]}
-                        onPress={markAsCash}
-                    />
-                )}
-                {isDuplicate && !shouldUseNarrowLayout && (
-                    <Button
-                        success
-                        text={translate('iou.reviewDuplicates')}
-                        style={[styles.p0, styles.ml2]}
-                        onPress={() => {
-                            if (!reportID) {
-                                return;
-                            }
-                            Navigation.navigate(ROUTES.TRANSACTION_DUPLICATE_REVIEW_PAGE.getRoute(reportID, Navigation.getReportRHPActiveRoute()));
-                        }}
-                    />
+                {!shouldUseNarrowLayout && (
+                    <View style={[styles.flexRow, styles.gap2]}>
+                        {!!primaryAction && primaryActionImplementation[primaryAction]}
+                        {!!applicableSecondaryActions.length && (
+                            <ButtonWithDropdownMenu
+                                success={false}
+                                onPress={() => {}}
+                                shouldAlwaysShowDropdownMenu
+                                customText={translate('common.more')}
+                                options={applicableSecondaryActions}
+                                isSplitButton={false}
+                            />
+                        )}
+                    </View>
                 )}
                 {shouldDisplayTransactionNavigation && <MoneyRequestReportTransactionsNavigation currentReportID={reportID} />}
             </HeaderWithBackButton>
-            {shouldShowMarkAsCashButton && shouldUseNarrowLayout && (
-                <View style={[styles.ph5, styles.pb3]}>
-                    <Button
-                        success
-                        text={translate('iou.markAsCash')}
-                        style={[styles.w100, styles.pr0]}
-                        onPress={markAsCash}
-                    />
-                </View>
-            )}
-            {isDuplicate && shouldUseNarrowLayout && (
-                <View style={[styles.ph5, styles.pb3]}>
-                    <Button
-                        success
-                        text={translate('iou.reviewDuplicates')}
-                        style={[styles.w100, styles.pr0]}
-                        onPress={() => {
-                            if (!reportID) {
-                                return;
-                            }
-                            Navigation.navigate(ROUTES.TRANSACTION_DUPLICATE_REVIEW_PAGE.getRoute(reportID, Navigation.getReportRHPActiveRoute()));
-                        }}
-                    />
+            {shouldUseNarrowLayout && (
+                <View style={[styles.flexRow, styles.gap2, styles.pb3, styles.ph5, styles.w100, styles.alignItemsCenter, styles.justifyContentCenter]}>
+                    {!!primaryAction && <View style={[styles.flexGrow4]}>{primaryActionImplementation[primaryAction]}</View>}
+                    {!!applicableSecondaryActions.length && (
+                        <ButtonWithDropdownMenu
+                            success={false}
+                            onPress={() => {}}
+                            shouldAlwaysShowDropdownMenu
+                            customText={translate('common.more')}
+                            options={applicableSecondaryActions}
+                            isSplitButton={false}
+                            wrapperStyle={[!primaryAction && styles.flexGrow4]}
+                        />
+                    )}
                 </View>
             )}
             {!!statusBarProps && (
@@ -222,6 +294,38 @@ function MoneyRequestHeader({report, parentReportAction, policy, onBackButtonPre
                 </View>
             )}
             <LoadingBar shouldShow={(isLoadingReportData && shouldUseNarrowLayout) ?? false} />
+            <DecisionModal
+                title={translate('common.downloadFailedTitle')}
+                prompt={translate('common.downloadFailedDescription')}
+                isSmallScreenWidth={isSmallScreenWidth}
+                onSecondOptionSubmit={() => setDownloadErrorModalVisible(false)}
+                secondOptionText={translate('common.buttonConfirm')}
+                isVisible={downloadErrorModalVisible}
+                onClose={() => setDownloadErrorModalVisible(false)}
+            />
+            <ConfirmModal
+                title={translate('iou.deleteExpense', {count: 1})}
+                isVisible={isDeleteModalVisible}
+                onConfirm={() => {
+                    setIsDeleteModalVisible(false);
+                    if (!parentReportAction || !transaction) {
+                        throw new Error('Data missing');
+                    }
+
+                    deleteMoneyRequest(transaction?.transactionID, parentReportAction);
+
+                    const goBackRoute = getNavigationUrlOnMoneyRequestDelete(transaction.transactionID, parentReportAction, true);
+                    if (goBackRoute) {
+                        Navigation.navigate(goBackRoute);
+                    }
+                }}
+                onCancel={() => setIsDeleteModalVisible(false)}
+                prompt={translate('iou.deleteConfirmation', {count: 1})}
+                confirmText={translate('common.delete')}
+                cancelText={translate('common.cancel')}
+                danger
+                shouldEnableNewFocusManagement
+            />
         </View>
     );
 }
diff --git a/src/components/ReportActionItem/ExportWithDropdownMenu.tsx b/src/components/ReportActionItem/ExportWithDropdownMenu.tsx
index b676c581da987..6b18c1c0b6bb5 100644
--- a/src/components/ReportActionItem/ExportWithDropdownMenu.tsx
+++ b/src/components/ReportActionItem/ExportWithDropdownMenu.tsx
@@ -9,10 +9,10 @@ import ConfirmModal from '@components/ConfirmModal';
 import useLocalize from '@hooks/useLocalize';
 import useResponsiveLayout from '@hooks/useResponsiveLayout';
 import useThemeStyles from '@hooks/useThemeStyles';
-import * as PolicyActions from '@libs/actions/Policy/Policy';
-import * as ReportActions from '@libs/actions/Report';
-import * as PolicyUtils from '@libs/PolicyUtils';
-import * as ReportUtils from '@libs/ReportUtils';
+import {savePreferredExportMethod as savePreferredExportMethodUtils} from '@libs/actions/Policy/Policy';
+import {exportToIntegration, markAsManuallyExported} from '@libs/actions/Report';
+import {hasIntegrationAutoSync as hasIntegrationAutoSyncUtils} from '@libs/PolicyUtils';
+import {canBeExported as canBeExportedUtils, getIntegrationIcon, isExported as isExportedUtils} from '@libs/ReportUtils';
 import type {ExportType} from '@pages/home/report/ReportDetailsExportPage';
 import variables from '@styles/variables';
 import CONST from '@src/CONST';
@@ -51,10 +51,10 @@ function ExportWithDropdownMenu({
     const [exportMethods] = useOnyx(ONYXKEYS.LAST_EXPORT_METHOD);
     const [reportActions] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${reportID}`);
 
-    const iconToDisplay = ReportUtils.getIntegrationIcon(connectionName);
-    const canBeExported = ReportUtils.canBeExported(report);
-    const isExported = ReportUtils.isExported(reportActions);
-    const hasIntegrationAutoSync = PolicyUtils.hasIntegrationAutoSync(policy, connectionName);
+    const iconToDisplay = getIntegrationIcon(connectionName);
+    const canBeExported = canBeExportedUtils(report);
+    const isExported = isExportedUtils(reportActions);
+    const hasIntegrationAutoSync = hasIntegrationAutoSyncUtils(policy, connectionName);
     const flattenedWrapperStyle = StyleSheet.flatten([styles.flex1, wrapperStyle]);
 
     const dropdownOptions: Array<DropdownOption<ReportExportType>> = useMemo(() => {
@@ -74,7 +74,7 @@ function ExportWithDropdownMenu({
             },
             {
                 value: CONST.REPORT.EXPORT_OPTIONS.MARK_AS_EXPORTED,
-                text: translate('workspace.common.markAsExported'),
+                text: translate('workspace.common.markAsEntered'),
                 ...optionTemplate,
             },
         ];
@@ -93,9 +93,9 @@ function ExportWithDropdownMenu({
             return;
         }
         if (modalStatus === CONST.REPORT.EXPORT_OPTIONS.EXPORT_TO_INTEGRATION) {
-            ReportActions.exportToIntegration(reportID, connectionName);
+            exportToIntegration(reportID, connectionName);
         } else if (modalStatus === CONST.REPORT.EXPORT_OPTIONS.MARK_AS_EXPORTED) {
-            ReportActions.markAsManuallyExported(reportID, connectionName);
+            markAsManuallyExported(reportID, connectionName);
         }
     }, [connectionName, modalStatus, reportID]);
 
@@ -103,7 +103,7 @@ function ExportWithDropdownMenu({
         if (!report?.policyID) {
             return;
         }
-        PolicyActions.savePreferredExportMethod(report?.policyID, value);
+        savePreferredExportMethodUtils(report?.policyID, value);
     };
 
     return (
@@ -122,9 +122,9 @@ function ExportWithDropdownMenu({
                         return;
                     }
                     if (value === CONST.REPORT.EXPORT_OPTIONS.EXPORT_TO_INTEGRATION) {
-                        ReportActions.exportToIntegration(reportID, connectionName);
+                        exportToIntegration(reportID, connectionName);
                     } else if (value === CONST.REPORT.EXPORT_OPTIONS.MARK_AS_EXPORTED) {
-                        ReportActions.markAsManuallyExported(reportID, connectionName);
+                        markAsManuallyExported(reportID, connectionName);
                     }
                 }}
                 onOptionSelected={({value}) => savePreferredExportMethod(value)}
diff --git a/src/components/ReportActionItem/ReportPreview.tsx b/src/components/ReportActionItem/ReportPreview.tsx
index 7fd486c3d7363..b3d100226e6bf 100644
--- a/src/components/ReportActionItem/ReportPreview.tsx
+++ b/src/components/ReportActionItem/ReportPreview.tsx
@@ -36,9 +36,9 @@ import Performance from '@libs/Performance';
 import {getConnectedIntegration} from '@libs/PolicyUtils';
 import {getThumbnailAndImageURIs} from '@libs/ReceiptUtils';
 import {getReportActionText} from '@libs/ReportActionsUtils';
+import getReportPreviewAction from '@libs/ReportPreviewActionUtils';
 import {
     areAllRequestsBeingSmartScanned as areAllRequestsBeingSmartScannedReportUtils,
-    canBeExported,
     getArchiveReason,
     getBankAccountRoute,
     getDisplayNameForParticipant,
@@ -60,7 +60,6 @@ import {
     hasUpdatedTotal,
     hasViolations,
     hasWarningTypeViolations,
-    isAllowedToApproveExpenseReport,
     isAllowedToSubmitDraftExpenseReport,
     isArchivedReportWithID,
     isInvoiceReport as isInvoiceReportUtils,
@@ -87,7 +86,7 @@ import {
 import {contextMenuRef} from '@pages/home/report/ContextMenu/ReportActionContextMenu';
 import type {ContextMenuAnchor} from '@pages/home/report/ContextMenu/ReportActionContextMenu';
 import variables from '@styles/variables';
-import {approveMoneyRequest, canApproveIOU, canIOUBePaid as canIOUBePaidIOUActions, canSubmitReport, payInvoice, payMoneyRequest, submitReport} from '@userActions/IOU';
+import {approveMoneyRequest, canIOUBePaid as canIOUBePaidIOUActions, canSubmitReport, payInvoice, payMoneyRequest, submitReport} from '@userActions/IOU';
 import Timing from '@userActions/Timing';
 import CONST from '@src/CONST';
 import type {TranslationPaths} from '@src/languages/types';
@@ -194,12 +193,8 @@ function ReportPreview({
     );
 
     const canIOUBePaid = useMemo(() => getCanIOUBePaid(), [getCanIOUBePaid]);
-    const canIOUBePaidAndApproved = useMemo(() => getCanIOUBePaid(false, false), [getCanIOUBePaid]);
     const onlyShowPayElsewhere = useMemo(() => !canIOUBePaid && getCanIOUBePaid(true), [canIOUBePaid, getCanIOUBePaid]);
     const shouldShowPayButton = isPaidAnimationRunning || canIOUBePaid || onlyShowPayElsewhere;
-    const shouldShowApproveButton = useMemo(() => canApproveIOU(iouReport, policy), [iouReport, policy]) || isApprovedAnimationRunning;
-
-    const shouldDisableApproveButton = shouldShowApproveButton && !isAllowedToApproveExpenseReport(iouReport);
 
     const {nonHeldAmount, fullAmount, hasValidNonHeldAmount} = getNonHeldAndFullAmount(iouReport, shouldShowPayButton);
     const hasOnlyHeldExpenses = hasOnlyHeldExpensesReportUtils(iouReport?.reportID);
@@ -255,7 +250,6 @@ function ReportPreview({
     }
 
     const isArchived = isArchivedReportWithID(iouReport?.reportID);
-    const isAdmin = policy?.role === CONST.POLICY.ROLE.ADMIN;
     const filteredTransactions = transactions?.filter((transaction) => transaction) ?? [];
     const shouldShowSubmitButton = canSubmitReport(iouReport, policy, filteredTransactions, violations);
     const shouldDisableSubmitButton = shouldShowSubmitButton && !isAllowedToSubmitDraftExpenseReport(iouReport);
@@ -407,9 +401,7 @@ function ReportPreview({
 
     const bankAccountRoute = getBankAccountRoute(chatReport);
 
-    const shouldShowSettlementButton = !shouldShowSubmitButton && (shouldShowPayButton || shouldShowApproveButton) && !showRTERViolationMessage && !shouldShowBrokenConnectionViolation;
-
-    const shouldPromptUserToAddBankAccount = (hasMissingPaymentMethod(userWallet, iouReportID) || hasMissingInvoiceBankAccount(iouReportID)) && !iouSettled;
+    const shouldPromptUserToAddBankAccount = (hasMissingPaymentMethod(userWallet, iouReportID) || hasMissingInvoiceBankAccount(iouReportID)) && !isSettled(iouReportID);
     const shouldShowRBR = hasErrors && !iouSettled;
 
     /*
@@ -475,8 +467,6 @@ function ReportPreview({
      */
     const connectedIntegration = getConnectedIntegration(policy);
 
-    const shouldShowExportIntegrationButton = !shouldShowPayButton && !shouldShowSubmitButton && connectedIntegration && isAdmin && canBeExported(iouReport);
-
     useEffect(() => {
         if (!isPaidAnimationRunning || isApprovedAnimationRunning) {
             return;
@@ -506,7 +496,6 @@ function ReportPreview({
 
         thumbsUpScale.set(isApprovedAnimationRunning ? withDelay(CONST.ANIMATION_THUMBSUP_DELAY, withSpring(1, {duration: CONST.ANIMATION_THUMBSUP_DURATION})) : 1);
     }, [isApproved, isApprovedAnimationRunning, thumbsUpScale]);
-
     const openReportFromPreview = useCallback(() => {
         if (!iouReportID || contextMenuRef.current?.isContextMenuOpening) {
             return;
@@ -516,6 +505,90 @@ function ReportPreview({
         Navigation.navigate(ROUTES.REPORT_WITH_ID.getRoute(iouReportID));
     }, [iouReportID]);
 
+    const reportPreviewAction = useMemo(() => {
+        return getReportPreviewAction(violations, iouReport, policy, transactions);
+    }, [iouReport, policy, violations, transactions]);
+
+    const reportPreviewActions = {
+        [CONST.REPORT.REPORT_PREVIEW_ACTIONS.SUBMIT]: (
+            <Button
+                success={isWaitingForSubmissionFromCurrentUser}
+                text={translate('common.submit')}
+                onPress={() => submitReport(iouReport)}
+                isDisabled={shouldDisableSubmitButton}
+            />
+        ),
+        [CONST.REPORT.REPORT_PREVIEW_ACTIONS.APPROVE]: (
+            <Button
+                text={translate('iou.approve')}
+                success
+                onPress={() => confirmApproval()}
+                isDisabled={shouldDisableSubmitButton}
+            />
+        ),
+        [CONST.REPORT.REPORT_PREVIEW_ACTIONS.PAY]: (
+            <AnimatedSettlementButton
+                onlyShowPayElsewhere={onlyShowPayElsewhere}
+                currency={iouReport?.currency}
+                policyID={policyID}
+                chatReportID={chatReportID}
+                iouReport={iouReport}
+                onPress={confirmPayment}
+                enablePaymentsRoute={ROUTES.ENABLE_PAYMENTS}
+                addBankAccountRoute={bankAccountRoute}
+                shouldHidePaymentOptions={!shouldShowPayButton}
+                canIOUBePaid
+                formattedAmount={getSettlementAmount() ?? ''}
+                isPaidAnimationRunning={isPaidAnimationRunning}
+                isApprovedAnimationRunning={isApprovedAnimationRunning}
+                onAnimationFinish={stopAnimation}
+                onPaymentOptionsShow={onPaymentOptionsShow}
+                onPaymentOptionsHide={onPaymentOptionsHide}
+                kycWallAnchorAlignment={{
+                    horizontal: CONST.MODAL.ANCHOR_ORIGIN_HORIZONTAL.LEFT,
+                    vertical: CONST.MODAL.ANCHOR_ORIGIN_VERTICAL.BOTTOM,
+                }}
+                paymentMethodDropdownAnchorAlignment={{
+                    horizontal: CONST.MODAL.ANCHOR_ORIGIN_HORIZONTAL.RIGHT,
+                    vertical: CONST.MODAL.ANCHOR_ORIGIN_VERTICAL.BOTTOM,
+                }}
+                isDisabled={isOffline && !canAllowSettlement}
+                isLoading={!isOffline && !canAllowSettlement}
+            />
+        ),
+        [CONST.REPORT.REPORT_PREVIEW_ACTIONS.EXPORT_TO_ACCOUNTING]: connectedIntegration ? (
+            <ExportWithDropdownMenu
+                policy={policy}
+                report={iouReport}
+                connectionName={connectedIntegration}
+                wrapperStyle={styles.flexReset}
+                dropdownAnchorAlignment={{
+                    horizontal: CONST.MODAL.ANCHOR_ORIGIN_HORIZONTAL.RIGHT,
+                    vertical: CONST.MODAL.ANCHOR_ORIGIN_VERTICAL.BOTTOM,
+                }}
+            />
+        ) : null,
+        [CONST.REPORT.REPORT_PREVIEW_ACTIONS.REVIEW]: (
+            <Button
+                text={translate('common.review')}
+                onPress={() => openReportFromPreview()}
+                isDisabled={shouldDisableSubmitButton}
+                icon={Expensicons.DotIndicator}
+                iconFill={theme.danger}
+                iconHoverFill={theme.dangerHover}
+            />
+        ),
+        [CONST.REPORT.REPORT_PREVIEW_ACTIONS.VIEW]: (
+            <Button
+                text={translate('common.view')}
+                onPress={() => {
+                    openReportFromPreview();
+                }}
+                isDisabled={shouldDisableSubmitButton}
+            />
+        ),
+    };
+
     return (
         <OfflineWithFeedback
             pendingAction={iouReport?.pendingFields?.preview}
@@ -550,7 +623,7 @@ function ReportPreview({
                             />
                         )}
                         <View style={[styles.expenseAndReportPreviewBoxBody, hasReceipts ? styles.mtn1 : {}]}>
-                            <View style={shouldShowSettlementButton ? {} : styles.expenseAndReportPreviewTextButtonContainer}>
+                            <View>
                                 <View style={styles.expenseAndReportPreviewTextContainer}>
                                     <View style={styles.flexRow}>
                                         <Animated.View style={[styles.flex1, styles.flexRow, styles.alignItemsCenter, previewMessageStyle]}>
@@ -561,12 +634,6 @@ function ReportPreview({
                                                 {previewMessage}
                                             </Text>
                                         </Animated.View>
-                                        {shouldShowRBR && (
-                                            <Icon
-                                                src={Expensicons.DotIndicator}
-                                                fill={theme.danger}
-                                            />
-                                        )}
                                         {!shouldShowRBR && shouldPromptUserToAddBankAccount && (
                                             <Icon
                                                 src={Expensicons.DotIndicator}
@@ -616,60 +683,7 @@ function ReportPreview({
                                         )}
                                     </View>
                                 </View>
-                                {shouldShowSettlementButton && (
-                                    <AnimatedSettlementButton
-                                        onlyShowPayElsewhere={onlyShowPayElsewhere}
-                                        isPaidAnimationRunning={isPaidAnimationRunning}
-                                        isApprovedAnimationRunning={isApprovedAnimationRunning}
-                                        canIOUBePaid={canIOUBePaidAndApproved || isPaidAnimationRunning}
-                                        onAnimationFinish={stopAnimation}
-                                        formattedAmount={getSettlementAmount() ?? ''}
-                                        currency={iouReport?.currency}
-                                        policyID={policyID}
-                                        chatReportID={chatReportID}
-                                        iouReport={iouReport}
-                                        onPress={confirmPayment}
-                                        onPaymentOptionsShow={onPaymentOptionsShow}
-                                        onPaymentOptionsHide={onPaymentOptionsHide}
-                                        confirmApproval={confirmApproval}
-                                        enablePaymentsRoute={ROUTES.ENABLE_PAYMENTS}
-                                        addBankAccountRoute={bankAccountRoute}
-                                        shouldAddTopMargin
-                                        shouldHidePaymentOptions={!shouldShowPayButton}
-                                        shouldShowApproveButton={shouldShowApproveButton}
-                                        shouldDisableApproveButton={shouldDisableApproveButton}
-                                        kycWallAnchorAlignment={{
-                                            horizontal: CONST.MODAL.ANCHOR_ORIGIN_HORIZONTAL.LEFT,
-                                            vertical: CONST.MODAL.ANCHOR_ORIGIN_VERTICAL.BOTTOM,
-                                        }}
-                                        paymentMethodDropdownAnchorAlignment={{
-                                            horizontal: CONST.MODAL.ANCHOR_ORIGIN_HORIZONTAL.RIGHT,
-                                            vertical: CONST.MODAL.ANCHOR_ORIGIN_VERTICAL.BOTTOM,
-                                        }}
-                                        isDisabled={isOffline && !canAllowSettlement}
-                                        isLoading={!isOffline && !canAllowSettlement}
-                                    />
-                                )}
-                                {!!shouldShowExportIntegrationButton && !shouldShowSettlementButton && (
-                                    <ExportWithDropdownMenu
-                                        policy={policy}
-                                        report={iouReport}
-                                        connectionName={connectedIntegration}
-                                        wrapperStyle={styles.flexReset}
-                                        dropdownAnchorAlignment={{
-                                            horizontal: CONST.MODAL.ANCHOR_ORIGIN_HORIZONTAL.RIGHT,
-                                            vertical: CONST.MODAL.ANCHOR_ORIGIN_VERTICAL.BOTTOM,
-                                        }}
-                                    />
-                                )}
-                                {shouldShowSubmitButton && (
-                                    <Button
-                                        success={isWaitingForSubmissionFromCurrentUser}
-                                        text={translate('common.submit')}
-                                        onPress={() => iouReport && submitReport(iouReport)}
-                                        isDisabled={shouldDisableSubmitButton}
-                                    />
-                                )}
+                                <View style={styles.pt4}>{reportPreviewActions[reportPreviewAction]}</View>
                             </View>
                         </View>
                     </View>
diff --git a/src/languages/en.ts b/src/languages/en.ts
index 66f9fc933f743..2ebb255a196c6 100755
--- a/src/languages/en.ts
+++ b/src/languages/en.ts
@@ -1090,7 +1090,7 @@ const translations = {
         waitingOnEnabledWallet: ({submitterDisplayName}: WaitingOnBankAccountParams) => `started settling up. Payment is on hold until ${submitterDisplayName} enables their wallet.`,
         enableWallet: 'Enable wallet',
         hold: 'Hold',
-        unhold: 'Unhold',
+        unhold: 'Remove hold',
         holdExpense: 'Hold expense',
         unholdExpense: 'Unhold expense',
         heldExpense: 'held this expense',
@@ -2883,7 +2883,8 @@ const translations = {
             descriptionHint: 'Share information about this workspace with all members.',
             welcomeNote: 'Please use Expensify to submit your receipts for reimbursement, thanks!',
             subscription: 'Subscription',
-            markAsExported: 'Mark as manually entered',
+            markAsEntered: 'Mark as manually entered',
+            markAsExported: 'Mark as manually exported',
             exportIntegrationSelected: ({connectionName}: ExportIntegrationSelectedParams) => `Export to ${CONST.POLICY.CONNECTIONS.NAME_USER_FRIENDLY[connectionName]}`,
             letsDoubleCheck: "Let's double check that everything looks right.",
             lineItemLevel: 'Line-item level',
diff --git a/src/languages/es.ts b/src/languages/es.ts
index a6388799c3094..1fdac5855c5e9 100644
--- a/src/languages/es.ts
+++ b/src/languages/es.ts
@@ -2905,7 +2905,8 @@ const translations = {
             descriptionHint: 'Comparte información sobre este espacio de trabajo con todos los miembros.',
             welcomeNote: `Por favor, utiliza Expensify para enviar tus recibos para reembolso, ¡gracias!`,
             subscription: 'Suscripción',
-            markAsExported: 'Marcar como introducido manualmente',
+            markAsEntered: 'Marcar como introducido manualmente',
+            markAsExported: 'Marcar como exportado manualmente',
             exportIntegrationSelected: ({connectionName}: ExportIntegrationSelectedParams) => `Exportar a  ${CONST.POLICY.CONNECTIONS.NAME_USER_FRIENDLY[connectionName]}`,
             letsDoubleCheck: 'Verifiquemos que todo esté correcto',
             reportField: 'Campo del informe',
diff --git a/src/libs/PolicyUtils.ts b/src/libs/PolicyUtils.ts
index 942dc2f35f57d..96453efb8bd6a 100644
--- a/src/libs/PolicyUtils.ts
+++ b/src/libs/PolicyUtils.ts
@@ -1237,6 +1237,10 @@ function getAllPoliciesLength() {
     return Object.keys(allPolicies ?? {}).length;
 }
 
+function getAllPolicies() {
+    return Object.values(allPolicies ?? {}).filter((p) => !!p);
+}
+
 function getActivePolicy(): OnyxEntry<Policy> {
     return getPolicy(activePolicyId);
 }
@@ -1390,18 +1394,6 @@ function isPrefferedExporter(policy: Policy) {
     return exporters.some((exporter) => exporter && exporter === user);
 }
 
-function isAutoSyncEnabled(policy: Policy) {
-    const values = [
-        policy.connections?.intacct?.config?.autoSync?.enabled,
-        policy.connections?.netsuite?.config?.autoSync?.enabled,
-        policy.connections?.quickbooksDesktop?.config?.autoSync?.enabled,
-        policy.connections?.quickbooksOnline?.config?.autoSync?.enabled,
-        policy.connections?.xero?.config?.autoSync?.enabled,
-    ];
-
-    return values.some((value) => !!value);
-}
-
 export {
     canEditTaxRate,
     extractPolicyIDFromPath,
@@ -1526,6 +1518,7 @@ export {
     getWorkflowApprovalsUnavailable,
     getNetSuiteImportCustomFieldLabel,
     getAllPoliciesLength,
+    getAllPolicies,
     getActivePolicy,
     getUserFriendlyWorkspaceType,
     isPolicyAccessible,
@@ -1541,7 +1534,6 @@ export {
     isWorkspaceEligibleForReportChange,
     getManagerAccountID,
     isPrefferedExporter,
-    isAutoSyncEnabled,
     areAllGroupPoliciesExpenseChatDisabled,
 };
 
diff --git a/src/libs/ReportPreviewActionUtils.ts b/src/libs/ReportPreviewActionUtils.ts
new file mode 100644
index 0000000000000..13033f249e06c
--- /dev/null
+++ b/src/libs/ReportPreviewActionUtils.ts
@@ -0,0 +1,114 @@
+import type {OnyxCollection} from 'react-native-onyx';
+import type {ValueOf} from 'type-fest';
+import CONST from '@src/CONST';
+import type {Policy, Report, Transaction, TransactionViolation} from '@src/types/onyx';
+import {isApprover as isApproverMember} from './actions/Policy/Member';
+import {getCurrentUserAccountID} from './actions/Report';
+import {arePaymentsEnabled, getConnectedIntegration, getCorrectedAutoReportingFrequency, hasAccountingConnections, hasIntegrationAutoSync, isPrefferedExporter} from './PolicyUtils';
+import {
+    getReportTransactions,
+    hasViolations as hasAnyViolations,
+    isClosedReport,
+    isCurrentUserSubmitter,
+    isExpenseReport,
+    isInvoiceReport,
+    isIOUReport,
+    isOpenReport,
+    isPayer,
+    isProcessingReport,
+    isReportApproved,
+    isSettled,
+} from './ReportUtils';
+import {getSession} from './SessionUtils';
+
+function canSubmit(report: Report, violations: OnyxCollection<TransactionViolation[]>, policy?: Policy) {
+    const isExpense = isExpenseReport(report);
+    const isSubmitter = isCurrentUserSubmitter(report.reportID);
+    const isOpen = isOpenReport(report);
+    const isManualSubmitEnabled = getCorrectedAutoReportingFrequency(policy) === CONST.POLICY.AUTO_REPORTING_FREQUENCIES.MANUAL;
+    const hasViolations = hasAnyViolations(report.reportID, violations);
+    return isExpense && isSubmitter && isOpen && isManualSubmitEnabled && !hasViolations;
+}
+
+function canApprove(report: Report, violations: OnyxCollection<TransactionViolation[]>, policy?: Policy, transactions?: Transaction[]) {
+    const isExpense = isExpenseReport(report);
+    const isApprover = isApproverMember(policy, getCurrentUserAccountID());
+    const isProcessing = isProcessingReport(report);
+    const isApprovalEnabled = policy ? policy.approvalMode && policy.approvalMode !== CONST.POLICY.APPROVAL_MODE.OPTIONAL : false;
+    const hasViolations = hasAnyViolations(report.reportID, violations);
+    const reportTransactions = transactions ?? getReportTransactions(report?.reportID);
+    return isExpense && isApprover && isProcessing && isApprovalEnabled && !hasViolations && reportTransactions.length > 0;
+}
+
+function canPay(report: Report, violations: OnyxCollection<TransactionViolation[]>, policy?: Policy) {
+    const isReportPayer = isPayer(getSession(), report, false, policy);
+    const isExpense = isExpenseReport(report);
+    const isPaymentsEnabled = arePaymentsEnabled(policy);
+    const isProcessing = isProcessingReport(report);
+    const isApprovalEnabled = policy ? policy.approvalMode && policy.approvalMode !== CONST.POLICY.APPROVAL_MODE.OPTIONAL : false;
+    const isSubmittedWithoutApprovalsEnabled = !isApprovalEnabled && isProcessing;
+    const isApproved = isReportApproved({report}) || isSubmittedWithoutApprovalsEnabled;
+    const isClosed = isClosedReport(report);
+    const hasViolations = hasAnyViolations(report.reportID, violations);
+    const isInvoice = isInvoiceReport(report);
+    const isIOU = isIOUReport(report);
+
+    if (!isReportPayer) {
+        return false;
+    }
+    return (isExpense && isPaymentsEnabled && (isApproved || isClosed) && !hasViolations) || ((isInvoice || isIOU) && isProcessing);
+}
+
+function canExport(report: Report, violations: OnyxCollection<TransactionViolation[]>, policy?: Policy) {
+    const isExpense = isExpenseReport(report);
+    const isExporter = policy ? isPrefferedExporter(policy) : false;
+    const isApproved = isReportApproved({report});
+    const isReimbursed = isSettled(report);
+    const isClosed = isClosedReport(report);
+    const hasAccountingConnection = hasAccountingConnections(policy);
+    const connectedIntegration = getConnectedIntegration(policy);
+    const syncEnabled = hasIntegrationAutoSync(policy, connectedIntegration);
+    const hasViolations = hasAnyViolations(report.reportID, violations);
+    if (isExpense && isExporter && hasAccountingConnection && !syncEnabled && !hasViolations) {
+        return isApproved || isReimbursed || isClosed;
+    }
+    return false;
+}
+
+function canReview(report: Report, violations: OnyxCollection<TransactionViolation[]>, policy?: Policy) {
+    const hasViolations = hasAnyViolations(report.reportID, violations);
+    const isSubmitter = isCurrentUserSubmitter(report.reportID);
+    const isApprover = isApproverMember(policy, getCurrentUserAccountID());
+    const areWorkflowsEnabled = policy ? policy.areWorkflowsEnabled : false;
+    return hasViolations && (isSubmitter || isApprover) && areWorkflowsEnabled;
+}
+
+function getReportPreviewAction(
+    violations: OnyxCollection<TransactionViolation[]>,
+    report?: Report,
+    policy?: Policy,
+    transactions?: Transaction[],
+): ValueOf<typeof CONST.REPORT.REPORT_PREVIEW_ACTIONS> {
+    if (!report) {
+        return CONST.REPORT.REPORT_PREVIEW_ACTIONS.VIEW;
+    }
+    if (canSubmit(report, violations, policy)) {
+        return CONST.REPORT.REPORT_PREVIEW_ACTIONS.SUBMIT;
+    }
+    if (canApprove(report, violations, policy, transactions)) {
+        return CONST.REPORT.REPORT_PREVIEW_ACTIONS.APPROVE;
+    }
+    if (canPay(report, violations, policy)) {
+        return CONST.REPORT.REPORT_PREVIEW_ACTIONS.PAY;
+    }
+    if (canExport(report, violations, policy)) {
+        return CONST.REPORT.REPORT_PREVIEW_ACTIONS.EXPORT_TO_ACCOUNTING;
+    }
+    if (canReview(report, violations, policy)) {
+        return CONST.REPORT.REPORT_PREVIEW_ACTIONS.REVIEW;
+    }
+
+    return CONST.REPORT.REPORT_PREVIEW_ACTIONS.VIEW;
+}
+
+export default getReportPreviewAction;
diff --git a/src/libs/ReportPrimaryActionUtils.ts b/src/libs/ReportPrimaryActionUtils.ts
index 16a755427a3eb..6d05e752102a3 100644
--- a/src/libs/ReportPrimaryActionUtils.ts
+++ b/src/libs/ReportPrimaryActionUtils.ts
@@ -4,8 +4,17 @@ import CONST from '@src/CONST';
 import type {Policy, Report, Transaction, TransactionViolation} from '@src/types/onyx';
 import {isApprover as isApproverUtils} from './actions/Policy/Member';
 import {getCurrentUserAccountID} from './actions/Report';
-import {arePaymentsEnabled as arePaymentsEnabledUtils, getCorrectedAutoReportingFrequency, hasAccountingConnections, isAutoSyncEnabled, isPrefferedExporter} from './PolicyUtils';
 import {
+    arePaymentsEnabled as arePaymentsEnabledUtils,
+    getConnectedIntegration,
+    getCorrectedAutoReportingFrequency,
+    hasAccountingConnections,
+    hasIntegrationAutoSync,
+    isPrefferedExporter,
+} from './PolicyUtils';
+import {getAllReportActions, getOneTransactionThreadReportID} from './ReportActionsUtils';
+import {
+    getParentReport,
     isClosedReport as isClosedReportUtils,
     isCurrentUserSubmitter,
     isExpenseReport as isExpenseReportUtils,
@@ -19,21 +28,28 @@ import {
     isSettled,
 } from './ReportUtils';
 import {getSession} from './SessionUtils';
-import {allHavePendingRTERViolation, isDuplicate, isOnHold as isOnHoldTransactionUtils, shouldShowBrokenConnectionViolationForMultipleTransactions} from './TransactionUtils';
-
-function isSubmitAction(report: Report, policy: Policy) {
+import {
+    allHavePendingRTERViolation,
+    hasPendingRTERViolation as hasPendingRTERViolationTransactionUtils,
+    isDuplicate,
+    isOnHold as isOnHoldTransactionUtils,
+    shouldShowBrokenConnectionViolationForMultipleTransactions,
+    shouldShowBrokenConnectionViolation as shouldShowBrokenConnectionViolationTransactionUtils,
+} from './TransactionUtils';
+
+function isSubmitAction(report: Report, reportTransactions: Transaction[], policy?: Policy) {
     const isExpenseReport = isExpenseReportUtils(report);
     const isReportSubmitter = isCurrentUserSubmitter(report.reportID);
     const isOpenReport = isOpenReportUtils(report);
     const isManualSubmitEnabled = getCorrectedAutoReportingFrequency(policy) === CONST.POLICY.AUTO_REPORTING_FREQUENCIES.MANUAL;
 
-    return isExpenseReport && isReportSubmitter && isOpenReport && isManualSubmitEnabled;
+    return isExpenseReport && isReportSubmitter && isOpenReport && isManualSubmitEnabled && reportTransactions.length !== 0;
 }
 
-function isApproveAction(report: Report, policy: Policy, reportTransactions: Transaction[]) {
+function isApproveAction(report: Report, reportTransactions: Transaction[], policy?: Policy) {
     const isExpenseReport = isExpenseReportUtils(report);
     const isReportApprover = isApproverUtils(policy, getCurrentUserAccountID());
-    const isApprovalEnabled = policy.approvalMode && policy.approvalMode !== CONST.POLICY.APPROVAL_MODE.OPTIONAL;
+    const isApprovalEnabled = policy?.approvalMode && policy.approvalMode !== CONST.POLICY.APPROVAL_MODE.OPTIONAL;
 
     if (!isExpenseReport || !isReportApprover || !isApprovalEnabled) {
         return false;
@@ -51,7 +67,7 @@ function isApproveAction(report: Report, policy: Policy, reportTransactions: Tra
     return false;
 }
 
-function isPayAction(report: Report, policy: Policy) {
+function isPayAction(report: Report, policy?: Policy) {
     const isExpenseReport = isExpenseReportUtils(report);
     const isReportPayer = isPayer(getSession(), report, false, policy);
     const arePaymentsEnabled = arePaymentsEnabledUtils(policy);
@@ -64,17 +80,36 @@ function isPayAction(report: Report, policy: Policy) {
     }
 
     const isProcessingReport = isProcessingReportUtils(report);
-    const isInvoiceReport = isInvoiceReportUtils(report);
+
+    if (!isProcessingReport) {
+        return false;
+    }
+
     const isIOUReport = isIOUReportUtils(report);
 
-    if ((isInvoiceReport || isIOUReport) && isProcessingReport) {
+    if (isIOUReport && isReportPayer) {
         return true;
     }
 
-    return false;
+    const isInvoiceReport = isInvoiceReportUtils(report);
+
+    if (!isInvoiceReport) {
+        return false;
+    }
+
+    const parentReport = getParentReport(report);
+    if (parentReport?.invoiceReceiver?.type === CONST.REPORT.INVOICE_RECEIVER_TYPE.INDIVIDUAL) {
+        return parentReport?.invoiceReceiver?.accountID === getCurrentUserAccountID();
+    }
+
+    return policy?.role === CONST.POLICY.ROLE.ADMIN;
 }
 
-function isExportAction(report: Report, policy: Policy) {
+function isExportAction(report: Report, policy?: Policy) {
+    if (!policy) {
+        return false;
+    }
+
     const hasAccountingConnection = hasAccountingConnections(policy);
     if (!hasAccountingConnection) {
         return false;
@@ -85,7 +120,8 @@ function isExportAction(report: Report, policy: Policy) {
         return false;
     }
 
-    const syncEnabled = isAutoSyncEnabled(policy);
+    const connectedIntegration = getConnectedIntegration(policy);
+    const syncEnabled = hasIntegrationAutoSync(policy, connectedIntegration);
     if (syncEnabled) {
         return false;
     }
@@ -103,12 +139,25 @@ function isExportAction(report: Report, policy: Policy) {
 
 function isRemoveHoldAction(report: Report, reportTransactions: Transaction[]) {
     const isReportOnHold = reportTransactions.some(isOnHoldTransactionUtils);
-    const isHolder = reportTransactions.some((transaction) => isHoldCreator(transaction, report.reportID));
 
-    return isReportOnHold && isHolder;
+    if (!isReportOnHold) {
+        return false;
+    }
+
+    const reportActions = getAllReportActions(report.reportID);
+    const transactionThreadReportID = getOneTransactionThreadReportID(report.reportID, reportActions);
+
+    if (!transactionThreadReportID) {
+        return false;
+    }
+
+    // Transaction is attached to expense report but hold action is attached to transaction thread report
+    const isHolder = reportTransactions.some((transaction) => isHoldCreator(transaction, transactionThreadReportID));
+
+    return isHolder;
 }
 
-function isReviewDuplicatesAction(report: Report, policy: Policy, reportTransactions: Transaction[]) {
+function isReviewDuplicatesAction(report: Report, reportTransactions: Transaction[], policy?: Policy) {
     const hasDuplicates = reportTransactions.some((transaction) => isDuplicate(transaction.transactionID));
 
     if (!hasDuplicates) {
@@ -130,7 +179,13 @@ function isReviewDuplicatesAction(report: Report, policy: Policy, reportTransact
     return false;
 }
 
-function isMarkAsCashAction(report: Report, policy: Policy, reportTransactions: Transaction[], violations: OnyxCollection<TransactionViolation[]>) {
+function isMarkAsCashAction(report: Report, reportTransactions: Transaction[], violations: OnyxCollection<TransactionViolation[]>, policy?: Policy) {
+    const isOneExpenseReport = isExpenseReportUtils(report) && reportTransactions.length === 1;
+
+    if (!isOneExpenseReport) {
+        return false;
+    }
+
     const transactionIDs = reportTransactions.map((t) => t.transactionID);
     const hasAllPendingRTERViolations = allHavePendingRTERViolation(transactionIDs, violations);
 
@@ -148,17 +203,21 @@ function isMarkAsCashAction(report: Report, policy: Policy, reportTransactions:
     return userControlsReport && shouldShowBrokenConnectionViolation;
 }
 
-function getPrimaryAction(
+function getReportPrimaryAction(
     report: Report,
-    policy: Policy,
     reportTransactions: Transaction[],
     violations: OnyxCollection<TransactionViolation[]>,
+    policy?: Policy,
 ): ValueOf<typeof CONST.REPORT.PRIMARY_ACTIONS> | '' {
-    if (isSubmitAction(report, policy)) {
+    if (isRemoveHoldAction(report, reportTransactions)) {
+        return CONST.REPORT.PRIMARY_ACTIONS.REMOVE_HOLD;
+    }
+
+    if (isSubmitAction(report, reportTransactions, policy)) {
         return CONST.REPORT.PRIMARY_ACTIONS.SUBMIT;
     }
 
-    if (isApproveAction(report, policy, reportTransactions)) {
+    if (isApproveAction(report, reportTransactions, policy)) {
         return CONST.REPORT.PRIMARY_ACTIONS.APPROVE;
     }
 
@@ -170,19 +229,53 @@ function getPrimaryAction(
         return CONST.REPORT.PRIMARY_ACTIONS.EXPORT_TO_ACCOUNTING;
     }
 
-    if (isRemoveHoldAction(report, reportTransactions)) {
-        return CONST.REPORT.PRIMARY_ACTIONS.REMOVE_HOLD;
+    if (isMarkAsCashAction(report, reportTransactions, violations, policy)) {
+        return CONST.REPORT.PRIMARY_ACTIONS.MARK_AS_CASH;
+    }
+
+    return '';
+}
+
+function isMarkAsCashActionForTransaction(parentReport: Report, violations: TransactionViolation[], policy?: Policy): boolean {
+    const hasPendingRTERViolation = hasPendingRTERViolationTransactionUtils(violations);
+
+    if (hasPendingRTERViolation) {
+        return true;
     }
 
-    if (isReviewDuplicatesAction(report, policy, reportTransactions)) {
-        return CONST.REPORT.PRIMARY_ACTIONS.REVIEW_DUPLICATES;
+    const shouldShowBrokenConnectionViolation = shouldShowBrokenConnectionViolationTransactionUtils(parentReport, policy, violations);
+
+    if (!shouldShowBrokenConnectionViolation) {
+        return false;
     }
 
-    if (isMarkAsCashAction(report, policy, reportTransactions, violations)) {
-        return CONST.REPORT.PRIMARY_ACTIONS.MARK_AS_CASH;
+    const isReportSubmitter = isCurrentUserSubmitter(parentReport.reportID);
+    const isReportApprover = isApproverUtils(policy, getCurrentUserAccountID());
+    const isAdmin = policy?.role === CONST.POLICY.ROLE.ADMIN;
+
+    return isReportSubmitter || isReportApprover || isAdmin;
+}
+
+function getTransactionThreadPrimaryAction(
+    transactionThreadReport: Report,
+    parentReport: Report,
+    reportTransaction: Transaction,
+    violations: TransactionViolation[],
+    policy?: Policy,
+): ValueOf<typeof CONST.REPORT.TRANSACTION_PRIMARY_ACTIONS> | '' {
+    if (isHoldCreator(reportTransaction, transactionThreadReport.reportID)) {
+        return CONST.REPORT.TRANSACTION_PRIMARY_ACTIONS.REMOVE_HOLD;
+    }
+
+    if (isReviewDuplicatesAction(parentReport, [reportTransaction], policy)) {
+        return CONST.REPORT.TRANSACTION_PRIMARY_ACTIONS.REVIEW_DUPLICATES;
+    }
+
+    if (isMarkAsCashActionForTransaction(parentReport, violations, policy)) {
+        return CONST.REPORT.TRANSACTION_PRIMARY_ACTIONS.MARK_AS_CASH;
     }
 
     return '';
 }
 
-export default getPrimaryAction;
+export {getReportPrimaryAction, getTransactionThreadPrimaryAction};
diff --git a/src/libs/ReportSecondaryActionUtils.ts b/src/libs/ReportSecondaryActionUtils.ts
index 80545b4404e6a..57befeb64ee60 100644
--- a/src/libs/ReportSecondaryActionUtils.ts
+++ b/src/libs/ReportSecondaryActionUtils.ts
@@ -3,14 +3,17 @@ import type {ValueOf} from 'type-fest';
 import CONST from '@src/CONST';
 import type {Policy, Report, ReportAction, Transaction, TransactionViolation} from '@src/types/onyx';
 import {isApprover as isApproverUtils} from './actions/Policy/Member';
-import {getCurrentUserAccountID} from './actions/Report';
+import {getCurrentUserAccountID, getCurrentUserEmail} from './actions/Report';
 import {
     arePaymentsEnabled as arePaymentsEnabledUtils,
+    getAllPolicies,
+    getConnectedIntegration,
     getCorrectedAutoReportingFrequency,
     hasAccountingConnections,
+    hasIntegrationAutoSync,
     hasNoPolicyOtherThanPersonalType,
-    isAutoSyncEnabled,
     isPrefferedExporter,
+    isWorkspaceEligibleForReportChange,
 } from './PolicyUtils';
 import {getIOUActionForReportID, getReportActions, isPayAction} from './ReportActionsUtils';
 import {
@@ -30,10 +33,10 @@ import {
 import {getSession} from './SessionUtils';
 import {allHavePendingRTERViolation, isDuplicate, isOnHold as isOnHoldTransactionUtils, shouldShowBrokenConnectionViolationForMultipleTransactions} from './TransactionUtils';
 
-function isSubmitAction(report: Report, policy: Policy): boolean {
+function isSubmitAction(report: Report, policy?: Policy): boolean {
     const isExpenseReport = isExpenseReportUtils(report);
 
-    if (!isExpenseReport) {
+    if (!isExpenseReport || report?.total === 0) {
         return false;
     }
 
@@ -57,7 +60,7 @@ function isSubmitAction(report: Report, policy: Policy): boolean {
     return !!isScheduledSubmitEnabled;
 }
 
-function isApproveAction(report: Report, policy: Policy, reportTransactions: Transaction[], violations: OnyxCollection<TransactionViolation[]>): boolean {
+function isApproveAction(report: Report, reportTransactions: Transaction[], violations: OnyxCollection<TransactionViolation[]>, policy?: Policy): boolean {
     const isExpenseReport = isExpenseReportUtils(report);
     const isReportApprover = isApproverUtils(policy, getCurrentUserAccountID());
     const isProcessingReport = isProcessingReportUtils(report);
@@ -83,7 +86,7 @@ function isApproveAction(report: Report, policy: Policy, reportTransactions: Tra
     return userControlsReport && shouldShowBrokenConnectionViolation;
 }
 
-function isUnapproveAction(report: Report, policy: Policy): boolean {
+function isUnapproveAction(report: Report, policy?: Policy): boolean {
     const isExpenseReport = isExpenseReportUtils(report);
     const isReportApprover = isApproverUtils(policy, getCurrentUserAccountID());
     const isReportApproved = isReportApprovedUtils({report});
@@ -91,13 +94,20 @@ function isUnapproveAction(report: Report, policy: Policy): boolean {
     return isExpenseReport && isReportApprover && isReportApproved;
 }
 
-function isCancelPaymentAction(report: Report, reportTransactions: Transaction[]): boolean {
+function isCancelPaymentAction(report: Report, reportTransactions: Transaction[], policy?: Policy): boolean {
     const isExpenseReport = isExpenseReportUtils(report);
 
     if (!isExpenseReport) {
         return false;
     }
 
+    const isAdmin = policy?.role === CONST.POLICY.ROLE.ADMIN;
+    const isPayer = isPayerUtils(getSession(), report, false, policy);
+
+    if (!isAdmin || !isPayer) {
+        return false;
+    }
+
     const isReportPaidElsewhere = report.stateNum === CONST.REPORT.STATE_NUM.APPROVED && report.statusNum === CONST.REPORT.STATUS_NUM.REIMBURSED;
 
     if (isReportPaidElsewhere) {
@@ -124,7 +134,16 @@ function isCancelPaymentAction(report: Report, reportTransactions: Transaction[]
     return isPaymentProcessing && !hasDailyNachaCutoffPassed;
 }
 
-function isExportAction(report: Report, policy: Policy): boolean {
+function isExportAction(report: Report, policy?: Policy): boolean {
+    if (!policy) {
+        return false;
+    }
+
+    const hasAccountingConnection = hasAccountingConnections(policy);
+    if (!hasAccountingConnection) {
+        return false;
+    }
+
     const isInvoiceReport = isInvoiceReportUtils(report);
     const isReportSender = isCurrentUserSubmitter(report.reportID);
 
@@ -134,9 +153,7 @@ function isExportAction(report: Report, policy: Policy): boolean {
 
     const isExpenseReport = isExpenseReportUtils(report);
 
-    const hasAccountingConnection = hasAccountingConnections(policy);
-
-    if (!isExpenseReport || !hasAccountingConnection) {
+    if (!isExpenseReport) {
         return false;
     }
 
@@ -151,14 +168,24 @@ function isExportAction(report: Report, policy: Policy): boolean {
 
     const isAdmin = policy?.role === CONST.POLICY.ROLE.ADMIN;
     const isReportReimbursed = report.statusNum === CONST.REPORT.STATUS_NUM.REIMBURSED;
-    const syncEnabled = isAutoSyncEnabled(policy);
+    const connectedIntegration = getConnectedIntegration(policy);
+    const syncEnabled = hasIntegrationAutoSync(policy, connectedIntegration);
     const isReportExported = isExportedUtils(getReportActions(report));
     const isReportFinished = isReportApproved || isReportReimbursed || isReportClosed;
 
     return isAdmin && isReportFinished && syncEnabled && !isReportExported;
 }
 
-function isMarkAsExportedAction(report: Report, policy: Policy): boolean {
+function isMarkAsExportedAction(report: Report, policy?: Policy): boolean {
+    if (!policy) {
+        return false;
+    }
+
+    const hasAccountingConnection = hasAccountingConnections(policy);
+    if (!hasAccountingConnection) {
+        return false;
+    }
+
     const isInvoiceReport = isInvoiceReportUtils(report);
     const isReportSender = isCurrentUserSubmitter(report.reportID);
 
@@ -182,51 +209,73 @@ function isMarkAsExportedAction(report: Report, policy: Policy): boolean {
         return true;
     }
 
-    const isAdmin = policy?.role === CONST.POLICY.ROLE.ADMIN;
     const isReportReimbursed = isSettled(report);
-    const hasAccountingConnection = hasAccountingConnections(policy);
-    const syncEnabled = isAutoSyncEnabled(policy);
+    const connectedIntegration = getConnectedIntegration(policy);
+    const syncEnabled = hasIntegrationAutoSync(policy, connectedIntegration);
     const isReportFinished = isReportClosedOrApproved || isReportReimbursed;
 
-    if (isAdmin && isReportFinished && hasAccountingConnection && syncEnabled) {
-        return true;
+    if (!isReportFinished || !syncEnabled) {
+        return false;
     }
 
+    const isAdmin = policy?.role === CONST.POLICY.ROLE.ADMIN;
+
     const isExporter = isPrefferedExporter(policy);
 
-    if (isExporter && isReportFinished && hasAccountingConnection && !syncEnabled) {
-        return true;
+    return isAdmin || isExporter;
+}
+
+function isHoldAction(report: Report, reportTransactions: Transaction[]): boolean {
+    const isOneExpenseReport = reportTransactions.length === 1;
+    const transaction = reportTransactions.at(0);
+
+    if (!isOneExpenseReport || !transaction) {
+        return false;
     }
 
-    return false;
+    const isTransactionOnHold = isHoldActionForTransation(report, transaction);
+    return isTransactionOnHold;
 }
 
-function isHoldAction(report: Report, reportTransactions: Transaction[]): boolean {
+function isHoldActionForTransation(report: Report, reportTransaction: Transaction): boolean {
     const isExpenseReport = isExpenseReportUtils(report);
 
     if (!isExpenseReport) {
         return false;
     }
 
-    const isReportOnHold = reportTransactions.some(isOnHoldTransactionUtils);
+    const isReportOnHold = isOnHoldTransactionUtils(reportTransaction);
 
     if (isReportOnHold) {
         return false;
     }
 
     const isOpenReport = isOpenReportUtils(report);
+    const isSubmitter = isCurrentUserSubmitter(report.reportID);
+
+    if (isOpenReport && isSubmitter) {
+        return true;
+    }
+
     const isProcessingReport = isProcessingReportUtils(report);
-    const isReportApproved = isReportApprovedUtils({report});
 
-    return isOpenReport || isProcessingReport || isReportApproved;
+    return isProcessingReport;
 }
 
-function isChangeWorkspaceAction(report: Report, policy: Policy, reportTransactions: Transaction[], violations: OnyxCollection<TransactionViolation[]>): boolean {
+function isChangeWorkspaceAction(report: Report, reportTransactions: Transaction[], violations: OnyxCollection<TransactionViolation[]>, policy?: Policy): boolean {
     const isExpenseReport = isExpenseReportUtils(report);
     const isReportSubmitter = isCurrentUserSubmitter(report.reportID);
-    const areWorkflowsEnabled = policy.areWorkflowsEnabled;
+    const areWorkflowsEnabled = !!(policy && policy.areWorkflowsEnabled);
     const isClosedReport = isClosedReportUtils(report);
 
+    const policies = getAllPolicies();
+    const currentUserEmail = getCurrentUserEmail();
+    const policiesEligibleForChange = policies.filter((newPolicy) => isWorkspaceEligibleForReportChange(newPolicy, report, policy, currentUserEmail));
+
+    if (policiesEligibleForChange.length <= 1) {
+        return false;
+    }
+
     if (isExpenseReport && isReportSubmitter && !areWorkflowsEnabled && isClosedReport) {
         return true;
     }
@@ -278,10 +327,13 @@ function isChangeWorkspaceAction(report: Report, policy: Policy, reportTransacti
     return false;
 }
 
-function isDeleteAction(report: Report): boolean {
+function isDeleteAction(report: Report, reportTransactions: Transaction[]): boolean {
     const isExpenseReport = isExpenseReportUtils(report);
 
-    if (!isExpenseReport) {
+    // This should be removed when is merged https://github.com/Expensify/App/pull/58020
+    const isSingleTransaction = reportTransactions.length === 1;
+
+    if (!isExpenseReport || !isSingleTransaction) {
         return false;
     }
 
@@ -298,21 +350,19 @@ function isDeleteAction(report: Report): boolean {
     return isReportOpen || isProcessingReport || isReportApproved;
 }
 
-function getSecondaryAction(
+function getSecondaryReportActions(
     report: Report,
-    policy: Policy,
     reportTransactions: Transaction[],
     violations: OnyxCollection<TransactionViolation[]>,
+    policy?: Policy,
 ): Array<ValueOf<typeof CONST.REPORT.SECONDARY_ACTIONS>> {
     const options: Array<ValueOf<typeof CONST.REPORT.SECONDARY_ACTIONS>> = [];
-    options.push(CONST.REPORT.SECONDARY_ACTIONS.DOWNLOAD);
-    options.push(CONST.REPORT.SECONDARY_ACTIONS.VIEW_DETAILS);
 
     if (isSubmitAction(report, policy)) {
         options.push(CONST.REPORT.SECONDARY_ACTIONS.SUBMIT);
     }
 
-    if (isApproveAction(report, policy, reportTransactions, violations)) {
+    if (isApproveAction(report, reportTransactions, violations, policy)) {
         options.push(CONST.REPORT.SECONDARY_ACTIONS.APPROVE);
     }
 
@@ -320,7 +370,7 @@ function getSecondaryAction(
         options.push(CONST.REPORT.SECONDARY_ACTIONS.UNAPPROVE);
     }
 
-    if (isCancelPaymentAction(report, reportTransactions)) {
+    if (isCancelPaymentAction(report, reportTransactions, policy)) {
         options.push(CONST.REPORT.SECONDARY_ACTIONS.CANCEL_PAYMENT);
     }
 
@@ -336,15 +386,34 @@ function getSecondaryAction(
         options.push(CONST.REPORT.SECONDARY_ACTIONS.HOLD);
     }
 
-    if (isChangeWorkspaceAction(report, policy, reportTransactions, violations)) {
+    options.push(CONST.REPORT.SECONDARY_ACTIONS.DOWNLOAD);
+
+    if (isChangeWorkspaceAction(report, reportTransactions, violations, policy)) {
         options.push(CONST.REPORT.SECONDARY_ACTIONS.CHANGE_WORKSPACE);
     }
 
-    if (isDeleteAction(report)) {
+    options.push(CONST.REPORT.SECONDARY_ACTIONS.VIEW_DETAILS);
+
+    if (isDeleteAction(report, reportTransactions)) {
         options.push(CONST.REPORT.SECONDARY_ACTIONS.DELETE);
     }
 
     return options;
 }
 
-export default getSecondaryAction;
+function getSecondaryTransactionThreadActions(parentReport: Report, reportTransaction: Transaction): Array<ValueOf<typeof CONST.REPORT.TRANSACTION_SECONDARY_ACTIONS>> {
+    const options: Array<ValueOf<typeof CONST.REPORT.TRANSACTION_SECONDARY_ACTIONS>> = [];
+
+    if (isHoldActionForTransation(parentReport, reportTransaction)) {
+        options.push(CONST.REPORT.TRANSACTION_SECONDARY_ACTIONS.HOLD);
+    }
+
+    options.push(CONST.REPORT.TRANSACTION_SECONDARY_ACTIONS.VIEW_DETAILS);
+
+    if (isDeleteAction(parentReport, [reportTransaction])) {
+        options.push(CONST.REPORT.TRANSACTION_SECONDARY_ACTIONS.DELETE);
+    }
+
+    return options;
+}
+export {getSecondaryReportActions, getSecondaryTransactionThreadActions};
diff --git a/src/libs/ReportUtils.ts b/src/libs/ReportUtils.ts
index a2ed0cf247288..ddc8f864a43fe 100644
--- a/src/libs/ReportUtils.ts
+++ b/src/libs/ReportUtils.ts
@@ -10088,10 +10088,15 @@ function canBeExported(report: OnyxEntry<Report>) {
     return isExpenseReport(report) && isCorrectState;
 }
 
-function isExported(reportActions: OnyxEntry<ReportActions>) {
+function isExported(reportActions: OnyxEntry<ReportActions> | ReportAction[]) {
     if (!reportActions) {
         return false;
     }
+
+    if (Array.isArray(reportActions)) {
+        return reportActions.some((action) => isExportIntegrationAction(action));
+    }
+
     return Object.values(reportActions).some((action) => isExportIntegrationAction(action));
 }
 
@@ -10399,6 +10404,7 @@ export {
     getReportParticipantsTitle,
     getReportPreviewMessage,
     getReportRecipientAccountIDs,
+    getParentReport,
     getReportOrDraftReport,
     getRoom,
     getRootParentReport,
diff --git a/src/libs/TransactionUtils/index.ts b/src/libs/TransactionUtils/index.ts
index ef568db066a29..63a86fdf9c34a 100644
--- a/src/libs/TransactionUtils/index.ts
+++ b/src/libs/TransactionUtils/index.ts
@@ -26,18 +26,7 @@ import {
     isPolicyAdmin,
 } from '@libs/PolicyUtils';
 import {getOriginalMessage, getReportAction, isMoneyRequestAction} from '@libs/ReportActionsUtils';
-import {
-    getReportOrDraftReport,
-    getReportTransactions,
-    isCurrentUserSubmitter,
-    isOpenExpenseReport,
-    isProcessingReport,
-    isReportApproved,
-    isReportIDApproved,
-    isReportManuallyReimbursed,
-    isSettled,
-    isThread,
-} from '@libs/ReportUtils';
+import {getReportOrDraftReport, getReportTransactions, isCurrentUserSubmitter, isOpenExpenseReport, isProcessingReport, isReportIDApproved, isSettled, isThread} from '@libs/ReportUtils';
 import type {IOURequestType} from '@userActions/IOU';
 import CONST from '@src/CONST';
 import type {IOUType} from '@src/CONST';
@@ -902,15 +891,6 @@ function shouldShowBrokenConnectionViolationForMultipleTransactions(
     return shouldShowBrokenConnectionViolationInternal(brokenConnectionViolations, report, policy);
 }
 
-function checkIfShouldShowMarkAsCashButton(hasRTERVPendingViolation: boolean, shouldDisplayBrokenConnectionViolation: boolean, report: OnyxEntry<Report>, policy: OnyxEntry<Policy>) {
-    if (hasRTERVPendingViolation) {
-        return true;
-    }
-    return (
-        shouldDisplayBrokenConnectionViolation && (!isPolicyAdmin(policy) || isCurrentUserSubmitter(report?.reportID)) && !isReportApproved({report}) && !isReportManuallyReimbursed(report)
-    );
-}
-
 /**
  * Check if there is pending rter violation in all transactionViolations with given transactionIDs.
  */
@@ -1619,7 +1599,6 @@ export {
     isPerDiemRequest,
     isViolationDismissed,
     isBrokenConnectionViolation,
-    checkIfShouldShowMarkAsCashButton,
     shouldShowRTERViolationMessage,
     isPartialTransaction,
     isPendingCardOrScanningTransaction,
diff --git a/src/libs/actions/IOU.ts b/src/libs/actions/IOU.ts
index e4bac7dd3071d..3d8d50734d7ab 100644
--- a/src/libs/actions/IOU.ts
+++ b/src/libs/actions/IOU.ts
@@ -9099,7 +9099,10 @@ function unapproveExpenseReport(expenseReport: OnyxEntry<OnyxTypes.Report>) {
     API.write(WRITE_COMMANDS.UNAPPROVE_EXPENSE_REPORT, parameters, {optimisticData, successData, failureData});
 }
 
-function submitReport(expenseReport: OnyxTypes.Report) {
+function submitReport(expenseReport?: OnyxTypes.Report) {
+    if (!expenseReport) {
+        return;
+    }
     if (expenseReport.policyID && shouldRestrictUserBillableActions(expenseReport.policyID)) {
         Navigation.navigate(ROUTES.RESTRICTED_ACTION.getRoute(expenseReport.policyID));
         return;
@@ -9232,7 +9235,7 @@ function submitReport(expenseReport: OnyxTypes.Report) {
     API.write(WRITE_COMMANDS.SUBMIT_REPORT, parameters, {optimisticData, successData, failureData});
 }
 
-function cancelPayment(expenseReport: OnyxEntry<OnyxTypes.Report>, chatReport: OnyxTypes.Report, backTo?: Route) {
+function cancelPayment(expenseReport: OnyxEntry<OnyxTypes.Report>, chatReport: OnyxTypes.Report) {
     if (isEmptyObject(expenseReport)) {
         return;
     }
@@ -9377,7 +9380,6 @@ function cancelPayment(expenseReport: OnyxEntry<OnyxTypes.Report>, chatReport: O
         },
         {optimisticData, successData, failureData},
     );
-    Navigation.goBack(backTo);
     notifyNewAction(expenseReport.reportID, userAccountID);
 }
 
diff --git a/src/libs/actions/Policy/Policy.ts b/src/libs/actions/Policy/Policy.ts
index e74164eb0acdc..e9ab129b12504 100644
--- a/src/libs/actions/Policy/Policy.ts
+++ b/src/libs/actions/Policy/Policy.ts
@@ -77,7 +77,6 @@ import * as PhoneNumber from '@libs/PhoneNumber';
 import * as PolicyUtils from '@libs/PolicyUtils';
 import {goBackWhenEnableFeature, navigateToExpensifyCardPage} from '@libs/PolicyUtils';
 import * as ReportUtils from '@libs/ReportUtils';
-import {prepareOnboardingOnyxData} from '@libs/ReportUtils';
 import type {PolicySelector} from '@pages/home/sidebar/FloatingActionButtonAndPopover';
 import * as PaymentMethods from '@userActions/PaymentMethods';
 import * as PersistedRequests from '@userActions/PersistedRequests';
@@ -2090,7 +2089,7 @@ function buildPolicyData(
     };
 
     if (!introSelected?.createWorkspace && engagementChoice && shouldAddOnboardingTasks) {
-        const onboardingData = prepareOnboardingOnyxData(introSelected, engagementChoice, CONST.ONBOARDING_MESSAGES[engagementChoice], adminsChatReportID, policyID);
+        const onboardingData = ReportUtils.prepareOnboardingOnyxData(introSelected, engagementChoice, CONST.ONBOARDING_MESSAGES[engagementChoice], adminsChatReportID, policyID);
         if (!onboardingData) {
             return {successData, optimisticData, failureData, params};
         }
@@ -2456,6 +2455,7 @@ function buildOptimisticRecentlyUsedCurrencies(currency?: string) {
  *
  * @returns policyID of the workspace we have created
  */
+// eslint-disable-next-line rulesdir/no-call-actions-from-actions
 function createWorkspaceFromIOUPayment(iouReport: OnyxEntry<Report>): WorkspaceFromIOUCreationData | undefined {
     // This flow only works for IOU reports
     if (!ReportUtils.isIOUReportUsingReport(iouReport)) {
diff --git a/src/pages/ReportDetailsPage.tsx b/src/pages/ReportDetailsPage.tsx
index 999ec34839604..b2967bd261ef0 100644
--- a/src/pages/ReportDetailsPage.tsx
+++ b/src/pages/ReportDetailsPage.tsx
@@ -9,7 +9,6 @@ import FullPageNotFoundView from '@components/BlockingViews/FullPageNotFoundView
 import Button from '@components/Button';
 import ConfirmModal from '@components/ConfirmModal';
 import DecisionModal from '@components/DecisionModal';
-import DelegateNoAccessModal from '@components/DelegateNoAccessModal';
 import DisplayNames from '@components/DisplayNames';
 import FixedFooter from '@components/FixedFooter';
 import Header from '@components/Header';
@@ -29,10 +28,8 @@ import PromotedActionsBar, {PromotedActions} from '@components/PromotedActionsBa
 import RoomHeaderAvatars from '@components/RoomHeaderAvatars';
 import ScreenWrapper from '@components/ScreenWrapper';
 import ScrollView from '@components/ScrollView';
-import {useSearchContext} from '@components/Search/SearchContext';
 import Text from '@components/Text';
 import TextWithCopy from '@components/TextWithCopy';
-import useDelegateUserDetails from '@hooks/useDelegateUserDetails';
 import useLocalize from '@hooks/useLocalize';
 import useNetwork from '@hooks/useNetwork';
 import usePaginatedReportActions from '@hooks/usePaginatedReportActions';
@@ -49,9 +46,7 @@ import {getConnectedIntegration, isPolicyAdmin as isPolicyAdminUtil, isPolicyEmp
 import {getOneTransactionThreadReportID, getOriginalMessage, getTrackExpenseActionableWhisper, isDeletedAction, isMoneyRequestAction, isTrackExpenseAction} from '@libs/ReportActionsUtils';
 import {
     canDeleteCardTransactionByLiabilityType,
-    canDeleteTransaction,
     canEditReportDescription as canEditReportDescriptionUtil,
-    canHoldUnholdReportAction as canHoldUnholdReportActionUtil,
     canJoinChat,
     canLeaveChat,
     canWriteInReport,
@@ -77,7 +72,6 @@ import {
     isConciergeChatReport,
     isDefaultRoom as isDefaultRoomUtil,
     isExpenseReport as isExpenseReportUtil,
-    isExported,
     isGroupChat as isGroupChatUtil,
     isHiddenForCurrentUser,
     isInvoiceReport as isInvoiceReportUtil,
@@ -97,26 +91,15 @@ import {
     isUserCreatedPolicyRoom as isUserCreatedPolicyRoomUtil,
     navigateBackOnDeleteTransaction,
     navigateToPrivateNotes,
-    reportTransactionsSelector,
     shouldDisableRename as shouldDisableRenameUtil,
     shouldUseFullTitleToDisplay,
 } from '@libs/ReportUtils';
 import StringUtils from '@libs/StringUtils';
-import {
-    canCancelPayment,
-    cancelPayment as cancelPaymentAction,
-    canUnapproveIOU,
-    deleteMoneyRequest,
-    deleteTrackExpense,
-    getNavigationUrlAfterTrackExpenseDelete,
-    getNavigationUrlOnMoneyRequestDelete,
-    unapproveExpenseReport,
-} from '@userActions/IOU';
+import {deleteMoneyRequest, deleteTrackExpense, getNavigationUrlAfterTrackExpenseDelete, getNavigationUrlOnMoneyRequestDelete, unapproveExpenseReport} from '@userActions/IOU';
 import {
     clearAvatarErrors,
     clearPolicyRoomNameErrors,
     downloadReportPDF,
-    exportReportToCSV,
     exportReportToPDF,
     getReportPrivateNote,
     hasErrorInPrivateNotes,
@@ -181,10 +164,8 @@ function ReportDetailsPage({policies, report, route, reportMetadata}: ReportDeta
         selector: (actions) => (report?.parentReportActionID ? actions?.[report.parentReportActionID] : undefined),
     });
     const [reportNameValuePairs] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT_NAME_VALUE_PAIRS}${report?.reportID || CONST.DEFAULT_NUMBER_ID}`);
-    const [parentReportNameValuePairs] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT_NAME_VALUE_PAIRS}${report?.parentReportID || CONST.DEFAULT_NUMBER_ID}`);
     /* eslint-enable @typescript-eslint/prefer-nullish-coalescing */
     const {reportActions} = usePaginatedReportActions(report.reportID);
-    const {currentSearchHash} = useSearchContext();
 
     // We need to use isSmallScreenWidth instead of shouldUseNarrowLayout to apply the correct modal type for the decision modal
     // eslint-disable-next-line rulesdir/prefer-shouldUseNarrowLayout-instead-of-isSmallScreenWidth
@@ -197,20 +178,14 @@ function ReportDetailsPage({policies, report, route, reportMetadata}: ReportDeta
     const [isDebugModeEnabled] = useOnyx(ONYXKEYS.USER, {selector: (user) => !!user?.isDebugModeEnabled});
     const [personalDetails] = useOnyx(ONYXKEYS.PERSONAL_DETAILS_LIST);
     const [session] = useOnyx(ONYXKEYS.SESSION);
-    const [transactions] = useOnyx(ONYXKEYS.COLLECTION.TRANSACTION, {
-        selector: (_transactions) => reportTransactionsSelector(_transactions, report.reportID),
-        initialValue: [],
-    });
 
     const {removeTransaction} = useMoneyRequestReportContext(report.parentReportID);
 
     const [isLastMemberLeavingGroupModalVisible, setIsLastMemberLeavingGroupModalVisible] = useState(false);
     const [isDeleteModalVisible, setIsDeleteModalVisible] = useState(false);
     const [isUnapproveModalVisible, setIsUnapproveModalVisible] = useState(false);
-    const [isConfirmModalVisible, setIsConfirmModalVisible] = useState(false);
     const [isPDFModalVisible, setIsPDFModalVisible] = useState(false);
     const [offlineModalVisible, setOfflineModalVisible] = useState(false);
-    const [downloadErrorModalVisible, setDownloadErrorModalVisible] = useState(false);
     const policy = useMemo(() => policies?.[`${ONYXKEYS.COLLECTION.POLICY}${report?.policyID}`], [policies, report?.policyID]);
     const isPolicyAdmin = useMemo(() => isPolicyAdminUtil(policy), [policy]);
     const isPolicyEmployee = useMemo(() => isPolicyEmployeeUtil(report?.policyID, policies), [report?.policyID, policies]);
@@ -281,13 +256,6 @@ function ReportDetailsPage({policies, report, route, reportMetadata}: ReportDeta
         caseID = CASES.DEFAULT;
     }
 
-    const transactionIDList = useMemo(() => {
-        if (caseID !== CASES.MONEY_REPORT || !transactions) {
-            return [];
-        }
-        return transactions.map((transaction) => transaction.transactionID);
-    }, [caseID, transactions]);
-
     // Get the active chat members by filtering out the pending members with delete action
     const activeChatMembers = participants.flatMap((accountID) => {
         const pendingMember = reportMetadata?.pendingChatMembers?.findLast((member) => member.accountID === accountID.toString());
@@ -322,12 +290,10 @@ function ReportDetailsPage({policies, report, route, reportMetadata}: ReportDeta
         return report;
     }, [caseID, parentReport, report]);
 
-    const moneyRequestAction = transactionThreadReportID ? requestParentReportAction : parentReportAction;
-
     const canActionTask = canActionTaskAction(report, session?.accountID ?? CONST.DEFAULT_NUMBER_ID);
     const shouldShowTaskDeleteButton =
         isTaskReport && !isCanceledTaskReport && canWriteInReport(report) && report.stateNum !== CONST.REPORT.STATE_NUM.APPROVED && !isClosedReport(report) && canModifyTask && canActionTask;
-    const canDeleteRequest = isActionOwner && (canDeleteTransaction(moneyRequestReport) || isSelfDMTrackExpenseReport) && !isDeletedParentAction;
+    const canDeleteRequest = isActionOwner && isSelfDMTrackExpenseReport && !isDeletedParentAction;
     const iouTransactionID = isMoneyRequestAction(requestParentReportAction) ? getOriginalMessage(requestParentReportAction)?.IOUTransactionID : '';
     const isCardTransactionCanBeDeleted = canDeleteCardTransactionByLiabilityType(iouTransactionID);
     const shouldShowDeleteButton = shouldShowTaskDeleteButton || (canDeleteRequest && isCardTransactionCanBeDeleted);
@@ -361,22 +327,6 @@ function ReportDetailsPage({policies, report, route, reportMetadata}: ReportDeta
         });
     }, [isPolicyEmployee, isPolicyExpenseChat, isRootGroupChat, report.reportID, report.visibility]);
 
-    const [moneyRequestReportActions] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${moneyRequestReport?.reportID}`);
-    const isMoneyRequestExported = isExported(moneyRequestReportActions);
-    const {isDelegateAccessRestricted} = useDelegateUserDetails();
-    const [isNoDelegateAccessMenuVisible, setIsNoDelegateAccessMenuVisible] = useState(false);
-
-    const unapproveExpenseReportOrShowModal = useCallback(() => {
-        if (isDelegateAccessRestricted) {
-            setIsNoDelegateAccessMenuVisible(true);
-        } else if (isMoneyRequestExported) {
-            setIsUnapproveModalVisible(true);
-            return;
-        }
-        Navigation.dismissModal();
-        unapproveExpenseReport(moneyRequestReport);
-    }, [isMoneyRequestExported, moneyRequestReport, isDelegateAccessRestricted]);
-
     const shouldShowLeaveButton = canLeaveChat(report, policy);
     const shouldShowGoToWorkspace = shouldShowPolicy(policy, false, session?.email) && !policy?.isJoinRequestPending;
 
@@ -399,17 +349,6 @@ function ReportDetailsPage({policies, report, route, reportMetadata}: ReportDeta
     const shouldShowNotificationPref = !isMoneyRequestReport && !isHiddenForCurrentUser(report);
     const shouldShowWriteCapability = !isMoneyRequestReport;
     const shouldShowMenuItem = shouldShowNotificationPref || shouldShowWriteCapability || (!!report?.visibility && report.chatType !== CONST.REPORT.CHAT_TYPE.INVOICE);
-    const shouldShowCancelPaymentButton = caseID === CASES.MONEY_REPORT && canCancelPayment(moneyRequestReport, session);
-    const [chatReport] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${moneyRequestReport?.chatReportID}`);
-
-    const cancelPayment = useCallback(() => {
-        if (!chatReport) {
-            return;
-        }
-
-        cancelPaymentAction(moneyRequestReport, chatReport, backTo);
-        setIsConfirmModalVisible(false);
-    }, [moneyRequestReport, chatReport, backTo]);
 
     const beginPDFExport = useCallback(() => {
         setIsPDFModalVisible(true);
@@ -545,72 +484,22 @@ function ReportDetailsPage({policies, report, route, reportMetadata}: ReportDeta
             }
         }
 
-        if (shouldShowCancelPaymentButton) {
+        if (canUsePDFExport) {
             items.push({
-                key: CONST.REPORT_DETAILS_MENU_ITEM.CANCEL_PAYMENT,
-                icon: Expensicons.Trashcan,
-                translationKey: 'iou.cancelPayment',
-                isAnonymousAction: false,
-                action: () => setIsConfirmModalVisible(true),
-            });
-        }
-
-        if (caseID === CASES.MONEY_REPORT) {
-            items.push({
-                key: CONST.REPORT_DETAILS_MENU_ITEM.DOWNLOAD_CSV,
-                translationKey: 'common.downloadAsCSV',
-                icon: Expensicons.Table,
+                key: CONST.REPORT_DETAILS_MENU_ITEM.DOWNLOAD_PDF,
+                translationKey: 'common.downloadAsPDF',
+                icon: Expensicons.Document,
                 isAnonymousAction: false,
                 action: () => {
                     if (isOffline) {
                         setOfflineModalVisible(true);
-                        return;
+                    } else {
+                        beginPDFExport();
                     }
-
-                    exportReportToCSV({reportID: report.reportID, transactionIDList}, () => {
-                        setDownloadErrorModalVisible(true);
-                    });
-                },
-            });
-            if (canUsePDFExport) {
-                items.push({
-                    key: CONST.REPORT_DETAILS_MENU_ITEM.DOWNLOAD_PDF,
-                    translationKey: 'common.downloadAsPDF',
-                    icon: Expensicons.Document,
-                    isAnonymousAction: false,
-                    action: () => {
-                        if (isOffline) {
-                            setOfflineModalVisible(true);
-                        } else {
-                            beginPDFExport();
-                        }
-                    },
-                });
-            }
-        }
-
-        if (policy && connectedIntegration && isPolicyAdmin && !isSingleTransactionView && isExpenseReport) {
-            items.push({
-                key: CONST.REPORT_DETAILS_MENU_ITEM.EXPORT,
-                translationKey: 'common.export',
-                icon: Expensicons.Export,
-                isAnonymousAction: false,
-                action: () => {
-                    Navigation.navigate(ROUTES.REPORT_WITH_ID_DETAILS_EXPORT.getRoute(report?.reportID, connectedIntegration, backTo));
                 },
             });
         }
 
-        if (canUnapproveIOU(report, policy)) {
-            items.push({
-                key: CONST.REPORT_DETAILS_MENU_ITEM.UNAPPROVE,
-                icon: Expensicons.CircularArrowBackwards,
-                translationKey: 'iou.unapprove',
-                isAnonymousAction: false,
-                action: () => unapproveExpenseReportOrShowModal(),
-            });
-        }
-
         if (shouldShowGoToWorkspace) {
             items.push({
                 key: CONST.REPORT_DETAILS_MENU_ITEM.GO_TO_WORKSPACE,
@@ -657,8 +546,6 @@ function ReportDetailsPage({policies, report, route, reportMetadata}: ReportDeta
 
         return items;
     }, [
-        beginPDFExport,
-        canUsePDFExport,
         isSelfDM,
         isArchivedRoom,
         isGroupChat,
@@ -677,15 +564,10 @@ function ReportDetailsPage({policies, report, route, reportMetadata}: ReportDeta
         isInvoiceReport,
         isTaskReport,
         isCanceledTaskReport,
-        shouldShowCancelPaymentButton,
+        canUsePDFExport,
+        shouldShowGoToWorkspace,
         shouldShowLeaveButton,
-        policy,
-        connectedIntegration,
-        isPolicyAdmin,
-        isSingleTransactionView,
-        isExpenseReport,
         isDebugModeEnabled,
-        shouldShowGoToWorkspace,
         activeChatMembers.length,
         shouldOpenRoomMembersPage,
         backTo,
@@ -695,12 +577,10 @@ function ReportDetailsPage({policies, report, route, reportMetadata}: ReportDeta
         session,
         canModifyTask,
         canActionTask,
+        isOffline,
+        beginPDFExport,
         isRootGroupChat,
         leaveChat,
-        isOffline,
-        transactionIDList,
-        unapproveExpenseReportOrShowModal,
-        caseID,
     ]);
 
     const displayNamesWithTooltips = useMemo(() => {
@@ -774,11 +654,6 @@ function ReportDetailsPage({policies, report, route, reportMetadata}: ReportDeta
         );
     }, [report, icons, isMoneyRequestReport, isInvoiceReport, isGroupChat, isThread, styles]);
 
-    const canHoldUnholdReportAction = canHoldUnholdReportActionUtil(moneyRequestAction);
-    const shouldShowHoldAction =
-        caseID !== CASES.DEFAULT &&
-        (canHoldUnholdReportAction.canHoldRequest || canHoldUnholdReportAction.canUnholdRequest) &&
-        !isArchivedNonExpenseReport(transactionThreadReportID ? report : parentReport, transactionThreadReportID ? reportNameValuePairs : parentReportNameValuePairs);
     const canJoin = canJoinChat(report, parentReportAction, policy);
 
     const promotedActions = useMemo(() => {
@@ -788,19 +663,6 @@ function ReportDetailsPage({policies, report, route, reportMetadata}: ReportDeta
             result.push(PromotedActions.join(report));
         }
 
-        if (isExpenseReport && shouldShowHoldAction) {
-            result.push(
-                PromotedActions.hold({
-                    isTextHold: canHoldUnholdReportAction.canHoldRequest,
-                    reportAction: moneyRequestAction,
-                    reportID: transactionThreadReportID ? report.reportID : moneyRequestAction?.childReportID,
-                    isDelegateAccessRestricted,
-                    setIsNoDelegateAccessMenuVisible,
-                    currentSearchHash,
-                }),
-            );
-        }
-
         if (report) {
             result.push(PromotedActions.pin(report));
         }
@@ -808,18 +670,7 @@ function ReportDetailsPage({policies, report, route, reportMetadata}: ReportDeta
         result.push(PromotedActions.share(report, backTo));
 
         return result;
-    }, [
-        report,
-        moneyRequestAction,
-        currentSearchHash,
-        canJoin,
-        isExpenseReport,
-        shouldShowHoldAction,
-        canHoldUnholdReportAction.canHoldRequest,
-        transactionThreadReportID,
-        isDelegateAccessRestricted,
-        backTo,
-    ]);
+    }, [report, canJoin, backTo]);
 
     const nameSectionExpenseIOU = (
         <View style={[styles.reportDetailsRoomInfo, styles.mw100]}>
@@ -1102,17 +953,6 @@ function ReportDetailsPage({policies, report, route, reportMetadata}: ReportDeta
                     confirmText={translate('common.leave')}
                     cancelText={translate('common.cancel')}
                 />
-                <ConfirmModal
-                    title={translate('iou.cancelPayment')}
-                    isVisible={isConfirmModalVisible}
-                    onConfirm={cancelPayment}
-                    onCancel={() => setIsConfirmModalVisible(false)}
-                    prompt={translate('iou.cancelPaymentConfirmation')}
-                    confirmText={translate('iou.cancelPayment')}
-                    cancelText={translate('common.dismiss')}
-                    danger
-                    shouldEnableNewFocusManagement
-                />
                 <ConfirmModal
                     title={caseID === CASES.DEFAULT ? translate('task.deleteTask') : translate('iou.deleteExpense', {count: 1})}
                     isVisible={isDeleteModalVisible}
@@ -1128,10 +968,6 @@ function ReportDetailsPage({policies, report, route, reportMetadata}: ReportDeta
                     shouldEnableNewFocusManagement
                     onModalHide={navigateToTargetUrl}
                 />
-                <DelegateNoAccessModal
-                    isNoDelegateAccessMenuVisible={isNoDelegateAccessMenuVisible}
-                    onClose={() => setIsNoDelegateAccessMenuVisible(false)}
-                />
                 <ConfirmModal
                     title={translate('iou.unapproveReport')}
                     isVisible={isUnapproveModalVisible}
@@ -1155,15 +991,7 @@ function ReportDetailsPage({policies, report, route, reportMetadata}: ReportDeta
                     isVisible={offlineModalVisible}
                     onClose={() => setOfflineModalVisible(false)}
                 />
-                <DecisionModal
-                    title={translate('common.downloadFailedTitle')}
-                    prompt={translate('common.downloadFailedDescription')}
-                    isSmallScreenWidth={isSmallScreenWidth}
-                    onSecondOptionSubmit={() => setDownloadErrorModalVisible(false)}
-                    secondOptionText={translate('common.buttonConfirm')}
-                    isVisible={downloadErrorModalVisible}
-                    onClose={() => setDownloadErrorModalVisible(false)}
-                />
+
                 <Modal
                     onClose={() => setIsPDFModalVisible(false)}
                     isVisible={isPDFModalVisible}
diff --git a/src/pages/home/report/ReportDetailsExportPage.tsx b/src/pages/home/report/ReportDetailsExportPage.tsx
index c2e4df02368e2..cf63d3dccbb48 100644
--- a/src/pages/home/report/ReportDetailsExportPage.tsx
+++ b/src/pages/home/report/ReportDetailsExportPage.tsx
@@ -70,7 +70,7 @@ function ReportDetailsExportPage({route}: ReportDetailsExportPageProps) {
         },
         {
             value: CONST.REPORT.EXPORT_OPTIONS.MARK_AS_EXPORTED,
-            text: translate('workspace.common.markAsExported'),
+            text: translate('workspace.common.markAsEntered'),
             icons: [
                 {
                     source: iconToDisplay ?? '',
diff --git a/tests/actions/EnforceActionExportRestrictions.ts b/tests/actions/EnforceActionExportRestrictions.ts
index b8a64dd883d83..91d13b7fbe7cb 100644
--- a/tests/actions/EnforceActionExportRestrictions.ts
+++ b/tests/actions/EnforceActionExportRestrictions.ts
@@ -12,11 +12,6 @@ import * as Task from '@userActions/Task';
 // and prevents side-effects that you may not be aware of. It also allows each file to access Onyx data in the most performant way. More context can be found in
 // https://github.com/Expensify/App/issues/27262
 describe('ReportUtils', () => {
-    it('does not export getParentReport', () => {
-        // @ts-expect-error the test is asserting that it's undefined, so the TS error is normal
-        expect(ReportUtils.getParentReport).toBeUndefined();
-    });
-
     it('does not export getReport', () => {
         // @ts-expect-error the test is asserting that it's undefined, so the TS error is normal
         expect(ReportUtils.getReport).toBeUndefined();
diff --git a/tests/actions/ReportPreviewActionUtilsTest.ts b/tests/actions/ReportPreviewActionUtilsTest.ts
new file mode 100644
index 0000000000000..8c07c8c62957c
--- /dev/null
+++ b/tests/actions/ReportPreviewActionUtilsTest.ts
@@ -0,0 +1,174 @@
+import type {OnyxCollection} from 'react-native-onyx';
+import Onyx from 'react-native-onyx';
+// eslint-disable-next-line no-restricted-syntax
+import type * as PolicyUtils from '@libs/PolicyUtils';
+import getReportPreviewAction from '@libs/ReportPreviewActionUtils';
+// eslint-disable-next-line no-restricted-syntax
+import * as ReportUtils from '@libs/ReportUtils';
+import CONST from '@src/CONST';
+import ONYXKEYS from '@src/ONYXKEYS';
+import type {Report, ReportViolations, TransactionViolation} from '@src/types/onyx';
+import type {Connections, NetSuiteConnection} from '@src/types/onyx/Policy';
+import createRandomPolicy from '../utils/collections/policies';
+import createRandomReport from '../utils/collections/reports';
+
+const CURRENT_USER_ACCOUNT_ID = 1;
+const CURRENT_USER_EMAIL = 'tester@mail.com';
+
+const SESSION = {
+    email: CURRENT_USER_EMAIL,
+    accountID: CURRENT_USER_ACCOUNT_ID,
+};
+
+const PERSONAL_DETAILS = {
+    accountID: CURRENT_USER_ACCOUNT_ID,
+    login: CURRENT_USER_EMAIL,
+};
+
+const REPORT_ID = 1;
+const TRANSACTION_ID = 1;
+const VIOLATIONS: OnyxCollection<TransactionViolation[]> = {};
+
+jest.mock('@libs/ReportUtils', () => ({
+    ...jest.requireActual<typeof ReportUtils>('@libs/ReportUtils'),
+    hasViolations: jest.fn().mockReturnValue(false),
+    getReportTransactions: jest.fn().mockReturnValue(['mockValue']),
+}));
+jest.mock('@libs/PolicyUtils', () => ({
+    ...jest.requireActual<typeof PolicyUtils>('@libs/PolicyUtils'),
+    isPrefferedExporter: jest.fn().mockReturnValue(true),
+    hasAccountingConnections: jest.fn().mockReturnValue(true),
+}));
+
+describe('getReportPreviewAction', () => {
+    beforeAll(() => {
+        Onyx.init({
+            keys: ONYXKEYS,
+        });
+    });
+
+    beforeEach(async () => {
+        Onyx.clear();
+        await Onyx.merge(ONYXKEYS.SESSION, SESSION);
+        await Onyx.set(ONYXKEYS.PERSONAL_DETAILS_LIST, {[CURRENT_USER_ACCOUNT_ID]: PERSONAL_DETAILS});
+    });
+
+    it('canSubmit should return true for expense preview report with manual submit', async () => {
+        const report: Report = {
+            ...createRandomReport(REPORT_ID),
+            type: CONST.REPORT.TYPE.EXPENSE,
+            ownerAccountID: CURRENT_USER_ACCOUNT_ID,
+            stateNum: CONST.REPORT.STATE_NUM.OPEN,
+            statusNum: CONST.REPORT.STATUS_NUM.OPEN,
+        };
+
+        const policy = createRandomPolicy(0);
+        policy.autoReportingFrequency = CONST.POLICY.AUTO_REPORTING_FREQUENCIES.IMMEDIATE;
+        policy.type = CONST.POLICY.TYPE.CORPORATE;
+        if (policy.harvesting) {
+            policy.harvesting.enabled = false;
+        }
+        await Onyx.merge(`${ONYXKEYS.COLLECTION.REPORT}${REPORT_ID}`, report);
+
+        expect(getReportPreviewAction(VIOLATIONS, report, policy)).toBe(CONST.REPORT.REPORT_PREVIEW_ACTIONS.SUBMIT);
+    });
+
+    it('canApprove should return true for report being processed', async () => {
+        const report = {
+            ...createRandomReport(REPORT_ID),
+            type: CONST.REPORT.TYPE.EXPENSE,
+            ownerAccountID: CURRENT_USER_ACCOUNT_ID,
+            stateNum: CONST.REPORT.STATE_NUM.SUBMITTED,
+            statusNum: CONST.REPORT.STATUS_NUM.SUBMITTED,
+        };
+
+        const policy = createRandomPolicy(0);
+        policy.type = CONST.POLICY.TYPE.CORPORATE;
+        policy.approver = CURRENT_USER_EMAIL;
+        policy.approvalMode = CONST.POLICY.APPROVAL_MODE.BASIC;
+
+        await Onyx.merge(`${ONYXKEYS.COLLECTION.REPORT}${REPORT_ID}`, report);
+
+        expect(getReportPreviewAction(VIOLATIONS, report, policy)).toBe(CONST.REPORT.REPORT_PREVIEW_ACTIONS.APPROVE);
+    });
+
+    it('canPay should return true for expense report with payments enabled', async () => {
+        const report = {
+            ...createRandomReport(REPORT_ID),
+            type: CONST.REPORT.TYPE.EXPENSE,
+            ownerAccountID: CURRENT_USER_ACCOUNT_ID,
+            statusNum: CONST.REPORT.STATUS_NUM.CLOSED,
+        };
+
+        const policy = createRandomPolicy(0);
+        policy.role = CONST.POLICY.ROLE.ADMIN;
+        policy.type = CONST.POLICY.TYPE.CORPORATE;
+        policy.reimbursementChoice = CONST.POLICY.REIMBURSEMENT_CHOICES.REIMBURSEMENT_YES;
+
+        await Onyx.merge(`${ONYXKEYS.COLLECTION.REPORT}${REPORT_ID}`, report);
+
+        expect(getReportPreviewAction(VIOLATIONS, report, policy)).toBe(CONST.REPORT.REPORT_PREVIEW_ACTIONS.PAY);
+    });
+
+    it('canPay should return true for submitted invoice', async () => {
+        const report = {
+            ...createRandomReport(REPORT_ID),
+            type: CONST.REPORT.TYPE.INVOICE,
+            ownerAccountID: CURRENT_USER_ACCOUNT_ID,
+            statusNum: CONST.REPORT.STATUS_NUM.SUBMITTED,
+            stateNum: CONST.REPORT.STATE_NUM.SUBMITTED,
+        };
+
+        const policy = createRandomPolicy(0);
+        policy.role = CONST.POLICY.ROLE.ADMIN;
+        policy.type = CONST.POLICY.TYPE.CORPORATE;
+        policy.reimbursementChoice = CONST.POLICY.REIMBURSEMENT_CHOICES.REIMBURSEMENT_NO;
+
+        await Onyx.merge(`${ONYXKEYS.COLLECTION.REPORT}${REPORT_ID}`, report);
+
+        expect(getReportPreviewAction(VIOLATIONS, report, policy)).toBe(CONST.REPORT.REPORT_PREVIEW_ACTIONS.PAY);
+    });
+
+    it('canExport should return true for finished reports', async () => {
+        const report = {
+            ...createRandomReport(REPORT_ID),
+            type: CONST.REPORT.TYPE.EXPENSE,
+            ownerAccountID: CURRENT_USER_ACCOUNT_ID,
+            statusNum: CONST.REPORT.STATUS_NUM.CLOSED,
+        };
+
+        const policy = createRandomPolicy(0);
+        policy.type = CONST.POLICY.TYPE.CORPORATE;
+        policy.connections = {[CONST.POLICY.CONNECTIONS.NAME.NETSUITE]: {} as NetSuiteConnection} as Connections;
+        policy.reimbursementChoice = CONST.POLICY.REIMBURSEMENT_CHOICES.REIMBURSEMENT_NO;
+        await Onyx.merge(`${ONYXKEYS.COLLECTION.REPORT}${REPORT_ID}`, report);
+
+        expect(getReportPreviewAction(VIOLATIONS, report, policy)).toBe(CONST.REPORT.REPORT_PREVIEW_ACTIONS.EXPORT_TO_ACCOUNTING);
+    });
+
+    it('canReview should return true for reports where there are violations, user is submitter or approver and Workflows are enabled', async () => {
+        (ReportUtils.hasViolations as jest.Mock).mockReturnValue(true);
+        const report = {
+            ...createRandomReport(REPORT_ID),
+            ownerAccountID: CURRENT_USER_ACCOUNT_ID,
+        };
+
+        const policy = createRandomPolicy(0);
+        policy.areWorkflowsEnabled = true;
+        policy.type = CONST.POLICY.TYPE.CORPORATE;
+
+        await Onyx.merge(`${ONYXKEYS.COLLECTION.REPORT}${REPORT_ID}`, report);
+        const REPORT_VIOLATION = {
+            FIELD_REQUIRED: 'fieldRequired',
+        } as unknown as ReportViolations;
+        await Onyx.set(`${ONYXKEYS.COLLECTION.REPORT_VIOLATIONS}${REPORT_ID}`, REPORT_VIOLATION);
+
+        await Onyx.set(`${ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS}${TRANSACTION_ID}`, [
+            {
+                name: CONST.VIOLATIONS.OVER_LIMIT,
+            } as TransactionViolation,
+        ]);
+
+        expect(getReportPreviewAction(VIOLATIONS, report, policy)).toBe(CONST.REPORT.REPORT_PREVIEW_ACTIONS.REVIEW);
+    });
+});
diff --git a/tests/actions/ReportPrimaryActionUtilsTest.ts b/tests/unit/ReportPrimaryActionUtilsTest.ts
similarity index 55%
rename from tests/actions/ReportPrimaryActionUtilsTest.ts
rename to tests/unit/ReportPrimaryActionUtilsTest.ts
index 12c3733d5f9d2..6910c0ac3232d 100644
--- a/tests/actions/ReportPrimaryActionUtilsTest.ts
+++ b/tests/unit/ReportPrimaryActionUtilsTest.ts
@@ -1,5 +1,5 @@
 import Onyx from 'react-native-onyx';
-import getPrimaryAction from '@libs/ReportPrimaryActionUtils';
+import {getReportPrimaryAction, getTransactionThreadPrimaryAction} from '@libs/ReportPrimaryActionUtils';
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
 import type {Policy, Report, ReportAction, Transaction, TransactionViolation} from '@src/types/onyx';
@@ -46,7 +46,7 @@ describe('getPrimaryAction', () => {
         };
         await Onyx.merge(`${ONYXKEYS.COLLECTION.REPORT}${REPORT_ID}`, report);
 
-        expect(getPrimaryAction(report, policy as Policy, [], {})).toBe(CONST.REPORT.PRIMARY_ACTIONS.SUBMIT);
+        expect(getReportPrimaryAction(report, [{} as Transaction], {}, policy as Policy)).toBe(CONST.REPORT.PRIMARY_ACTIONS.SUBMIT);
     });
 
     it('should return Approve for report being processed', async () => {
@@ -69,7 +69,7 @@ describe('getPrimaryAction', () => {
             },
         } as unknown as Transaction;
 
-        expect(getPrimaryAction(report, policy as Policy, [transaction], {})).toBe(CONST.REPORT.PRIMARY_ACTIONS.APPROVE);
+        expect(getReportPrimaryAction(report, [transaction], {}, policy as Policy)).toBe(CONST.REPORT.PRIMARY_ACTIONS.APPROVE);
     });
 
     it('should return PAY for submitted invoice report', async () => {
@@ -85,7 +85,7 @@ describe('getPrimaryAction', () => {
             role: CONST.POLICY.ROLE.ADMIN,
         };
 
-        expect(getPrimaryAction(report, policy as Policy, [], {})).toBe(CONST.REPORT.PRIMARY_ACTIONS.PAY);
+        expect(getReportPrimaryAction(report, [], {}, policy as Policy)).toBe(CONST.REPORT.PRIMARY_ACTIONS.PAY);
     });
 
     it('should return PAY for expense report with payments enabled', async () => {
@@ -100,7 +100,7 @@ describe('getPrimaryAction', () => {
             role: CONST.POLICY.ROLE.ADMIN,
         };
 
-        expect(getPrimaryAction(report, policy as Policy, [], {})).toBe(CONST.REPORT.PRIMARY_ACTIONS.PAY);
+        expect(getReportPrimaryAction(report, [], {}, policy as Policy)).toBe(CONST.REPORT.PRIMARY_ACTIONS.PAY);
     });
 
     it('should return EXPORT TO ACCOUNTING for finished reports', async () => {
@@ -123,30 +123,154 @@ describe('getPrimaryAction', () => {
             },
         };
 
-        expect(getPrimaryAction(report, policy as Policy, [], {})).toBe(CONST.REPORT.PRIMARY_ACTIONS.EXPORT_TO_ACCOUNTING);
+        expect(getReportPrimaryAction(report, [], {}, policy as Policy)).toBe(CONST.REPORT.PRIMARY_ACTIONS.EXPORT_TO_ACCOUNTING);
     });
 
     it('should return REMOVE HOLD for reports with transactions on hold', async () => {
         const report = {
             reportID: REPORT_ID,
+            type: CONST.REPORT.TYPE.EXPENSE,
         } as unknown as Report;
         await Onyx.merge(`${ONYXKEYS.COLLECTION.REPORT}${REPORT_ID}`, report);
         const policy = {};
+        const HOLD_ACTION_ID = 'HOLD_ACTION_ID';
         const REPORT_ACTION_ID = 'REPORT_ACTION_ID';
+        const TRANSACTION_ID = 'TRANSACTION_ID';
+        const CHILD_REPORT_ID = 'CHILD_REPORT_ID';
         const transaction = {
+            transactionID: TRANSACTION_ID,
             comment: {
-                hold: REPORT_ACTION_ID,
+                hold: HOLD_ACTION_ID,
             },
         } as unknown as Transaction;
 
         const reportAction = {
+            actionName: CONST.REPORT.ACTIONS.TYPE.IOU,
+            type: CONST.REPORT.ACTIONS.TYPE.IOU,
             reportActionID: REPORT_ACTION_ID,
             actorAccountID: CURRENT_USER_ACCOUNT_ID,
+            childReportID: CHILD_REPORT_ID,
+            message: [
+                {
+                    html: 'html',
+                },
+            ],
+            originalMessage: {
+                type: CONST.IOU.REPORT_ACTION_TYPE.PAY,
+                IOUTransactionID: TRANSACTION_ID,
+            },
         } as unknown as ReportAction;
 
-        await Onyx.set(`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${REPORT_ID}`, {REPORT_ACTION_ID: reportAction});
+        const holdAction = {
+            reportActionID: HOLD_ACTION_ID,
+            reportID: CHILD_REPORT_ID,
+            actorAccountID: CURRENT_USER_ACCOUNT_ID,
+        };
+
+        await Onyx.set(`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${REPORT_ID}`, {[REPORT_ACTION_ID]: reportAction});
+        await Onyx.set(`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${CHILD_REPORT_ID}`, {[HOLD_ACTION_ID]: holdAction});
+
+        expect(getReportPrimaryAction(report, [transaction], {}, policy as Policy)).toBe(CONST.REPORT.PRIMARY_ACTIONS.REMOVE_HOLD);
+    });
+
+    it('should return MARK AS CASH if has all RTER violations', async () => {
+        const report = {
+            reportID: REPORT_ID,
+            type: CONST.REPORT.TYPE.EXPENSE,
+            ownerAccountID: CURRENT_USER_ACCOUNT_ID,
+            stateNum: CONST.REPORT.STATE_NUM.OPEN,
+            statusNum: CONST.REPORT.STATUS_NUM.OPEN,
+        } as unknown as Report;
+        await Onyx.merge(`${ONYXKEYS.COLLECTION.REPORT}${REPORT_ID}`, report);
+        const policy = {};
+        const TRANSACTION_ID = 'TRANSACTION_ID';
+
+        const transaction = {
+            transactionID: TRANSACTION_ID,
+        } as unknown as Transaction;
+
+        const violation = {
+            name: CONST.VIOLATIONS.RTER,
+            data: {
+                pendingPattern: true,
+                rterType: CONST.RTER_VIOLATION_TYPES.SEVEN_DAY_HOLD,
+            },
+        } as unknown as TransactionViolation;
+
+        expect(getReportPrimaryAction(report, [transaction], {[`${ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS}${TRANSACTION_ID}`]: [violation]}, policy as Policy)).toBe(
+            CONST.REPORT.PRIMARY_ACTIONS.MARK_AS_CASH,
+        );
+    });
+
+    it('should return MARK AS CASH for broken connection', async () => {
+        const report = {
+            reportID: REPORT_ID,
+            ownerAccountID: CURRENT_USER_ACCOUNT_ID,
+            stateNum: CONST.REPORT.STATE_NUM.OPEN,
+            statusNum: CONST.REPORT.STATUS_NUM.OPEN,
+            type: CONST.REPORT.TYPE.EXPENSE,
+        } as unknown as Report;
+        await Onyx.merge(`${ONYXKEYS.COLLECTION.REPORT}${REPORT_ID}`, report);
+        const policy = {};
+        const TRANSACTION_ID = 'TRANSACTION_ID';
+
+        const transaction = {
+            transactionID: TRANSACTION_ID,
+        } as unknown as Transaction;
+
+        const violation = {
+            name: CONST.VIOLATIONS.RTER,
+            data: {
+                rterType: CONST.RTER_VIOLATION_TYPES.BROKEN_CARD_CONNECTION,
+            },
+        } as unknown as TransactionViolation;
+
+        expect(getReportPrimaryAction(report, [transaction], {[`${ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS}${TRANSACTION_ID}`]: [violation]}, policy as Policy)).toBe(
+            CONST.REPORT.PRIMARY_ACTIONS.MARK_AS_CASH,
+        );
+    });
+});
 
-        expect(getPrimaryAction(report, policy as Policy, [transaction], {})).toBe(CONST.REPORT.PRIMARY_ACTIONS.REMOVE_HOLD);
+describe('getTransactionThreadPrimaryAction', () => {
+    beforeAll(() => {
+        Onyx.init({
+            keys: ONYXKEYS,
+        });
+    });
+
+    beforeEach(async () => {
+        jest.clearAllMocks();
+        Onyx.clear();
+        await Onyx.merge(ONYXKEYS.SESSION, SESSION);
+        await Onyx.set(ONYXKEYS.PERSONAL_DETAILS_LIST, {[CURRENT_USER_ACCOUNT_ID]: PERSONAL_DETAILS});
+    });
+
+    it('should return REMOVE HOLD for transaction thread being on hold', async () => {
+        const policy = {};
+        const HOLD_ACTION_ID = 'HOLD_ACTION_ID';
+        const TRANSACTION_ID = 'TRANSACTION_ID';
+        const CHILD_REPORT_ID = 'CHILD_REPORT_ID';
+        const report = {
+            reportID: CHILD_REPORT_ID,
+            type: CONST.REPORT.TYPE.EXPENSE,
+        } as unknown as Report;
+
+        const transaction = {
+            transactionID: TRANSACTION_ID,
+            comment: {
+                hold: HOLD_ACTION_ID,
+            },
+        } as unknown as Transaction;
+
+        const holdAction = {
+            reportActionID: HOLD_ACTION_ID,
+            reportID: CHILD_REPORT_ID,
+            actorAccountID: CURRENT_USER_ACCOUNT_ID,
+        };
+
+        await Onyx.set(`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${CHILD_REPORT_ID}`, {[HOLD_ACTION_ID]: holdAction});
+
+        expect(getTransactionThreadPrimaryAction(report, {} as Report, transaction, [], policy as Policy)).toBe(CONST.REPORT.TRANSACTION_PRIMARY_ACTIONS.REMOVE_HOLD);
     });
 
     it('should return REVIEW DUPLICATES when there are duplicated transactions', async () => {
@@ -168,19 +292,19 @@ describe('getPrimaryAction', () => {
         } as unknown as Transaction;
 
         await Onyx.merge(`${ONYXKEYS.COLLECTION.TRANSACTION}${TRANSACTION_ID}`, transaction);
-
         await Onyx.set(`${ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS}${TRANSACTION_ID}`, [
             {
                 name: CONST.VIOLATIONS.DUPLICATED_TRANSACTION,
             } as TransactionViolation,
         ]);
 
-        expect(getPrimaryAction(report, policy as Policy, [transaction], {})).toBe(CONST.REPORT.PRIMARY_ACTIONS.REVIEW_DUPLICATES);
+        expect(getTransactionThreadPrimaryAction({} as Report, report, transaction, [], policy as Policy)).toBe(CONST.REPORT.TRANSACTION_PRIMARY_ACTIONS.REVIEW_DUPLICATES);
     });
 
     it('should return MARK AS CASH if has all RTER violations', async () => {
         const report = {
             reportID: REPORT_ID,
+            type: CONST.REPORT.TYPE.EXPENSE,
             ownerAccountID: CURRENT_USER_ACCOUNT_ID,
             stateNum: CONST.REPORT.STATE_NUM.OPEN,
             statusNum: CONST.REPORT.STATUS_NUM.OPEN,
@@ -201,9 +325,8 @@ describe('getPrimaryAction', () => {
             },
         } as unknown as TransactionViolation;
 
-        expect(getPrimaryAction(report, policy as Policy, [transaction], {[`${ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS}${TRANSACTION_ID}`]: [violation]})).toBe(
-            CONST.REPORT.PRIMARY_ACTIONS.MARK_AS_CASH,
-        );
+        getTransactionThreadPrimaryAction({} as Report, report, transaction, [violation], policy as Policy);
+        expect(getTransactionThreadPrimaryAction({} as Report, report, transaction, [violation], policy as Policy)).toBe(CONST.REPORT.TRANSACTION_PRIMARY_ACTIONS.MARK_AS_CASH);
     });
 
     it('should return MARK AS CASH for broken connection', async () => {
@@ -229,8 +352,6 @@ describe('getPrimaryAction', () => {
             },
         } as unknown as TransactionViolation;
 
-        expect(getPrimaryAction(report, policy as Policy, [transaction], {[`${ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS}${TRANSACTION_ID}`]: [violation]})).toBe(
-            CONST.REPORT.PRIMARY_ACTIONS.MARK_AS_CASH,
-        );
+        expect(getTransactionThreadPrimaryAction({} as Report, report, transaction, [violation], policy as Policy)).toBe(CONST.REPORT.TRANSACTION_PRIMARY_ACTIONS.MARK_AS_CASH);
     });
 });
diff --git a/tests/unit/ReportSecondaryActionUtilsTest.ts b/tests/unit/ReportSecondaryActionUtilsTest.ts
index 560a6003e6b71..99f4458cd8a1d 100644
--- a/tests/unit/ReportSecondaryActionUtilsTest.ts
+++ b/tests/unit/ReportSecondaryActionUtilsTest.ts
@@ -1,5 +1,5 @@
 import Onyx from 'react-native-onyx';
-import getSecondaryAction from '@libs/ReportSecondaryActionUtils';
+import {getSecondaryReportActions, getSecondaryTransactionThreadActions} from '@libs/ReportSecondaryActionUtils';
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
 import type {Policy, Report, ReportAction, Transaction, TransactionViolation} from '@src/types/onyx';
@@ -18,6 +18,8 @@ const PERSONAL_DETAILS = {
 };
 
 const REPORT_ID = 1;
+const POLICY_ID = 'POLICY_ID';
+const POLICY_ID2 = 'POLICY_ID2';
 
 describe('getSecondaryAction', () => {
     beforeAll(() => {
@@ -36,10 +38,9 @@ describe('getSecondaryAction', () => {
     it('should always return default options', () => {
         const report = {} as unknown as Report;
         const policy = {} as unknown as Policy;
-        // await Onyx.merge(`${ONYXKEYS.COLLECTION.REPORT}${REPORT_ID}`, report);
 
         const result = [CONST.REPORT.SECONDARY_ACTIONS.DOWNLOAD, CONST.REPORT.SECONDARY_ACTIONS.VIEW_DETAILS];
-        expect(getSecondaryAction(report, policy, [], {})).toEqual(result);
+        expect(getSecondaryReportActions(report, [], {}, policy)).toEqual(result);
     });
 
     it('includes SUBMIT option', async () => {
@@ -58,7 +59,7 @@ describe('getSecondaryAction', () => {
         } as unknown as Policy;
         await Onyx.merge(`${ONYXKEYS.COLLECTION.REPORT}${REPORT_ID}`, report);
 
-        const result = getSecondaryAction(report, policy, [], {});
+        const result = getSecondaryReportActions(report, [], {}, policy);
         expect(result.includes(CONST.REPORT.SECONDARY_ACTIONS.SUBMIT)).toBe(true);
     });
 
@@ -88,7 +89,7 @@ describe('getSecondaryAction', () => {
 
         await Onyx.merge(`${ONYXKEYS.COLLECTION.REPORT}${REPORT_ID}`, report);
 
-        const result = getSecondaryAction(report, policy, [transaction], {});
+        const result = getSecondaryReportActions(report, [transaction], {}, policy);
         expect(result.includes(CONST.REPORT.SECONDARY_ACTIONS.APPROVE)).toBe(true);
     });
 
@@ -113,7 +114,7 @@ describe('getSecondaryAction', () => {
             },
         } as unknown as TransactionViolation;
 
-        const result = getSecondaryAction(report, policy, [transaction], {[`${ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS}${TRANSACTION_ID}`]: [violation]});
+        const result = getSecondaryReportActions(report, [transaction], {[`${ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS}${TRANSACTION_ID}`]: [violation]}, policy);
         expect(result.includes(CONST.REPORT.SECONDARY_ACTIONS.APPROVE)).toBe(true);
     });
 
@@ -139,7 +140,7 @@ describe('getSecondaryAction', () => {
             },
         } as unknown as TransactionViolation;
 
-        const result = getSecondaryAction(report, policy, [transaction], {[`${ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS}${TRANSACTION_ID}`]: [violation]});
+        const result = getSecondaryReportActions(report, [transaction], {[`${ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS}${TRANSACTION_ID}`]: [violation]}, policy);
         expect(result.includes(CONST.REPORT.SECONDARY_ACTIONS.APPROVE)).toBe(true);
     });
 
@@ -153,7 +154,7 @@ describe('getSecondaryAction', () => {
         } as unknown as Report;
         const policy = {approver: CURRENT_USER_EMAIL} as unknown as Policy;
 
-        const result = getSecondaryAction(report, policy, [], {});
+        const result = getSecondaryReportActions(report, [], {}, policy);
         expect(result.includes(CONST.REPORT.SECONDARY_ACTIONS.UNAPPROVE)).toBe(true);
     });
 
@@ -165,9 +166,11 @@ describe('getSecondaryAction', () => {
             stateNum: CONST.REPORT.STATE_NUM.APPROVED,
             statusNum: CONST.REPORT.STATUS_NUM.REIMBURSED,
         } as unknown as Report;
-        const policy = {} as unknown as Policy;
+        const policy = {
+            role: CONST.POLICY.ROLE.ADMIN,
+        } as unknown as Policy;
 
-        const result = getSecondaryAction(report, policy, [], {});
+        const result = getSecondaryReportActions(report, [], {}, policy);
         expect(result.includes(CONST.REPORT.SECONDARY_ACTIONS.CANCEL_PAYMENT)).toBe(true);
     });
 
@@ -178,7 +181,7 @@ describe('getSecondaryAction', () => {
             ownerAccountID: CURRENT_USER_ACCOUNT_ID,
             statusNum: CONST.REPORT.STATUS_NUM.REIMBURSED,
         } as unknown as Report;
-        const policy = {} as unknown as Policy;
+        const policy = {role: CONST.POLICY.ROLE.ADMIN} as unknown as Policy;
         const TRANSACTION_ID = 'transaction_id';
         await Onyx.merge(`${ONYXKEYS.COLLECTION.REPORT}${REPORT_ID}`, report);
 
@@ -194,15 +197,15 @@ describe('getSecondaryAction', () => {
         } as unknown as ReportAction;
         await Onyx.merge(`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${REPORT_ID}`, {[ACTION_ID]: reportAction});
 
-        const result = getSecondaryAction(
+        const result = getSecondaryReportActions(
             report,
-            policy,
             [
                 {
                     transactionID: TRANSACTION_ID,
                 } as unknown as Transaction,
             ],
             {},
+            policy,
         );
         expect(result.includes(CONST.REPORT.SECONDARY_ACTIONS.CANCEL_PAYMENT)).toBe(true);
     });
@@ -213,10 +216,14 @@ describe('getSecondaryAction', () => {
             type: CONST.REPORT.TYPE.INVOICE,
             ownerAccountID: CURRENT_USER_ACCOUNT_ID,
         } as unknown as Report;
-        const policy = {} as unknown as Policy;
+        const policy = {
+            connections: {
+                [CONST.POLICY.CONNECTIONS.NAME.QBO]: {},
+            },
+        } as unknown as Policy;
         await Onyx.merge(`${ONYXKEYS.COLLECTION.REPORT}${REPORT_ID}`, report);
 
-        const result = getSecondaryAction(report, policy, [], {});
+        const result = getSecondaryReportActions(report, [], {}, policy);
         expect(result.includes(CONST.REPORT.SECONDARY_ACTIONS.EXPORT_TO_ACCOUNTING)).toBe(true);
     });
 
@@ -234,7 +241,7 @@ describe('getSecondaryAction', () => {
             connections: {[CONST.POLICY.CONNECTIONS.NAME.QBD]: {}},
         } as unknown as Policy;
 
-        const result = getSecondaryAction(report, policy, [], {});
+        const result = getSecondaryReportActions(report, [], {}, policy);
         expect(result.includes(CONST.REPORT.SECONDARY_ACTIONS.EXPORT_TO_ACCOUNTING)).toBe(true);
     });
 
@@ -251,7 +258,7 @@ describe('getSecondaryAction', () => {
             connections: {[CONST.POLICY.CONNECTIONS.NAME.QBD]: {config: {autosync: {enabled: true}}}},
         } as unknown as Policy;
 
-        const result = getSecondaryAction(report, policy, [], {});
+        const result = getSecondaryReportActions(report, [], {}, policy);
         expect(result.includes(CONST.REPORT.SECONDARY_ACTIONS.EXPORT_TO_ACCOUNTING)).toBe(true);
     });
 
@@ -261,10 +268,12 @@ describe('getSecondaryAction', () => {
             type: CONST.REPORT.TYPE.INVOICE,
             ownerAccountID: CURRENT_USER_ACCOUNT_ID,
         } as unknown as Report;
-        const policy = {} as unknown as Policy;
+        const policy = {
+            connections: {[CONST.POLICY.CONNECTIONS.NAME.QBD]: {}},
+        } as unknown as Policy;
         await Onyx.merge(`${ONYXKEYS.COLLECTION.REPORT}${REPORT_ID}`, report);
 
-        const result = getSecondaryAction(report, policy, [], {});
+        const result = getSecondaryReportActions(report, [], {}, policy);
         expect(result.includes(CONST.REPORT.SECONDARY_ACTIONS.MARK_AS_EXPORTED)).toBe(true);
     });
 
@@ -279,9 +288,10 @@ describe('getSecondaryAction', () => {
         const policy = {
             role: CONST.POLICY.ROLE.ADMIN,
             reimbursementChoice: CONST.POLICY.REIMBURSEMENT_CHOICES.REIMBURSEMENT_YES,
+            connections: {[CONST.POLICY.CONNECTIONS.NAME.QBD]: {}},
         } as unknown as Policy;
 
-        const result = getSecondaryAction(report, policy, [], {});
+        const result = getSecondaryReportActions(report, [], {}, policy);
         expect(result.includes(CONST.REPORT.SECONDARY_ACTIONS.MARK_AS_EXPORTED)).toBe(true);
     });
 
@@ -298,7 +308,7 @@ describe('getSecondaryAction', () => {
             connections: {[CONST.POLICY.CONNECTIONS.NAME.QBD]: {config: {autosync: {enabled: true}}}},
         } as unknown as Policy;
 
-        const result = getSecondaryAction(report, policy, [], {});
+        const result = getSecondaryReportActions(report, [], {}, policy);
         expect(result.includes(CONST.REPORT.SECONDARY_ACTIONS.MARK_AS_EXPORTED)).toBe(true);
     });
 
@@ -311,10 +321,10 @@ describe('getSecondaryAction', () => {
             statusNum: CONST.REPORT.STATUS_NUM.APPROVED,
         } as unknown as Report;
         const policy = {
-            connections: {[CONST.POLICY.CONNECTIONS.NAME.QBD]: {config: {export: {exporter: CURRENT_USER_EMAIL}}}},
+            connections: {[CONST.POLICY.CONNECTIONS.NAME.QBD]: {config: {export: {exporter: CURRENT_USER_EMAIL}, autoSync: {enabled: true}}}},
         } as unknown as Policy;
 
-        const result = getSecondaryAction(report, policy, [], {});
+        const result = getSecondaryReportActions(report, [], {}, policy);
         expect(result.includes(CONST.REPORT.SECONDARY_ACTIONS.MARK_AS_EXPORTED)).toBe(true);
     });
 
@@ -323,12 +333,16 @@ describe('getSecondaryAction', () => {
             reportID: REPORT_ID,
             type: CONST.REPORT.TYPE.EXPENSE,
             ownerAccountID: CURRENT_USER_ACCOUNT_ID,
-            stateNum: CONST.REPORT.STATE_NUM.APPROVED,
-            statusNum: CONST.REPORT.STATUS_NUM.APPROVED,
+            stateNum: CONST.REPORT.STATE_NUM.SUBMITTED,
+            statusNum: CONST.REPORT.STATUS_NUM.SUBMITTED,
         } as unknown as Report;
+
+        const transaction = {
+            comment: {},
+        } as unknown as Transaction;
         const policy = {} as unknown as Policy;
 
-        const result = getSecondaryAction(report, policy, [], {});
+        const result = getSecondaryReportActions(report, [transaction], {}, policy);
         expect(result.includes(CONST.REPORT.SECONDARY_ACTIONS.HOLD)).toBe(true);
     });
 
@@ -339,12 +353,22 @@ describe('getSecondaryAction', () => {
             ownerAccountID: CURRENT_USER_ACCOUNT_ID,
             statusNum: CONST.REPORT.STATUS_NUM.CLOSED,
         } as unknown as Report;
+
         const policy = {
+            id: POLICY_ID,
+            employeeList: {[CURRENT_USER_EMAIL]: {}},
             areWorkflowsEnabled: false,
         } as unknown as Policy;
+        const policy2 = {
+            id: POLICY_ID2,
+            ownerAccountID: CURRENT_USER_ACCOUNT_ID,
+            employeeList: {[CURRENT_USER_EMAIL]: {}},
+        };
         await Onyx.merge(`${ONYXKEYS.COLLECTION.REPORT}${REPORT_ID}`, report);
+        await Onyx.merge(`${ONYXKEYS.COLLECTION.POLICY}${POLICY_ID}`, policy);
+        await Onyx.merge(`${ONYXKEYS.COLLECTION.POLICY}${POLICY_ID2}`, policy2);
 
-        const result = getSecondaryAction(report, policy, [], {});
+        const result = getSecondaryReportActions(report, [], {}, policy);
         expect(result.includes(CONST.REPORT.SECONDARY_ACTIONS.CHANGE_WORKSPACE)).toBe(true);
     });
 
@@ -356,14 +380,26 @@ describe('getSecondaryAction', () => {
             statusNum: CONST.REPORT.STATUS_NUM.OPEN,
             stateNum: CONST.REPORT.STATE_NUM.OPEN,
         } as unknown as Report;
-        const policy = {} as unknown as Policy;
+        const policy = {
+            id: POLICY_ID,
+            employeeList: {[CURRENT_USER_EMAIL]: {}},
+        } as unknown as Policy;
+        await Onyx.merge(`${ONYXKEYS.COLLECTION.POLICY}${POLICY_ID}`, policy);
+
+        const policy2 = {
+            id: POLICY_ID2,
+            ownerAccountID: CURRENT_USER_ACCOUNT_ID,
+            employeeList: {[CURRENT_USER_EMAIL]: {}},
+        };
+        await Onyx.merge(`${ONYXKEYS.COLLECTION.POLICY}${POLICY_ID2}`, policy2);
+
         await Onyx.merge(`${ONYXKEYS.COLLECTION.REPORT}${REPORT_ID}`, report);
 
-        const result = getSecondaryAction(report, policy, [], {});
+        const result = getSecondaryReportActions(report, [], {}, policy);
         expect(result.includes(CONST.REPORT.SECONDARY_ACTIONS.CHANGE_WORKSPACE)).toBe(true);
     });
 
-    it('includes CHANGE_WORKSPACE option for opened expense report submitter', () => {
+    it('includes CHANGE_WORKSPACE option for opened expense report submitter', async () => {
         const report = {
             reportID: REPORT_ID,
             type: CONST.REPORT.TYPE.EXPENSE,
@@ -372,14 +408,24 @@ describe('getSecondaryAction', () => {
             stateNum: CONST.REPORT.STATE_NUM.SUBMITTED,
         } as unknown as Report;
         const policy = {
+            id: POLICY_ID,
+            employeeList: {[CURRENT_USER_EMAIL]: {}},
             approver: CURRENT_USER_EMAIL,
         } as unknown as Policy;
+        await Onyx.merge(`${ONYXKEYS.COLLECTION.POLICY}${POLICY_ID}`, policy);
+
+        const policy2 = {
+            id: POLICY_ID2,
+            ownerAccountID: CURRENT_USER_ACCOUNT_ID,
+            employeeList: {[CURRENT_USER_EMAIL]: {}},
+        };
+        await Onyx.merge(`${ONYXKEYS.COLLECTION.POLICY}${POLICY_ID2}`, policy2);
 
-        const result = getSecondaryAction(report, policy, [], {});
+        const result = getSecondaryReportActions(report, [], {}, policy);
         expect(result.includes(CONST.REPORT.SECONDARY_ACTIONS.CHANGE_WORKSPACE)).toBe(true);
     });
 
-    it('includes CHANGE_WORKSPACE option for approved expense report payer', () => {
+    it('includes CHANGE_WORKSPACE option for approved expense report payer', async () => {
         const report = {
             reportID: REPORT_ID,
             type: CONST.REPORT.TYPE.EXPENSE,
@@ -388,14 +434,24 @@ describe('getSecondaryAction', () => {
             stateNum: CONST.REPORT.STATE_NUM.APPROVED,
         } as unknown as Report;
         const policy = {
+            id: POLICY_ID,
+            employeeList: {[CURRENT_USER_EMAIL]: {}},
             role: CONST.POLICY.ROLE.ADMIN,
         } as unknown as Policy;
+        await Onyx.merge(`${ONYXKEYS.COLLECTION.POLICY}${POLICY_ID}`, policy);
+
+        const policy2 = {
+            id: POLICY_ID2,
+            ownerAccountID: CURRENT_USER_ACCOUNT_ID,
+            employeeList: {[CURRENT_USER_EMAIL]: {}},
+        };
+        await Onyx.merge(`${ONYXKEYS.COLLECTION.POLICY}${POLICY_ID2}`, policy2);
 
-        const result = getSecondaryAction(report, policy, [], {});
+        const result = getSecondaryReportActions(report, [], {}, policy);
         expect(result.includes(CONST.REPORT.SECONDARY_ACTIONS.CHANGE_WORKSPACE)).toBe(true);
     });
 
-    it('includes CHANGE_WORKSPACE option for not exported expense report admin', () => {
+    it('includes CHANGE_WORKSPACE option for not exported expense report admin', async () => {
         const report = {
             reportID: REPORT_ID,
             type: CONST.REPORT.TYPE.EXPENSE,
@@ -403,10 +459,20 @@ describe('getSecondaryAction', () => {
             statusNum: CONST.REPORT.STATUS_NUM.REIMBURSED,
         } as unknown as Report;
         const policy = {
+            id: POLICY_ID,
+            employeeList: {[CURRENT_USER_EMAIL]: {}},
             role: CONST.POLICY.ROLE.ADMIN,
         } as unknown as Policy;
+        await Onyx.merge(`${ONYXKEYS.COLLECTION.POLICY}${POLICY_ID}`, policy);
+
+        const policy2 = {
+            id: POLICY_ID2,
+            ownerAccountID: CURRENT_USER_ACCOUNT_ID,
+            employeeList: {[CURRENT_USER_EMAIL]: {}},
+        };
+        await Onyx.merge(`${ONYXKEYS.COLLECTION.POLICY}${POLICY_ID2}`, policy2);
 
-        const result = getSecondaryAction(report, policy, [], {});
+        const result = getSecondaryReportActions(report, [], {}, policy);
         expect(result.includes(CONST.REPORT.SECONDARY_ACTIONS.CHANGE_WORKSPACE)).toBe(true);
     });
 
@@ -417,14 +483,21 @@ describe('getSecondaryAction', () => {
             managerID: CURRENT_USER_ACCOUNT_ID,
             statusNum: CONST.REPORT.STATUS_NUM.REIMBURSED,
         } as unknown as Report;
-        const POLICY_ID = 'policyID';
         const policy = {
-            policyID: POLICY_ID,
-            type: CONST.POLICY.TYPE.TEAM,
+            id: POLICY_ID,
+            ownerAccountID: CURRENT_USER_ACCOUNT_ID,
+            employeeList: {[CURRENT_USER_EMAIL]: {}},
         } as unknown as Policy;
         await Onyx.merge(`${ONYXKEYS.COLLECTION.POLICY}${POLICY_ID}`, policy);
 
-        const result = getSecondaryAction(report, {} as Policy, [], {});
+        const policy2 = {
+            id: POLICY_ID2,
+            ownerAccountID: CURRENT_USER_ACCOUNT_ID,
+            employeeList: {[CURRENT_USER_EMAIL]: {}},
+        };
+        await Onyx.merge(`${ONYXKEYS.COLLECTION.POLICY}${POLICY_ID2}`, policy2);
+
+        const result = getSecondaryReportActions(report, [], {}, policy);
         expect(result.includes(CONST.REPORT.SECONDARY_ACTIONS.CHANGE_WORKSPACE)).toBe(true);
     });
 
@@ -439,7 +512,61 @@ describe('getSecondaryAction', () => {
         const policy = {} as unknown as Policy;
         await Onyx.merge(`${ONYXKEYS.COLLECTION.REPORT}${REPORT_ID}`, report);
 
-        const result = getSecondaryAction(report, policy, [], {});
+        const result = getSecondaryReportActions(report, [{} as Transaction], {}, policy);
+        expect(result.includes(CONST.REPORT.SECONDARY_ACTIONS.DELETE)).toBe(true);
+    });
+});
+
+describe('getSecondaryTransactionThreadActions', () => {
+    beforeAll(() => {
+        Onyx.init({
+            keys: ONYXKEYS,
+        });
+    });
+
+    beforeEach(async () => {
+        jest.clearAllMocks();
+        Onyx.clear();
+        await Onyx.merge(ONYXKEYS.SESSION, SESSION);
+        await Onyx.set(ONYXKEYS.PERSONAL_DETAILS_LIST, {[CURRENT_USER_ACCOUNT_ID]: PERSONAL_DETAILS});
+    });
+
+    it('should always return VIEW_DETAILS', () => {
+        const report = {} as unknown as Report;
+
+        const result = [CONST.REPORT.TRANSACTION_SECONDARY_ACTIONS.VIEW_DETAILS];
+        expect(getSecondaryTransactionThreadActions(report, {} as Transaction)).toEqual(result);
+    });
+
+    it('include HOLD option ', () => {
+        const report = {
+            reportID: REPORT_ID,
+            type: CONST.REPORT.TYPE.EXPENSE,
+            ownerAccountID: CURRENT_USER_ACCOUNT_ID,
+            stateNum: CONST.REPORT.STATE_NUM.SUBMITTED,
+            statusNum: CONST.REPORT.STATUS_NUM.SUBMITTED,
+        } as unknown as Report;
+
+        const transaction = {
+            comment: {},
+        } as unknown as Transaction;
+
+        const result = getSecondaryTransactionThreadActions(report, transaction);
+        expect(result.includes(CONST.REPORT.SECONDARY_ACTIONS.HOLD)).toBe(true);
+    });
+
+    it('include DELETE option for expense report submitter', async () => {
+        const report = {
+            reportID: REPORT_ID,
+            type: CONST.REPORT.TYPE.EXPENSE,
+            ownerAccountID: CURRENT_USER_ACCOUNT_ID,
+            statusNum: CONST.REPORT.STATUS_NUM.OPEN,
+            stateNum: CONST.REPORT.STATE_NUM.OPEN,
+        } as unknown as Report;
+
+        await Onyx.merge(`${ONYXKEYS.COLLECTION.REPORT}${REPORT_ID}`, report);
+
+        const result = getSecondaryTransactionThreadActions(report, {} as Transaction);
         expect(result.includes(CONST.REPORT.SECONDARY_ACTIONS.DELETE)).toBe(true);
     });
 });

From ba3eb2924c1e88dc0a635c86efab1e13762475f9 Mon Sep 17 00:00:00 2001
From: Jakub Szymczak <szymczak.jakub12@gmail.com>
Date: Thu, 10 Apr 2025 11:55:18 +0200
Subject: [PATCH 06/42] fix 'Download as PDF' option is shown for DM thread

---
 src/pages/ReportDetailsPage.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/ReportDetailsPage.tsx b/src/pages/ReportDetailsPage.tsx
index b2967bd261ef0..358e2163d4ef6 100644
--- a/src/pages/ReportDetailsPage.tsx
+++ b/src/pages/ReportDetailsPage.tsx
@@ -484,7 +484,7 @@ function ReportDetailsPage({policies, report, route, reportMetadata}: ReportDeta
             }
         }
 
-        if (canUsePDFExport) {
+        if (canUsePDFExport && caseID === CASES.MONEY_REPORT) {
             items.push({
                 key: CONST.REPORT_DETAILS_MENU_ITEM.DOWNLOAD_PDF,
                 translationKey: 'common.downloadAsPDF',

From 228fc50ecf79a41d7ba142c19d66718539b91b87 Mon Sep 17 00:00:00 2001
From: Jakub Szymczak <szymczak.jakub12@gmail.com>
Date: Thu, 10 Apr 2025 12:59:04 +0200
Subject: [PATCH 07/42] fix No warning is shown when unapproving an expense
 that has been exported to QBO

---
 src/components/MoneyReportHeader.tsx | 31 ++++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)

diff --git a/src/components/MoneyReportHeader.tsx b/src/components/MoneyReportHeader.tsx
index 203e2bc5cc989..e4a985a299129 100644
--- a/src/components/MoneyReportHeader.tsx
+++ b/src/components/MoneyReportHeader.tsx
@@ -96,6 +96,7 @@ import {useMoneyRequestReportContext} from './MoneyRequestReportView/MoneyReques
 import type {ActionHandledType} from './ProcessMoneyReportHoldMenu';
 import ProcessMoneyReportHoldMenu from './ProcessMoneyReportHoldMenu';
 import AnimatedSettlementButton from './SettlementButton/AnimatedSettlementButton';
+import Text from './Text';
 
 type MoneyReportHeaderProps = {
     /** The report currently being looked at */
@@ -149,6 +150,7 @@ function MoneyReportHeader({policy, report: moneyRequestReport, transactionThrea
     const [downloadErrorModalVisible, setDownloadErrorModalVisible] = useState(false);
     const [isCancelPaymentModalVisible, setIsCancelPaymentModalVisible] = useState(false);
     const [isDeleteModalVisible, setIsDeleteModalVisible] = useState(false);
+    const [isUnapproveModalVisible, setIsUnapproveModalVisible] = useState(false);
 
     const {isPaidAnimationRunning, isApprovedAnimationRunning, startAnimation, stopAnimation, startApprovedAnimation} = usePaymentAnimations();
     const styles = useThemeStyles();
@@ -594,6 +596,11 @@ function MoneyReportHeader({policy, report: moneyRequestReport, transactionThrea
                     return;
                 }
 
+                if (isExported) {
+                    setIsUnapproveModalVisible(true);
+                    return;
+                }
+
                 unapproveExpenseReport(moneyRequestReport);
             },
         },
@@ -669,6 +676,17 @@ function MoneyReportHeader({policy, report: moneyRequestReport, transactionThrea
 
     const isMoreContentShown = shouldShowNextStep || !!statusBarProps;
 
+    const connectedIntegrationName = connectedIntegration ? translate('workspace.accounting.connectionName', {connectionName: connectedIntegration}) : '';
+    const unapproveWarningText = useMemo(
+        () => (
+            <Text>
+                <Text style={[styles.textStrong, styles.noWrap]}>{translate('iou.headsUp')}</Text>{' '}
+                <Text>{translate('iou.unapproveWithIntegrationWarning', {accountingIntegration: connectedIntegrationName})}</Text>
+            </Text>
+        ),
+        [connectedIntegrationName, styles.noWrap, styles.textStrong, translate],
+    );
+
     return (
         <View style={[styles.pt0, styles.borderBottom]}>
             <HeaderWithBackButton
@@ -838,6 +856,19 @@ function MoneyReportHeader({policy, report: moneyRequestReport, transactionThrea
                 cancelText={translate('workspace.exportAgainModal.cancelText')}
                 isVisible={markAsExportedModalVisible}
             />
+            <ConfirmModal
+                title={translate('iou.unapproveReport')}
+                isVisible={isUnapproveModalVisible}
+                danger
+                confirmText={translate('iou.unapproveReport')}
+                onConfirm={() => {
+                    setIsUnapproveModalVisible(false);
+                    unapproveExpenseReport(moneyRequestReport);
+                }}
+                cancelText={translate('common.cancel')}
+                onCancel={() => setIsUnapproveModalVisible(false)}
+                prompt={unapproveWarningText}
+            />
             <DecisionModal
                 title={translate('common.downloadFailedTitle')}
                 prompt={translate('common.downloadFailedDescription')}

From 59cca89989d4068376af58cd8b10165cac666a44 Mon Sep 17 00:00:00 2001
From: Jakub Szymczak <szymczak.jakub12@gmail.com>
Date: Thu, 10 Apr 2025 13:41:18 +0200
Subject: [PATCH 08/42] fix "Pay with Expensify" button extends out of screen

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

diff --git a/src/components/MoneyReportHeader.tsx b/src/components/MoneyReportHeader.tsx
index e4a985a299129..840aa8250d954 100644
--- a/src/components/MoneyReportHeader.tsx
+++ b/src/components/MoneyReportHeader.tsx
@@ -729,7 +729,7 @@ function MoneyReportHeader({policy, report: moneyRequestReport, transactionThrea
             </HeaderWithBackButton>
             {shouldUseNarrowLayout && (
                 <View style={[styles.flexRow, styles.gap2, styles.pb3, styles.ph5, styles.w100, styles.alignItemsCenter, styles.justifyContentCenter]}>
-                    {!!primaryAction && !shouldShowSelectedTransactionsButton && <View style={[styles.flexGrow4]}>{primaryActionsImplementation[primaryAction]}</View>}
+                    {!!primaryAction && !shouldShowSelectedTransactionsButton && <View style={[styles.flex1]}>{primaryActionsImplementation[primaryAction]}</View>}
                     {!!applicableSecondaryActions.length && !shouldShowSelectedTransactionsButton && (
                         <ButtonWithDropdownMenu
                             success={false}
@@ -738,7 +738,7 @@ function MoneyReportHeader({policy, report: moneyRequestReport, transactionThrea
                             customText={translate('common.more')}
                             options={applicableSecondaryActions}
                             isSplitButton={false}
-                            wrapperStyle={[!primaryAction && styles.flexGrow4]}
+                            wrapperStyle={[!primaryAction && styles.flex1]}
                         />
                     )}
                 </View>

From 6064c5b6b745df3c08bd1c0c5b87c720202bd89a Mon Sep 17 00:00:00 2001
From: Jakub Szymczak <szymczak.jakub12@gmail.com>
Date: Thu, 10 Apr 2025 16:33:19 +0200
Subject: [PATCH 09/42] fix empty green button on the expense preview when
 scanning

---
 src/libs/ReportPreviewActionUtils.ts | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/libs/ReportPreviewActionUtils.ts b/src/libs/ReportPreviewActionUtils.ts
index 13033f249e06c..3c29ed19d4fb7 100644
--- a/src/libs/ReportPreviewActionUtils.ts
+++ b/src/libs/ReportPreviewActionUtils.ts
@@ -6,6 +6,7 @@ import {isApprover as isApproverMember} from './actions/Policy/Member';
 import {getCurrentUserAccountID} from './actions/Report';
 import {arePaymentsEnabled, getConnectedIntegration, getCorrectedAutoReportingFrequency, hasAccountingConnections, hasIntegrationAutoSync, isPrefferedExporter} from './PolicyUtils';
 import {
+    getMoneyRequestSpendBreakdown,
     getReportTransactions,
     hasViolations as hasAnyViolations,
     isClosedReport,
@@ -53,6 +54,12 @@ function canPay(report: Report, violations: OnyxCollection<TransactionViolation[
     const isInvoice = isInvoiceReport(report);
     const isIOU = isIOUReport(report);
 
+    const {reimbursableSpend} = getMoneyRequestSpendBreakdown(report);
+
+    if (reimbursableSpend <= 0) {
+        return false;
+    }
+
     if (!isReportPayer) {
         return false;
     }
@@ -102,6 +109,7 @@ function getReportPreviewAction(
         return CONST.REPORT.REPORT_PREVIEW_ACTIONS.PAY;
     }
     if (canExport(report, violations, policy)) {
+        console.log('%%%%%\n', 'i return in can export preview');
         return CONST.REPORT.REPORT_PREVIEW_ACTIONS.EXPORT_TO_ACCOUNTING;
     }
     if (canReview(report, violations, policy)) {

From d9fa31275bd472e5c671eb9d7237778f7ec3dee7 Mon Sep 17 00:00:00 2001
From: sumo_slonik <jakub.nowakowski@swmansion.com>
Date: Fri, 11 Apr 2025 10:10:56 +0200
Subject: [PATCH 10/42] fix unnecessary delete option

---
 src/components/MoneyReportHeader.tsx   | 5 +++--
 src/libs/ReportSecondaryActionUtils.ts | 6 +++++-
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/components/MoneyReportHeader.tsx b/src/components/MoneyReportHeader.tsx
index 840aa8250d954..2038341363c09 100644
--- a/src/components/MoneyReportHeader.tsx
+++ b/src/components/MoneyReportHeader.tsx
@@ -36,6 +36,7 @@ import {
     isExported as isExportedUtils,
     isInvoiceReport,
     isProcessingReport,
+    isReportApproved as isReportApprovedUtils,
     isReportOwner,
     navigateToDetailsPage,
     reportTransactionsSelector,
@@ -184,7 +185,7 @@ function MoneyReportHeader({policy, report: moneyRequestReport, transactionThrea
     const isPayAtEndExpense = isPayAtEndExpenseTransactionUtils(transaction);
     const isArchivedReport = isArchivedReportWithID(moneyRequestReport?.reportID);
     const [archiveReason] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${moneyRequestReport?.reportID}`, {selector: getArchiveReason});
-
+    const isReportApproved = isReportApprovedUtils(moneyRequestReport);
     const getCanIOUBePaid = useCallback(
         (onlyShowPayElsewhere = false, shouldCheckApprovedState = true) =>
             canIOUBePaidAction(moneyRequestReport, chatReport, policy, transaction ? [transaction] : undefined, onlyShowPayElsewhere, undefined, undefined, shouldCheckApprovedState),
@@ -261,7 +262,7 @@ function MoneyReportHeader({policy, report: moneyRequestReport, transactionThrea
             return canRemoveTransaction && isIOUActionOwner && !isActionDeleted;
         });
 
-        const canRemoveReportTransaction = canDeleteTransaction(moneyRequestReport);
+        const canRemoveReportTransaction = canDeleteTransaction(moneyRequestReport) && !isReportApproved;
 
         if (canRemoveReportTransaction && canAllSelectedTransactionsBeRemoved) {
             options.push({
diff --git a/src/libs/ReportSecondaryActionUtils.ts b/src/libs/ReportSecondaryActionUtils.ts
index 57befeb64ee60..00c4384820471 100644
--- a/src/libs/ReportSecondaryActionUtils.ts
+++ b/src/libs/ReportSecondaryActionUtils.ts
@@ -347,7 +347,11 @@ function isDeleteAction(report: Report, reportTransactions: Transaction[]): bool
     const isProcessingReport = isProcessingReportUtils(report);
     const isReportApproved = isReportApprovedUtils({report});
 
-    return isReportOpen || isProcessingReport || isReportApproved;
+    if (isReportApproved) {
+        return false;
+    }
+
+    return isReportOpen || isProcessingReport;
 }
 
 function getSecondaryReportActions(

From 27d93783ed9441a690004c44c57506ffd08ada02 Mon Sep 17 00:00:00 2001
From: Jan Nowakowski <janeknowakowski9@gmail.com>
Date: Fri, 11 Apr 2025 11:35:38 +0200
Subject: [PATCH 11/42] fix 59904

---
 src/libs/ReportPreviewActionUtils.ts | 35 +++++++++++++++++++---------
 1 file changed, 24 insertions(+), 11 deletions(-)

diff --git a/src/libs/ReportPreviewActionUtils.ts b/src/libs/ReportPreviewActionUtils.ts
index f98876beeebc0..7d1fe00ea6b81 100644
--- a/src/libs/ReportPreviewActionUtils.ts
+++ b/src/libs/ReportPreviewActionUtils.ts
@@ -7,6 +7,7 @@ import {getCurrentUserAccountID} from './actions/Report';
 import {arePaymentsEnabled, getConnectedIntegration, getCorrectedAutoReportingFrequency, hasAccountingConnections, hasIntegrationAutoSync, isPrefferedExporter} from './PolicyUtils';
 import {
     getMoneyRequestSpendBreakdown,
+    getParentReport,
     getReportNameValuePairs,
     getReportTransactions,
     hasViolations as hasAnyViolations,
@@ -44,6 +45,13 @@ function canApprove(report: Report, violations: OnyxCollection<TransactionViolat
 }
 
 function canPay(report: Report, violations: OnyxCollection<TransactionViolation[]>, policy?: Policy) {
+    const reportNameValuePairs = getReportNameValuePairs(report.chatReportID);
+    const isChatReportArchived = isArchivedReport(reportNameValuePairs);
+
+    if (isChatReportArchived) {
+        return false;
+    }
+
     const isReportPayer = isPayer(getSession(), report, false, policy);
     const isExpense = isExpenseReport(report);
     const isPaymentsEnabled = arePaymentsEnabled(policy);
@@ -52,28 +60,33 @@ function canPay(report: Report, violations: OnyxCollection<TransactionViolation[
     const isSubmittedWithoutApprovalsEnabled = !isApprovalEnabled && isProcessing;
     const isApproved = isReportApproved({report}) || isSubmittedWithoutApprovalsEnabled;
     const isClosed = isClosedReport(report);
+    const isReportFinished = isApproved || isClosed;
+    const {reimbursableSpend} = getMoneyRequestSpendBreakdown(report);
+
     const hasViolations = hasAnyViolations(report.reportID, violations);
-    const isInvoice = isInvoiceReport(report);
-    const isIOU = isIOUReport(report);
 
-    const reportNameValuePairs = getReportNameValuePairs(report.chatReportID);
-    const isChatReportArchived = isArchivedReport(reportNameValuePairs);
+    if (isExpense && isReportPayer && isPaymentsEnabled && isReportFinished && !hasViolations && reimbursableSpend > 0) {
+        return true;
+    }
 
-    const {reimbursableSpend} = getMoneyRequestSpendBreakdown(report);
+    const isIOU = isIOUReport(report);
 
-    if (reimbursableSpend <= 0) {
-        return false;
+    if (isIOU && isReportPayer) {
+        return true;
     }
 
-    if (!isReportPayer) {
+    const isInvoice = isInvoiceReport(report);
+
+    if (!isInvoice) {
         return false;
     }
 
-    if (isChatReportArchived) {
-        return false;
+    const parentReport = getParentReport(report);
+    if (parentReport?.invoiceReceiver?.type === CONST.REPORT.INVOICE_RECEIVER_TYPE.INDIVIDUAL) {
+        return parentReport?.invoiceReceiver?.accountID === getCurrentUserAccountID();
     }
 
-    return (isExpense && isPaymentsEnabled && ((isApproved && !report.isWaitingOnBankAccount) || isClosed) && !hasViolations) || ((isInvoice || isIOU) && isProcessing);
+    return policy?.role === CONST.POLICY.ROLE.ADMIN;
 }
 
 function canExport(report: Report, violations: OnyxCollection<TransactionViolation[]>, policy?: Policy) {

From 8e1f56e233cc2ea138d4a7ab0d0e377eafb54efc Mon Sep 17 00:00:00 2001
From: Jakub Szymczak <szymczak.jakub12@gmail.com>
Date: Fri, 11 Apr 2025 13:05:03 +0200
Subject: [PATCH 12/42] add additional violation check to report previews

---
 src/libs/ReportPreviewActionUtils.ts | 31 +++++++++++++++++-----------
 1 file changed, 19 insertions(+), 12 deletions(-)

diff --git a/src/libs/ReportPreviewActionUtils.ts b/src/libs/ReportPreviewActionUtils.ts
index 3c29ed19d4fb7..0a79f97e0e73d 100644
--- a/src/libs/ReportPreviewActionUtils.ts
+++ b/src/libs/ReportPreviewActionUtils.ts
@@ -8,7 +8,9 @@ import {arePaymentsEnabled, getConnectedIntegration, getCorrectedAutoReportingFr
 import {
     getMoneyRequestSpendBreakdown,
     getReportTransactions,
-    hasViolations as hasAnyViolations,
+    hasNoticeTypeViolations,
+    hasViolations,
+    hasWarningTypeViolations,
     isClosedReport,
     isCurrentUserSubmitter,
     isExpenseReport,
@@ -27,8 +29,9 @@ function canSubmit(report: Report, violations: OnyxCollection<TransactionViolati
     const isSubmitter = isCurrentUserSubmitter(report.reportID);
     const isOpen = isOpenReport(report);
     const isManualSubmitEnabled = getCorrectedAutoReportingFrequency(policy) === CONST.POLICY.AUTO_REPORTING_FREQUENCIES.MANUAL;
-    const hasViolations = hasAnyViolations(report.reportID, violations);
-    return isExpense && isSubmitter && isOpen && isManualSubmitEnabled && !hasViolations;
+    const hasAnyViolations =
+        hasViolations(report.reportID, violations) || hasNoticeTypeViolations(report.reportID, violations, true) || hasWarningTypeViolations(report.reportID, violations, true);
+    return isExpense && isSubmitter && isOpen && isManualSubmitEnabled && !hasAnyViolations;
 }
 
 function canApprove(report: Report, violations: OnyxCollection<TransactionViolation[]>, policy?: Policy, transactions?: Transaction[]) {
@@ -36,9 +39,10 @@ function canApprove(report: Report, violations: OnyxCollection<TransactionViolat
     const isApprover = isApproverMember(policy, getCurrentUserAccountID());
     const isProcessing = isProcessingReport(report);
     const isApprovalEnabled = policy ? policy.approvalMode && policy.approvalMode !== CONST.POLICY.APPROVAL_MODE.OPTIONAL : false;
-    const hasViolations = hasAnyViolations(report.reportID, violations);
+    const hasAnyViolations =
+        hasViolations(report.reportID, violations) || hasNoticeTypeViolations(report.reportID, violations, true) || hasWarningTypeViolations(report.reportID, violations, true);
     const reportTransactions = transactions ?? getReportTransactions(report?.reportID);
-    return isExpense && isApprover && isProcessing && isApprovalEnabled && !hasViolations && reportTransactions.length > 0;
+    return isExpense && isApprover && isProcessing && isApprovalEnabled && !hasAnyViolations && reportTransactions.length > 0;
 }
 
 function canPay(report: Report, violations: OnyxCollection<TransactionViolation[]>, policy?: Policy) {
@@ -50,7 +54,8 @@ function canPay(report: Report, violations: OnyxCollection<TransactionViolation[
     const isSubmittedWithoutApprovalsEnabled = !isApprovalEnabled && isProcessing;
     const isApproved = isReportApproved({report}) || isSubmittedWithoutApprovalsEnabled;
     const isClosed = isClosedReport(report);
-    const hasViolations = hasAnyViolations(report.reportID, violations);
+    const hasAnyViolations =
+        hasViolations(report.reportID, violations) || hasNoticeTypeViolations(report.reportID, violations, true) || hasWarningTypeViolations(report.reportID, violations, true);
     const isInvoice = isInvoiceReport(report);
     const isIOU = isIOUReport(report);
 
@@ -63,7 +68,7 @@ function canPay(report: Report, violations: OnyxCollection<TransactionViolation[
     if (!isReportPayer) {
         return false;
     }
-    return (isExpense && isPaymentsEnabled && (isApproved || isClosed) && !hasViolations) || ((isInvoice || isIOU) && isProcessing);
+    return (isExpense && isPaymentsEnabled && (isApproved || isClosed) && !hasAnyViolations) || ((isInvoice || isIOU) && isProcessing);
 }
 
 function canExport(report: Report, violations: OnyxCollection<TransactionViolation[]>, policy?: Policy) {
@@ -75,19 +80,22 @@ function canExport(report: Report, violations: OnyxCollection<TransactionViolati
     const hasAccountingConnection = hasAccountingConnections(policy);
     const connectedIntegration = getConnectedIntegration(policy);
     const syncEnabled = hasIntegrationAutoSync(policy, connectedIntegration);
-    const hasViolations = hasAnyViolations(report.reportID, violations);
-    if (isExpense && isExporter && hasAccountingConnection && !syncEnabled && !hasViolations) {
+    const hasAnyViolations =
+        hasViolations(report.reportID, violations) || hasNoticeTypeViolations(report.reportID, violations, true) || hasWarningTypeViolations(report.reportID, violations, true);
+
+    if (isExpense && isExporter && hasAccountingConnection && !syncEnabled && !hasAnyViolations) {
         return isApproved || isReimbursed || isClosed;
     }
     return false;
 }
 
 function canReview(report: Report, violations: OnyxCollection<TransactionViolation[]>, policy?: Policy) {
-    const hasViolations = hasAnyViolations(report.reportID, violations);
+    const hasAnyViolations =
+        hasViolations(report.reportID, violations) || hasNoticeTypeViolations(report.reportID, violations, true) || hasWarningTypeViolations(report.reportID, violations, true);
     const isSubmitter = isCurrentUserSubmitter(report.reportID);
     const isApprover = isApproverMember(policy, getCurrentUserAccountID());
     const areWorkflowsEnabled = policy ? policy.areWorkflowsEnabled : false;
-    return hasViolations && (isSubmitter || isApprover) && areWorkflowsEnabled;
+    return hasAnyViolations && (isSubmitter || isApprover) && areWorkflowsEnabled;
 }
 
 function getReportPreviewAction(
@@ -109,7 +117,6 @@ function getReportPreviewAction(
         return CONST.REPORT.REPORT_PREVIEW_ACTIONS.PAY;
     }
     if (canExport(report, violations, policy)) {
-        console.log('%%%%%\n', 'i return in can export preview');
         return CONST.REPORT.REPORT_PREVIEW_ACTIONS.EXPORT_TO_ACCOUNTING;
     }
     if (canReview(report, violations, policy)) {

From c2a0b2a549d0fb212efb51c52e147d2e404bf6f5 Mon Sep 17 00:00:00 2001
From: Jan Nowakowski <janeknowakowski9@gmail.com>
Date: Fri, 11 Apr 2025 14:02:43 +0200
Subject: [PATCH 13/42] fix 59909

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

diff --git a/src/components/MoneyRequestHeader.tsx b/src/components/MoneyRequestHeader.tsx
index c47ea3c2fb803..f37f9decdab94 100644
--- a/src/components/MoneyRequestHeader.tsx
+++ b/src/components/MoneyRequestHeader.tsx
@@ -15,7 +15,7 @@ import Navigation from '@libs/Navigation/Navigation';
 import {getOriginalMessage, isMoneyRequestAction} from '@libs/ReportActionsUtils';
 import {getTransactionThreadPrimaryAction} from '@libs/ReportPrimaryActionUtils';
 import {getSecondaryTransactionThreadActions} from '@libs/ReportSecondaryActionUtils';
-import {changeMoneyRequestHoldStatus, navigateToDetailsPage} from '@libs/ReportUtils';
+import {changeMoneyRequestHoldStatus, navigateBackOnDeleteTransaction, navigateToDetailsPage} from '@libs/ReportUtils';
 import {
     hasPendingRTERViolation as hasPendingRTERViolationTransactionUtils,
     hasReceipt,
@@ -315,9 +315,7 @@ function MoneyRequestHeader({report, parentReportAction, policy, onBackButtonPre
                     deleteMoneyRequest(transaction?.transactionID, parentReportAction);
 
                     const goBackRoute = getNavigationUrlOnMoneyRequestDelete(transaction.transactionID, parentReportAction, true);
-                    if (goBackRoute) {
-                        Navigation.navigate(goBackRoute);
-                    }
+                    navigateBackOnDeleteTransaction(goBackRoute);
                 }}
                 onCancel={() => setIsDeleteModalVisible(false)}
                 prompt={translate('iou.deleteConfirmation', {count: 1})}

From a3c084a28d6bd84f6e9361c2b254e7d5660f8745 Mon Sep 17 00:00:00 2001
From: borys3kk <szymon.banys01@wp.pl>
Date: Fri, 11 Apr 2025 15:23:28 +0200
Subject: [PATCH 14/42] fix 59880

---
 src/libs/ReportPrimaryActionUtils.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/libs/ReportPrimaryActionUtils.ts b/src/libs/ReportPrimaryActionUtils.ts
index 16a755427a3eb..de78784323e67 100644
--- a/src/libs/ReportPrimaryActionUtils.ts
+++ b/src/libs/ReportPrimaryActionUtils.ts
@@ -35,7 +35,7 @@ function isApproveAction(report: Report, policy: Policy, reportTransactions: Tra
     const isReportApprover = isApproverUtils(policy, getCurrentUserAccountID());
     const isApprovalEnabled = policy.approvalMode && policy.approvalMode !== CONST.POLICY.APPROVAL_MODE.OPTIONAL;
 
-    if (!isExpenseReport || !isReportApprover || !isApprovalEnabled) {
+    if (!isExpenseReport || !isReportApprover || !isApprovalEnabled || reportTransactions.length === 0) {
         return false;
     }
 

From 6dff03e1b9adffa6c9fd2eac682243701fa8ca25 Mon Sep 17 00:00:00 2001
From: Jan Nowakowski <janeknowakowski9@gmail.com>
Date: Fri, 11 Apr 2025 15:40:12 +0200
Subject: [PATCH 15/42] Fix 59916

---
 src/libs/ReportSecondaryActionUtils.ts | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/libs/ReportSecondaryActionUtils.ts b/src/libs/ReportSecondaryActionUtils.ts
index 0fec251dd4d39..11f9a4d428a3c 100644
--- a/src/libs/ReportSecondaryActionUtils.ts
+++ b/src/libs/ReportSecondaryActionUtils.ts
@@ -97,6 +97,12 @@ function isUnapproveAction(report: Report, policy?: Policy): boolean {
     const isExpenseReport = isExpenseReportUtils(report);
     const isReportApprover = isApproverUtils(policy, getCurrentUserAccountID());
     const isReportApproved = isReportApprovedUtils({report});
+    const isReportSettled = isSettled(report);
+    const isPaymentProcessing = report.isWaitingOnBankAccount && report.statusNum === CONST.REPORT.STATUS_NUM.APPROVED;
+
+    if (isReportSettled || isPaymentProcessing) {
+        return false;
+    }
 
     return isExpenseReport && isReportApprover && isReportApproved;
 }
@@ -121,7 +127,7 @@ function isCancelPaymentAction(report: Report, reportTransactions: Transaction[]
         return true;
     }
 
-    const isPaymentProcessing = isSettled(report);
+    const isPaymentProcessing = !!report.isWaitingOnBankAccount && report.statusNum === CONST.REPORT.STATUS_NUM.APPROVED;
 
     const payActions = reportTransactions.reduce((acc, transaction) => {
         const action = getIOUActionForReportID(report.reportID, transaction.transactionID);
@@ -138,6 +144,7 @@ function isCancelPaymentAction(report: Report, reportTransactions: Transaction[]
         const cutoffTimeUTC = new Date(Date.UTC(paymentDatetime.getUTCFullYear(), paymentDatetime.getUTCMonth(), paymentDatetime.getUTCDate(), 23, 45, 0));
         return nowUTC.getTime() < cutoffTimeUTC.getTime();
     });
+    
     return isPaymentProcessing && !hasDailyNachaCutoffPassed;
 }
 

From 97321d99dd0faab0436bf0540ec9afff47da5aaa Mon Sep 17 00:00:00 2001
From: Jan Nowakowski <janeknowakowski9@gmail.com>
Date: Fri, 11 Apr 2025 16:52:12 +0200
Subject: [PATCH 16/42] Fix 59928

---
 src/components/ReportActionItem/ReportPreview.tsx | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/components/ReportActionItem/ReportPreview.tsx b/src/components/ReportActionItem/ReportPreview.tsx
index b3d100226e6bf..8a296721bf190 100644
--- a/src/components/ReportActionItem/ReportPreview.tsx
+++ b/src/components/ReportActionItem/ReportPreview.tsx
@@ -523,7 +523,6 @@ function ReportPreview({
                 text={translate('iou.approve')}
                 success
                 onPress={() => confirmApproval()}
-                isDisabled={shouldDisableSubmitButton}
             />
         ),
         [CONST.REPORT.REPORT_PREVIEW_ACTIONS.PAY]: (
@@ -572,7 +571,6 @@ function ReportPreview({
             <Button
                 text={translate('common.review')}
                 onPress={() => openReportFromPreview()}
-                isDisabled={shouldDisableSubmitButton}
                 icon={Expensicons.DotIndicator}
                 iconFill={theme.danger}
                 iconHoverFill={theme.dangerHover}
@@ -584,7 +582,6 @@ function ReportPreview({
                 onPress={() => {
                     openReportFromPreview();
                 }}
-                isDisabled={shouldDisableSubmitButton}
             />
         ),
     };

From ec27757bc40538e6b9fd052fdcc4493f264ad850 Mon Sep 17 00:00:00 2001
From: borys3kk <szymon.banys01@wp.pl>
Date: Mon, 14 Apr 2025 11:00:28 +0200
Subject: [PATCH 17/42] fix unissued bug

---
 src/libs/ReportPreviewActionUtils.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/libs/ReportPreviewActionUtils.ts b/src/libs/ReportPreviewActionUtils.ts
index 7d1fe00ea6b81..4e5425575b907 100644
--- a/src/libs/ReportPreviewActionUtils.ts
+++ b/src/libs/ReportPreviewActionUtils.ts
@@ -62,6 +62,7 @@ function canPay(report: Report, violations: OnyxCollection<TransactionViolation[
     const isClosed = isClosedReport(report);
     const isReportFinished = isApproved || isClosed;
     const {reimbursableSpend} = getMoneyRequestSpendBreakdown(report);
+    const isReimbursed = isSettled(report);
 
     const hasViolations = hasAnyViolations(report.reportID, violations);
 
@@ -71,7 +72,7 @@ function canPay(report: Report, violations: OnyxCollection<TransactionViolation[
 
     const isIOU = isIOUReport(report);
 
-    if (isIOU && isReportPayer) {
+    if (isIOU && isReportPayer && !isReimbursed) {
         return true;
     }
 

From 5df34d717e81107d2d53dc585a519749f2fbcce7 Mon Sep 17 00:00:00 2001
From: Jan Nowakowski <janeknowakowski9@gmail.com>
Date: Mon, 14 Apr 2025 11:33:46 +0200
Subject: [PATCH 18/42] Fix linter, prettier and tests

---
 .../MoneyRequestReportPreviewContent.tsx               |  8 +-------
 src/libs/ReportSecondaryActionUtils.ts                 |  2 +-
 src/pages/ReportDetailsPage.tsx                        |  1 +
 tests/actions/ReportPreviewActionUtilsTest.ts          | 10 ++++++----
 tests/unit/ReportSecondaryActionUtilsTest.ts           |  3 ++-
 5 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/src/components/ReportActionItem/MoneyRequestReportPreview/MoneyRequestReportPreviewContent.tsx b/src/components/ReportActionItem/MoneyRequestReportPreview/MoneyRequestReportPreviewContent.tsx
index 4f31a3e755931..e76d469917b62 100644
--- a/src/components/ReportActionItem/MoneyRequestReportPreview/MoneyRequestReportPreviewContent.tsx
+++ b/src/components/ReportActionItem/MoneyRequestReportPreview/MoneyRequestReportPreviewContent.tsx
@@ -56,13 +56,7 @@ import {
     isTripRoom as isTripRoomReportUtils,
     isWaitingForSubmissionFromCurrentUser as isWaitingForSubmissionFromCurrentUserReportUtils,
 } from '@libs/ReportUtils';
-import {
-    getMerchant,
-    hasPendingUI,
-    isCardTransaction,
-    isPartialMerchant,
-    isPending,
-} from '@libs/TransactionUtils';
+import {getMerchant, hasPendingUI, isCardTransaction, isPartialMerchant, isPending} from '@libs/TransactionUtils';
 import colors from '@styles/theme/colors';
 import variables from '@styles/variables';
 import {approveMoneyRequest, canIOUBePaid as canIOUBePaidIOUActions, canSubmitReport, payInvoice, payMoneyRequest, submitReport} from '@userActions/IOU';
diff --git a/src/libs/ReportSecondaryActionUtils.ts b/src/libs/ReportSecondaryActionUtils.ts
index 11f9a4d428a3c..d375426506247 100644
--- a/src/libs/ReportSecondaryActionUtils.ts
+++ b/src/libs/ReportSecondaryActionUtils.ts
@@ -144,7 +144,7 @@ function isCancelPaymentAction(report: Report, reportTransactions: Transaction[]
         const cutoffTimeUTC = new Date(Date.UTC(paymentDatetime.getUTCFullYear(), paymentDatetime.getUTCMonth(), paymentDatetime.getUTCDate(), 23, 45, 0));
         return nowUTC.getTime() < cutoffTimeUTC.getTime();
     });
-    
+
     return isPaymentProcessing && !hasDailyNachaCutoffPassed;
 }
 
diff --git a/src/pages/ReportDetailsPage.tsx b/src/pages/ReportDetailsPage.tsx
index 358e2163d4ef6..6755de861b50f 100644
--- a/src/pages/ReportDetailsPage.tsx
+++ b/src/pages/ReportDetailsPage.tsx
@@ -565,6 +565,7 @@ function ReportDetailsPage({policies, report, route, reportMetadata}: ReportDeta
         isTaskReport,
         isCanceledTaskReport,
         canUsePDFExport,
+        caseID,
         shouldShowGoToWorkspace,
         shouldShowLeaveButton,
         isDebugModeEnabled,
diff --git a/tests/actions/ReportPreviewActionUtilsTest.ts b/tests/actions/ReportPreviewActionUtilsTest.ts
index 8c07c8c62957c..36593c9de70f4 100644
--- a/tests/actions/ReportPreviewActionUtilsTest.ts
+++ b/tests/actions/ReportPreviewActionUtilsTest.ts
@@ -1,4 +1,4 @@
-import type {OnyxCollection} from 'react-native-onyx';
+import type { OnyxCollection } from 'react-native-onyx';
 import Onyx from 'react-native-onyx';
 // eslint-disable-next-line no-restricted-syntax
 import type * as PolicyUtils from '@libs/PolicyUtils';
@@ -7,11 +7,12 @@ import getReportPreviewAction from '@libs/ReportPreviewActionUtils';
 import * as ReportUtils from '@libs/ReportUtils';
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
-import type {Report, ReportViolations, TransactionViolation} from '@src/types/onyx';
-import type {Connections, NetSuiteConnection} from '@src/types/onyx/Policy';
+import type { Report, ReportViolations, TransactionViolation } from '@src/types/onyx';
+import type { Connections, NetSuiteConnection } from '@src/types/onyx/Policy';
 import createRandomPolicy from '../utils/collections/policies';
 import createRandomReport from '../utils/collections/reports';
 
+
 const CURRENT_USER_ACCOUNT_ID = 1;
 const CURRENT_USER_EMAIL = 'tester@mail.com';
 
@@ -98,6 +99,7 @@ describe('getReportPreviewAction', () => {
             type: CONST.REPORT.TYPE.EXPENSE,
             ownerAccountID: CURRENT_USER_ACCOUNT_ID,
             statusNum: CONST.REPORT.STATUS_NUM.CLOSED,
+            total: -100,
         };
 
         const policy = createRandomPolicy(0);
@@ -171,4 +173,4 @@ describe('getReportPreviewAction', () => {
 
         expect(getReportPreviewAction(VIOLATIONS, report, policy)).toBe(CONST.REPORT.REPORT_PREVIEW_ACTIONS.REVIEW);
     });
-});
+});
\ No newline at end of file
diff --git a/tests/unit/ReportSecondaryActionUtilsTest.ts b/tests/unit/ReportSecondaryActionUtilsTest.ts
index 99f4458cd8a1d..3b737b5522617 100644
--- a/tests/unit/ReportSecondaryActionUtilsTest.ts
+++ b/tests/unit/ReportSecondaryActionUtilsTest.ts
@@ -179,7 +179,8 @@ describe('getSecondaryAction', () => {
             reportID: REPORT_ID,
             type: CONST.REPORT.TYPE.EXPENSE,
             ownerAccountID: CURRENT_USER_ACCOUNT_ID,
-            statusNum: CONST.REPORT.STATUS_NUM.REIMBURSED,
+            statusNum: CONST.REPORT.STATUS_NUM.APPROVED,
+            isWaitingOnBankAccount: true,
         } as unknown as Report;
         const policy = {role: CONST.POLICY.ROLE.ADMIN} as unknown as Policy;
         const TRANSACTION_ID = 'transaction_id';

From 450817afd8e2f9eb7add5660bc275af38e53cada Mon Sep 17 00:00:00 2001
From: Jan Nowakowski <janeknowakowski9@gmail.com>
Date: Mon, 14 Apr 2025 11:37:34 +0200
Subject: [PATCH 19/42] Fix prettier 2

---
 tests/actions/ReportPreviewActionUtilsTest.ts | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/tests/actions/ReportPreviewActionUtilsTest.ts b/tests/actions/ReportPreviewActionUtilsTest.ts
index 36593c9de70f4..63cbf49eca134 100644
--- a/tests/actions/ReportPreviewActionUtilsTest.ts
+++ b/tests/actions/ReportPreviewActionUtilsTest.ts
@@ -1,4 +1,4 @@
-import type { OnyxCollection } from 'react-native-onyx';
+import type {OnyxCollection} from 'react-native-onyx';
 import Onyx from 'react-native-onyx';
 // eslint-disable-next-line no-restricted-syntax
 import type * as PolicyUtils from '@libs/PolicyUtils';
@@ -7,12 +7,11 @@ import getReportPreviewAction from '@libs/ReportPreviewActionUtils';
 import * as ReportUtils from '@libs/ReportUtils';
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
-import type { Report, ReportViolations, TransactionViolation } from '@src/types/onyx';
-import type { Connections, NetSuiteConnection } from '@src/types/onyx/Policy';
+import type {Report, ReportViolations, TransactionViolation} from '@src/types/onyx';
+import type {Connections, NetSuiteConnection} from '@src/types/onyx/Policy';
 import createRandomPolicy from '../utils/collections/policies';
 import createRandomReport from '../utils/collections/reports';
 
-
 const CURRENT_USER_ACCOUNT_ID = 1;
 const CURRENT_USER_EMAIL = 'tester@mail.com';
 
@@ -173,4 +172,4 @@ describe('getReportPreviewAction', () => {
 
         expect(getReportPreviewAction(VIOLATIONS, report, policy)).toBe(CONST.REPORT.REPORT_PREVIEW_ACTIONS.REVIEW);
     });
-});
\ No newline at end of file
+});

From 049eb51dd02d7bf48be3a4dfe5066d1064c88a52 Mon Sep 17 00:00:00 2001
From: Jan Nowakowski <janeknowakowski9@gmail.com>
Date: Mon, 14 Apr 2025 12:36:29 +0200
Subject: [PATCH 20/42] Fix checks

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

diff --git a/src/components/MoneyReportHeader.tsx b/src/components/MoneyReportHeader.tsx
index fad57a2f50871..7979b9d3d1f0f 100644
--- a/src/components/MoneyReportHeader.tsx
+++ b/src/components/MoneyReportHeader.tsx
@@ -185,7 +185,7 @@ function MoneyReportHeader({policy, report: moneyRequestReport, transactionThrea
     const isPayAtEndExpense = isPayAtEndExpenseTransactionUtils(transaction);
     const isArchivedReport = isArchivedReportWithID(moneyRequestReport?.reportID);
     const [archiveReason] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${moneyRequestReport?.reportID}`, {selector: getArchiveReason});
-    const isReportApproved = isReportApprovedUtils(moneyRequestReport);
+    const isReportApproved = isReportApprovedUtils({report: moneyRequestReport});
     const getCanIOUBePaid = useCallback(
         (onlyShowPayElsewhere = false, shouldCheckApprovedState = true) =>
             canIOUBePaidAction(moneyRequestReport, chatReport, policy, transaction ? [transaction] : undefined, onlyShowPayElsewhere, undefined, undefined, shouldCheckApprovedState),
@@ -288,7 +288,7 @@ function MoneyReportHeader({policy, report: moneyRequestReport, transactionThrea
             });
         }
         return options;
-    }, [moneyRequestReport, reportActions, selectedTransactionsID, session?.accountID, setSelectedTransactionsID, translate]);
+    }, [isReportApproved, moneyRequestReport, reportActions, selectedTransactionsID, session?.accountID, setSelectedTransactionsID, translate]);
 
     const shouldShowSelectedTransactionsButton = !!selectedTransactionsOptions.length;
 

From 5f1713cae2d39199ab274a0fbe297a8a6047b426 Mon Sep 17 00:00:00 2001
From: Jakub Szymczak <szymczak.jakub12@gmail.com>
Date: Mon, 14 Apr 2025 16:03:05 +0200
Subject: [PATCH 21/42] fix "Review" button is still displayed for admin and
 employee after expense is paid

---
 src/libs/ReportPreviewActionUtils.ts | 26 ++++++++++++++++----------
 1 file changed, 16 insertions(+), 10 deletions(-)

diff --git a/src/libs/ReportPreviewActionUtils.ts b/src/libs/ReportPreviewActionUtils.ts
index b3f62f80abedf..87a325aa65b79 100644
--- a/src/libs/ReportPreviewActionUtils.ts
+++ b/src/libs/ReportPreviewActionUtils.ts
@@ -8,13 +8,10 @@ import {arePaymentsEnabled, getConnectedIntegration, getCorrectedAutoReportingFr
 import {
     getMoneyRequestSpendBreakdown,
     getParentReport,
-    getReportNameValuePairs,
-    getMoneyRequestSpendBreakdown,
     getReportTransactions,
     hasNoticeTypeViolations,
     hasViolations,
     hasWarningTypeViolations,
-    isArchivedReport,
     isClosedReport,
     isCurrentUserSubmitter,
     isExpenseReport,
@@ -35,7 +32,6 @@ function canSubmit(report: Report, violations: OnyxCollection<TransactionViolati
     const isManualSubmitEnabled = getCorrectedAutoReportingFrequency(policy) === CONST.POLICY.AUTO_REPORTING_FREQUENCIES.MANUAL;
     const hasAnyViolations =
         hasViolations(report.reportID, violations) || hasNoticeTypeViolations(report.reportID, violations, true) || hasWarningTypeViolations(report.reportID, violations, true);
-    console.log('%%%%%\n', 'hasAnyViolations', hasAnyViolations);
     return isExpense && isSubmitter && isOpen && isManualSubmitEnabled && !hasAnyViolations;
 }
 
@@ -92,28 +88,37 @@ function canPay(report: Report, violations: OnyxCollection<TransactionViolation[
 function canExport(report: Report, violations: OnyxCollection<TransactionViolation[]>, policy?: Policy) {
     const isExpense = isExpenseReport(report);
     const isExporter = policy ? isPrefferedExporter(policy) : false;
+    const isOpen = isOpenReport(report);
+    const isProcessing = isProcessingReport(report);
     const isApproved = isReportApproved({report});
-    const isReimbursed = isSettled(report);
-    const isClosed = isClosedReport(report);
     const hasAccountingConnection = hasAccountingConnections(policy);
     const connectedIntegration = getConnectedIntegration(policy);
     const syncEnabled = hasIntegrationAutoSync(policy, connectedIntegration);
     const hasAnyViolations =
         hasViolations(report.reportID, violations) || hasNoticeTypeViolations(report.reportID, violations, true) || hasWarningTypeViolations(report.reportID, violations, true);
 
-    if (isExpense && isExporter && hasAccountingConnection && !syncEnabled && !hasAnyViolations) {
-        return isApproved || isReimbursed || isClosed;
+    if (!hasAccountingConnection || !isExpense || !isExporter) {
+        return false;
     }
-    return false;
+
+    if (syncEnabled) {
+        return false;
+    }
+
+    if ((isApproved || isOpen || isProcessing) && hasAnyViolations) {
+        return false;
+    }
+    return true;
 }
 
 function canReview(report: Report, violations: OnyxCollection<TransactionViolation[]>, policy?: Policy) {
     const hasAnyViolations =
         hasViolations(report.reportID, violations) || hasNoticeTypeViolations(report.reportID, violations, true) || hasWarningTypeViolations(report.reportID, violations, true);
     const isSubmitter = isCurrentUserSubmitter(report.reportID);
+    const isReimbursed = isSettled(report);
     const isApprover = isApproverMember(policy, getCurrentUserAccountID());
     const areWorkflowsEnabled = policy ? policy.areWorkflowsEnabled : false;
-    return hasAnyViolations && (isSubmitter || isApprover) && areWorkflowsEnabled;
+    return hasAnyViolations && (isSubmitter || isApprover) && areWorkflowsEnabled && !isReimbursed;
 }
 
 function getReportPreviewAction(
@@ -138,6 +143,7 @@ function getReportPreviewAction(
         return CONST.REPORT.REPORT_PREVIEW_ACTIONS.EXPORT_TO_ACCOUNTING;
     }
     if (canReview(report, violations, policy)) {
+        console.log('%%%%%\n', 'i go to review');
         return CONST.REPORT.REPORT_PREVIEW_ACTIONS.REVIEW;
     }
 

From ab14e9b080644b473707c7b4fe39037b9045086c Mon Sep 17 00:00:00 2001
From: Jakub Szymczak <szymczak.jakub12@gmail.com>
Date: Mon, 14 Apr 2025 16:32:55 +0200
Subject: [PATCH 22/42] clean up code

---
 src/libs/ReportPreviewActionUtils.ts | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/src/libs/ReportPreviewActionUtils.ts b/src/libs/ReportPreviewActionUtils.ts
index 87a325aa65b79..f7778ad747632 100644
--- a/src/libs/ReportPreviewActionUtils.ts
+++ b/src/libs/ReportPreviewActionUtils.ts
@@ -8,10 +8,12 @@ import {arePaymentsEnabled, getConnectedIntegration, getCorrectedAutoReportingFr
 import {
     getMoneyRequestSpendBreakdown,
     getParentReport,
+    getReportNameValuePairs,
     getReportTransactions,
     hasNoticeTypeViolations,
     hasViolations,
     hasWarningTypeViolations,
+    isArchivedReport,
     isClosedReport,
     isCurrentUserSubmitter,
     isExpenseReport,
@@ -47,6 +49,13 @@ function canApprove(report: Report, violations: OnyxCollection<TransactionViolat
 }
 
 function canPay(report: Report, violations: OnyxCollection<TransactionViolation[]>, policy?: Policy) {
+    const reportNameValuePairs = getReportNameValuePairs(report.chatReportID);
+    const isChatReportArchived = isArchivedReport(reportNameValuePairs);
+
+    if (isChatReportArchived) {
+        return false;
+    }
+
     const isReportPayer = isPayer(getSession(), report, false, policy);
     const isExpense = isExpenseReport(report);
     const isPaymentsEnabled = arePaymentsEnabled(policy);
@@ -88,8 +97,8 @@ function canPay(report: Report, violations: OnyxCollection<TransactionViolation[
 function canExport(report: Report, violations: OnyxCollection<TransactionViolation[]>, policy?: Policy) {
     const isExpense = isExpenseReport(report);
     const isExporter = policy ? isPrefferedExporter(policy) : false;
-    const isOpen = isOpenReport(report);
-    const isProcessing = isProcessingReport(report);
+    const isReimbursed = isSettled(report);
+    const isClosed = isClosedReport(report);
     const isApproved = isReportApproved({report});
     const hasAccountingConnection = hasAccountingConnections(policy);
     const connectedIntegration = getConnectedIntegration(policy);
@@ -105,10 +114,7 @@ function canExport(report: Report, violations: OnyxCollection<TransactionViolati
         return false;
     }
 
-    if ((isApproved || isOpen || isProcessing) && hasAnyViolations) {
-        return false;
-    }
-    return true;
+    return (isApproved || isReimbursed || isClosed) && !hasAnyViolations;
 }
 
 function canReview(report: Report, violations: OnyxCollection<TransactionViolation[]>, policy?: Policy) {
@@ -143,7 +149,6 @@ function getReportPreviewAction(
         return CONST.REPORT.REPORT_PREVIEW_ACTIONS.EXPORT_TO_ACCOUNTING;
     }
     if (canReview(report, violations, policy)) {
-        console.log('%%%%%\n', 'i go to review');
         return CONST.REPORT.REPORT_PREVIEW_ACTIONS.REVIEW;
     }
 

From 1d5af08fe7d767855bb848aedd3824c51fd51e93 Mon Sep 17 00:00:00 2001
From: borys3kk <szymon.banys01@wp.pl>
Date: Tue, 15 Apr 2025 11:28:22 +0200
Subject: [PATCH 23/42] fix 59910

---
 src/libs/ReportSecondaryActionUtils.ts | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/libs/ReportSecondaryActionUtils.ts b/src/libs/ReportSecondaryActionUtils.ts
index 11f9a4d428a3c..49129d02d85cd 100644
--- a/src/libs/ReportSecondaryActionUtils.ts
+++ b/src/libs/ReportSecondaryActionUtils.ts
@@ -253,8 +253,10 @@ function isHoldAction(report: Report, reportTransactions: Transaction[]): boolea
 
 function isHoldActionForTransation(report: Report, reportTransaction: Transaction): boolean {
     const isExpenseReport = isExpenseReportUtils(report);
+    const isIOUReport = isIOUReportUtils(report);
+    const iouOrExpenseReport = isExpenseReport || isIOUReport;
 
-    if (!isExpenseReport) {
+    if (!iouOrExpenseReport) {
         return false;
     }
 

From 1c44254ce46feb0c0099119b016ab2cef90b6131 Mon Sep 17 00:00:00 2001
From: Jan Nowakowski <janeknowakowski9@gmail.com>
Date: Wed, 16 Apr 2025 10:01:13 +0200
Subject: [PATCH 24/42] fix 59899

---
 src/libs/ReportPreviewActionUtils.ts | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/libs/ReportPreviewActionUtils.ts b/src/libs/ReportPreviewActionUtils.ts
index 1e96cd69c6cf9..6fb7caa41ef4a 100644
--- a/src/libs/ReportPreviewActionUtils.ts
+++ b/src/libs/ReportPreviewActionUtils.ts
@@ -10,6 +10,7 @@ import {
     getParentReport,
     getReportNameValuePairs,
     getReportTransactions,
+    hasMissingSmartscanFields,
     hasNoticeTypeViolations,
     hasViolations,
     hasWarningTypeViolations,
@@ -118,9 +119,12 @@ function canExport(report: Report, violations: OnyxCollection<TransactionViolati
     return (isApproved || isReimbursed || isClosed) && !hasAnyViolations;
 }
 
-function canReview(report: Report, violations: OnyxCollection<TransactionViolation[]>, policy?: Policy) {
+function canReview(report: Report, violations: OnyxCollection<TransactionViolation[]>, policy?: Policy, transactions?: Transaction[]) {
     const hasAnyViolations =
-        hasViolations(report.reportID, violations) || hasNoticeTypeViolations(report.reportID, violations, true) || hasWarningTypeViolations(report.reportID, violations, true);
+        hasMissingSmartscanFields(report.reportID, transactions) ||
+        hasViolations(report.reportID, violations) ||
+        hasNoticeTypeViolations(report.reportID, violations, true) ||
+        hasWarningTypeViolations(report.reportID, violations, true);
     const isSubmitter = isCurrentUserSubmitter(report.reportID);
     const isReimbursed = isSettled(report);
     const isApprover = isApproverMember(policy, getCurrentUserAccountID());
@@ -149,7 +153,7 @@ function getReportPreviewAction(
     if (canExport(report, violations, policy)) {
         return CONST.REPORT.REPORT_PREVIEW_ACTIONS.EXPORT_TO_ACCOUNTING;
     }
-    if (canReview(report, violations, policy)) {
+    if (canReview(report, violations, policy, transactions)) {
         return CONST.REPORT.REPORT_PREVIEW_ACTIONS.REVIEW;
     }
 

From 171d21e6a8875cb4509e22263cac96a6df4580f5 Mon Sep 17 00:00:00 2001
From: Jan Nowakowski <janeknowakowski9@gmail.com>
Date: Wed, 16 Apr 2025 11:38:43 +0200
Subject: [PATCH 25/42] fix 59900

---
 src/libs/ReportSecondaryActionUtils.ts | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/libs/ReportSecondaryActionUtils.ts b/src/libs/ReportSecondaryActionUtils.ts
index 1f8aee933f82a..2b4b7e980f499 100644
--- a/src/libs/ReportSecondaryActionUtils.ts
+++ b/src/libs/ReportSecondaryActionUtils.ts
@@ -53,6 +53,12 @@ function isSubmitAction(report: Report, policy?: Policy): boolean {
         return false;
     }
 
+    const isAdmin = policy?.role === CONST.POLICY.ROLE.ADMIN;
+
+    if (isAdmin) {
+        return true;
+    }
+
     const autoReportingFrequency = getCorrectedAutoReportingFrequency(policy);
 
     const isScheduledSubmitEnabled = policy?.harvesting?.enabled && autoReportingFrequency !== CONST.POLICY.AUTO_REPORTING_FREQUENCIES.MANUAL;

From f1044b5fa1b939e1d5ba37c8ecd4df7e26c88388 Mon Sep 17 00:00:00 2001
From: Jan Nowakowski <janeknowakowski9@gmail.com>
Date: Wed, 16 Apr 2025 12:04:08 +0200
Subject: [PATCH 26/42] Don't show submit for report with empty transaction

---
 src/libs/ReportPrimaryActionUtils.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/libs/ReportPrimaryActionUtils.ts b/src/libs/ReportPrimaryActionUtils.ts
index b40ceb51e3006..33e3b6cbc1001 100644
--- a/src/libs/ReportPrimaryActionUtils.ts
+++ b/src/libs/ReportPrimaryActionUtils.ts
@@ -45,8 +45,8 @@ function isSubmitAction(report: Report, reportTransactions: Transaction[], polic
     const isReportSubmitter = isCurrentUserSubmitter(report.reportID);
     const isOpenReport = isOpenReportUtils(report);
     const isManualSubmitEnabled = getCorrectedAutoReportingFrequency(policy) === CONST.POLICY.AUTO_REPORTING_FREQUENCIES.MANUAL;
-
-    return isExpenseReport && isReportSubmitter && isOpenReport && isManualSubmitEnabled && reportTransactions.length !== 0;
+    const transactionAreComplete = reportTransactions.every((transaction) => transaction.amount !== 0 || transaction.modifiedAmount !== 0);
+    return isExpenseReport && isReportSubmitter && isOpenReport && isManualSubmitEnabled && reportTransactions.length !== 0 && transactionAreComplete;
 }
 
 function isApproveAction(report: Report, reportTransactions: Transaction[], policy?: Policy) {

From c940be8fd2c915287603b278dc455fc3026f4b7b Mon Sep 17 00:00:00 2001
From: Jan Nowakowski <janeknowakowski9@gmail.com>
Date: Thu, 17 Apr 2025 09:52:41 +0200
Subject: [PATCH 27/42] Update condition to check if message was exported and
 improve preview condidtions

---
 src/libs/ReportActionsUtils.ts       |  2 +-
 src/libs/ReportPreviewActionUtils.ts | 14 ++++++++++----
 src/types/onyx/OriginalMessage.ts    | 13 ++++++++++++-
 3 files changed, 23 insertions(+), 6 deletions(-)

diff --git a/src/libs/ReportActionsUtils.ts b/src/libs/ReportActionsUtils.ts
index b19712758d9ab..7a3f7555ff425 100644
--- a/src/libs/ReportActionsUtils.ts
+++ b/src/libs/ReportActionsUtils.ts
@@ -273,7 +273,7 @@ function getOriginalMessage<T extends ReportActionName>(reportAction: OnyxInputO
 }
 
 function isExportIntegrationAction(reportAction: OnyxInputOrEntry<ReportAction>): boolean {
-    return reportAction?.actionName === CONST.REPORT.ACTIONS.TYPE.EXPORTED_TO_INTEGRATION;
+    return reportAction?.actionName === CONST.REPORT.ACTIONS.TYPE.INTEGRATIONS_MESSAGE && !!getOriginalMessage(reportAction as ReportAction<'INTEGRATIONSMESSAGE'>)?.result?.success;
 }
 
 /**
diff --git a/src/libs/ReportPreviewActionUtils.ts b/src/libs/ReportPreviewActionUtils.ts
index 6fb7caa41ef4a..de2c7cca3bf30 100644
--- a/src/libs/ReportPreviewActionUtils.ts
+++ b/src/libs/ReportPreviewActionUtils.ts
@@ -28,13 +28,16 @@ import {
 } from './ReportUtils';
 import {getSession} from './SessionUtils';
 
-function canSubmit(report: Report, violations: OnyxCollection<TransactionViolation[]>, policy?: Policy) {
+function canSubmit(report: Report, violations: OnyxCollection<TransactionViolation[]>, policy?: Policy, transactions?: Transaction[]) {
     const isExpense = isExpenseReport(report);
     const isSubmitter = isCurrentUserSubmitter(report.reportID);
     const isOpen = isOpenReport(report);
     const isManualSubmitEnabled = getCorrectedAutoReportingFrequency(policy) === CONST.POLICY.AUTO_REPORTING_FREQUENCIES.MANUAL;
     const hasAnyViolations =
-        hasViolations(report.reportID, violations) || hasNoticeTypeViolations(report.reportID, violations, true) || hasWarningTypeViolations(report.reportID, violations, true);
+        hasMissingSmartscanFields(report.reportID, transactions) ||
+        hasViolations(report.reportID, violations) ||
+        hasNoticeTypeViolations(report.reportID, violations, true) ||
+        hasWarningTypeViolations(report.reportID, violations, true);
     return isExpense && isSubmitter && isOpen && isManualSubmitEnabled && !hasAnyViolations;
 }
 
@@ -44,7 +47,10 @@ function canApprove(report: Report, violations: OnyxCollection<TransactionViolat
     const isProcessing = isProcessingReport(report);
     const isApprovalEnabled = policy ? policy.approvalMode && policy.approvalMode !== CONST.POLICY.APPROVAL_MODE.OPTIONAL : false;
     const hasAnyViolations =
-        hasViolations(report.reportID, violations) || hasNoticeTypeViolations(report.reportID, violations, true) || hasWarningTypeViolations(report.reportID, violations, true);
+        hasMissingSmartscanFields(report.reportID, transactions) ||
+        hasViolations(report.reportID, violations) ||
+        hasNoticeTypeViolations(report.reportID, violations, true) ||
+        hasWarningTypeViolations(report.reportID, violations, true);
     const reportTransactions = transactions ?? getReportTransactions(report?.reportID);
     return isExpense && isApprover && isProcessing && isApprovalEnabled && !hasAnyViolations && reportTransactions.length > 0;
 }
@@ -141,7 +147,7 @@ function getReportPreviewAction(
     if (!report) {
         return CONST.REPORT.REPORT_PREVIEW_ACTIONS.VIEW;
     }
-    if (canSubmit(report, violations, policy)) {
+    if (canSubmit(report, violations, policy, transactions)) {
         return CONST.REPORT.REPORT_PREVIEW_ACTIONS.SUBMIT;
     }
     if (canApprove(report, violations, policy, transactions)) {
diff --git a/src/types/onyx/OriginalMessage.ts b/src/types/onyx/OriginalMessage.ts
index 991561471901c..f4827c0d5a9ff 100644
--- a/src/types/onyx/OriginalMessage.ts
+++ b/src/types/onyx/OriginalMessage.ts
@@ -739,6 +739,17 @@ type OriginalMessageCard = {
     cardID: number;
 };
 
+/**
+ * Model of INTEGRATIONS_MESSAGE report action
+ */
+type OriginalMessageIntegrationMessage = {
+    /** Object with detailed result */
+    result: {
+        /** Wether action was successful */
+        success: boolean;
+    };
+};
+
 /**
  * Original message for CARD_ISSUED, CARD_MISSING_ADDRESS, CARD_ASSIGNED and CARD_ISSUED_VIRTUAL actions
  */
@@ -772,7 +783,7 @@ type OriginalMessageMap = {
     [CONST.REPORT.ACTIONS.TYPE.FORWARDED]: OriginalMessageForwarded;
     [CONST.REPORT.ACTIONS.TYPE.HOLD]: never;
     [CONST.REPORT.ACTIONS.TYPE.HOLD_COMMENT]: never;
-    [CONST.REPORT.ACTIONS.TYPE.INTEGRATIONS_MESSAGE]: never;
+    [CONST.REPORT.ACTIONS.TYPE.INTEGRATIONS_MESSAGE]: OriginalMessageIntegrationMessage;
     [CONST.REPORT.ACTIONS.TYPE.IOU]: OriginalMessageIOU;
     [CONST.REPORT.ACTIONS.TYPE.MANAGER_ATTACH_RECEIPT]: never;
     [CONST.REPORT.ACTIONS.TYPE.MANAGER_DETACH_RECEIPT]: never;

From 8361f6eb39c255c2b5441ef806e237f75f2c9d98 Mon Sep 17 00:00:00 2001
From: Jan Nowakowski <janeknowakowski9@gmail.com>
Date: Thu, 17 Apr 2025 09:56:57 +0200
Subject: [PATCH 28/42] Check if receipt is being scanned before allowing to
 submit

---
 src/libs/ReportPreviewActionUtils.ts | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/libs/ReportPreviewActionUtils.ts b/src/libs/ReportPreviewActionUtils.ts
index de2c7cca3bf30..f0a45dd411b27 100644
--- a/src/libs/ReportPreviewActionUtils.ts
+++ b/src/libs/ReportPreviewActionUtils.ts
@@ -27,6 +27,7 @@ import {
     isSettled,
 } from './ReportUtils';
 import {getSession} from './SessionUtils';
+import {isReceiptBeingScanned} from './TransactionUtils';
 
 function canSubmit(report: Report, violations: OnyxCollection<TransactionViolation[]>, policy?: Policy, transactions?: Transaction[]) {
     const isExpense = isExpenseReport(report);
@@ -38,7 +39,8 @@ function canSubmit(report: Report, violations: OnyxCollection<TransactionViolati
         hasViolations(report.reportID, violations) ||
         hasNoticeTypeViolations(report.reportID, violations, true) ||
         hasWarningTypeViolations(report.reportID, violations, true);
-    return isExpense && isSubmitter && isOpen && isManualSubmitEnabled && !hasAnyViolations;
+    const isAnyReceiptBeingScanned = transactions?.some((transaction) => isReceiptBeingScanned(transaction));
+    return isExpense && isSubmitter && isOpen && isManualSubmitEnabled && !hasAnyViolations && !isAnyReceiptBeingScanned;
 }
 
 function canApprove(report: Report, violations: OnyxCollection<TransactionViolation[]>, policy?: Policy, transactions?: Transaction[]) {

From 04805a3cfa7327e49e2b847678f2c5e6892da7b9 Mon Sep 17 00:00:00 2001
From: Jan Nowakowski <janeknowakowski9@gmail.com>
Date: Fri, 18 Apr 2025 11:42:07 +0200
Subject: [PATCH 29/42] fix 59999\#issuecomment-2814714079

---
 .../MoneyRequestReportPreviewContent.tsx      |  8 +-----
 .../ReportActionItem/ReportPreview.tsx        |  7 +-----
 src/libs/ReportPreviewActionUtils.ts          | 25 ++++++++++++++++++-
 src/libs/ReportPrimaryActionUtils.ts          |  8 ++++++
 src/libs/ReportSecondaryActionUtils.ts        |  7 ++++++
 src/libs/ReportUtils.ts                       |  8 ------
 .../NonUSD/Finish/index.tsx                   |  1 -
 7 files changed, 41 insertions(+), 23 deletions(-)

diff --git a/src/components/ReportActionItem/MoneyRequestReportPreview/MoneyRequestReportPreviewContent.tsx b/src/components/ReportActionItem/MoneyRequestReportPreview/MoneyRequestReportPreviewContent.tsx
index 632e6b619f19f..c9d32cd099c3b 100644
--- a/src/components/ReportActionItem/MoneyRequestReportPreview/MoneyRequestReportPreviewContent.tsx
+++ b/src/components/ReportActionItem/MoneyRequestReportPreview/MoneyRequestReportPreviewContent.tsx
@@ -48,7 +48,6 @@ import {
     hasOnlyHeldExpenses as hasOnlyHeldExpensesReportUtils,
     hasOnlyTransactionsWithPendingRoutes as hasOnlyTransactionsWithPendingRoutesReportUtils,
     hasUpdatedTotal,
-    isAllowedToSubmitDraftExpenseReport,
     isInvoiceReport as isInvoiceReportUtils,
     isInvoiceRoom as isInvoiceRoomReportUtils,
     isPolicyExpenseChat as isPolicyExpenseChatReportUtils,
@@ -61,7 +60,7 @@ import {getMerchant, hasPendingUI, isCardTransaction, isPartialMerchant, isPendi
 import navigationRef from '@navigation/navigationRef';
 import colors from '@styles/theme/colors';
 import variables from '@styles/variables';
-import {approveMoneyRequest, canIOUBePaid as canIOUBePaidIOUActions, canSubmitReport, payInvoice, payMoneyRequest, submitReport} from '@userActions/IOU';
+import {approveMoneyRequest, canIOUBePaid as canIOUBePaidIOUActions, payInvoice, payMoneyRequest, submitReport} from '@userActions/IOU';
 import Timing from '@userActions/Timing';
 import CONST from '@src/CONST';
 import type {TranslationPaths} from '@src/languages/types';
@@ -182,10 +181,6 @@ function MoneyRequestReportPreviewContent({
         formattedMerchant = undefined;
     }
 
-    const filteredTransactions = transactions?.filter((transaction) => transaction) ?? [];
-    const shouldShowSubmitButton = canSubmitReport(iouReport, policy, filteredTransactions, violations);
-    const shouldDisableSubmitButton = shouldShowSubmitButton && !isAllowedToSubmitDraftExpenseReport(iouReport);
-
     // The submit button should be success green colour only if the user is submitter and the policy does not have Scheduled Submit turned on
     const isWaitingForSubmissionFromCurrentUser = useMemo(() => isWaitingForSubmissionFromCurrentUserReportUtils(chatReport, policy), [chatReport, policy]);
 
@@ -436,7 +431,6 @@ function MoneyRequestReportPreviewContent({
                 success={isWaitingForSubmissionFromCurrentUser}
                 text={translate('common.submit')}
                 onPress={() => submitReport(iouReport)}
-                isDisabled={shouldDisableSubmitButton}
             />
         ),
         [CONST.REPORT.REPORT_PREVIEW_ACTIONS.APPROVE]: (
diff --git a/src/components/ReportActionItem/ReportPreview.tsx b/src/components/ReportActionItem/ReportPreview.tsx
index 8a296721bf190..6df707f235719 100644
--- a/src/components/ReportActionItem/ReportPreview.tsx
+++ b/src/components/ReportActionItem/ReportPreview.tsx
@@ -60,7 +60,6 @@ import {
     hasUpdatedTotal,
     hasViolations,
     hasWarningTypeViolations,
-    isAllowedToSubmitDraftExpenseReport,
     isArchivedReportWithID,
     isInvoiceReport as isInvoiceReportUtils,
     isInvoiceRoom as isInvoiceRoomReportUtils,
@@ -86,7 +85,7 @@ import {
 import {contextMenuRef} from '@pages/home/report/ContextMenu/ReportActionContextMenu';
 import type {ContextMenuAnchor} from '@pages/home/report/ContextMenu/ReportActionContextMenu';
 import variables from '@styles/variables';
-import {approveMoneyRequest, canIOUBePaid as canIOUBePaidIOUActions, canSubmitReport, payInvoice, payMoneyRequest, submitReport} from '@userActions/IOU';
+import {approveMoneyRequest, canIOUBePaid as canIOUBePaidIOUActions, payInvoice, payMoneyRequest, submitReport} from '@userActions/IOU';
 import Timing from '@userActions/Timing';
 import CONST from '@src/CONST';
 import type {TranslationPaths} from '@src/languages/types';
@@ -250,9 +249,6 @@ function ReportPreview({
     }
 
     const isArchived = isArchivedReportWithID(iouReport?.reportID);
-    const filteredTransactions = transactions?.filter((transaction) => transaction) ?? [];
-    const shouldShowSubmitButton = canSubmitReport(iouReport, policy, filteredTransactions, violations);
-    const shouldDisableSubmitButton = shouldShowSubmitButton && !isAllowedToSubmitDraftExpenseReport(iouReport);
 
     // The submit button should be success green colour only if the user is submitter and the policy does not have Scheduled Submit turned on
     const isWaitingForSubmissionFromCurrentUser = useMemo(() => isWaitingForSubmissionFromCurrentUserReportUtils(chatReport, policy), [chatReport, policy]);
@@ -515,7 +511,6 @@ function ReportPreview({
                 success={isWaitingForSubmissionFromCurrentUser}
                 text={translate('common.submit')}
                 onPress={() => submitReport(iouReport)}
-                isDisabled={shouldDisableSubmitButton}
             />
         ),
         [CONST.REPORT.REPORT_PREVIEW_ACTIONS.APPROVE]: (
diff --git a/src/libs/ReportPreviewActionUtils.ts b/src/libs/ReportPreviewActionUtils.ts
index f0a45dd411b27..aa33561dd4701 100644
--- a/src/libs/ReportPreviewActionUtils.ts
+++ b/src/libs/ReportPreviewActionUtils.ts
@@ -4,7 +4,15 @@ import CONST from '@src/CONST';
 import type {Policy, Report, Transaction, TransactionViolation} from '@src/types/onyx';
 import {isApprover as isApproverMember} from './actions/Policy/Member';
 import {getCurrentUserAccountID} from './actions/Report';
-import {arePaymentsEnabled, getConnectedIntegration, getCorrectedAutoReportingFrequency, hasAccountingConnections, hasIntegrationAutoSync, isPrefferedExporter} from './PolicyUtils';
+import {
+    arePaymentsEnabled,
+    getConnectedIntegration,
+    getCorrectedAutoReportingFrequency,
+    getSubmitToAccountID,
+    hasAccountingConnections,
+    hasIntegrationAutoSync,
+    isPrefferedExporter,
+} from './PolicyUtils';
 import {
     getMoneyRequestSpendBreakdown,
     getParentReport,
@@ -40,6 +48,13 @@ function canSubmit(report: Report, violations: OnyxCollection<TransactionViolati
         hasNoticeTypeViolations(report.reportID, violations, true) ||
         hasWarningTypeViolations(report.reportID, violations, true);
     const isAnyReceiptBeingScanned = transactions?.some((transaction) => isReceiptBeingScanned(transaction));
+
+    const submitToAccountID = getSubmitToAccountID(policy, report);
+
+    if (submitToAccountID === report.ownerAccountID && policy?.preventSelfApproval) {
+        return false;
+    }
+
     return isExpense && isSubmitter && isOpen && isManualSubmitEnabled && !hasAnyViolations && !isAnyReceiptBeingScanned;
 }
 
@@ -54,6 +69,14 @@ function canApprove(report: Report, violations: OnyxCollection<TransactionViolat
         hasNoticeTypeViolations(report.reportID, violations, true) ||
         hasWarningTypeViolations(report.reportID, violations, true);
     const reportTransactions = transactions ?? getReportTransactions(report?.reportID);
+
+    const isPreventSelfApprovalEnabled = policy?.preventSelfApproval;
+    const isReportSubmitter = isCurrentUserSubmitter(report.reportID);
+
+    if (isPreventSelfApprovalEnabled && isReportSubmitter) {
+        return false;
+    }
+
     return isExpense && isApprover && isProcessing && isApprovalEnabled && !hasAnyViolations && reportTransactions.length > 0;
 }
 
diff --git a/src/libs/ReportPrimaryActionUtils.ts b/src/libs/ReportPrimaryActionUtils.ts
index 33e3b6cbc1001..5a6dd211c43df 100644
--- a/src/libs/ReportPrimaryActionUtils.ts
+++ b/src/libs/ReportPrimaryActionUtils.ts
@@ -8,6 +8,7 @@ import {
     arePaymentsEnabled as arePaymentsEnabledUtils,
     getConnectedIntegration,
     getCorrectedAutoReportingFrequency,
+    getSubmitToAccountID,
     hasAccountingConnections,
     hasIntegrationAutoSync,
     isPrefferedExporter,
@@ -46,6 +47,13 @@ function isSubmitAction(report: Report, reportTransactions: Transaction[], polic
     const isOpenReport = isOpenReportUtils(report);
     const isManualSubmitEnabled = getCorrectedAutoReportingFrequency(policy) === CONST.POLICY.AUTO_REPORTING_FREQUENCIES.MANUAL;
     const transactionAreComplete = reportTransactions.every((transaction) => transaction.amount !== 0 || transaction.modifiedAmount !== 0);
+
+    const submitToAccountID = getSubmitToAccountID(policy, report);
+
+    if (submitToAccountID === report.ownerAccountID && policy?.preventSelfApproval) {
+        return false;
+    }
+
     return isExpenseReport && isReportSubmitter && isOpenReport && isManualSubmitEnabled && reportTransactions.length !== 0 && transactionAreComplete;
 }
 
diff --git a/src/libs/ReportSecondaryActionUtils.ts b/src/libs/ReportSecondaryActionUtils.ts
index 2b4b7e980f499..bcd44b18e4e20 100644
--- a/src/libs/ReportSecondaryActionUtils.ts
+++ b/src/libs/ReportSecondaryActionUtils.ts
@@ -9,6 +9,7 @@ import {
     getAllPolicies,
     getConnectedIntegration,
     getCorrectedAutoReportingFrequency,
+    getSubmitToAccountID,
     hasAccountingConnections,
     hasIntegrationAutoSync,
     hasNoPolicyOtherThanPersonalType,
@@ -53,6 +54,12 @@ function isSubmitAction(report: Report, policy?: Policy): boolean {
         return false;
     }
 
+    const submitToAccountID = getSubmitToAccountID(policy, report);
+
+    if (submitToAccountID === report.ownerAccountID && policy?.preventSelfApproval) {
+        return false;
+    }
+
     const isAdmin = policy?.role === CONST.POLICY.ROLE.ADMIN;
 
     if (isAdmin) {
diff --git a/src/libs/ReportUtils.ts b/src/libs/ReportUtils.ts
index daf663cf7356f..762cd3c663c5d 100644
--- a/src/libs/ReportUtils.ts
+++ b/src/libs/ReportUtils.ts
@@ -9154,13 +9154,6 @@ function isAllowedToApproveExpenseReport(report: OnyxEntry<Report>, approverAcco
     return !(policy?.preventSelfApproval && isOwner);
 }
 
-function isAllowedToSubmitDraftExpenseReport(report: OnyxEntry<Report>): boolean {
-    const policy = getPolicy(report?.policyID);
-    const submitToAccountID = getSubmitToAccountID(policy, report);
-
-    return isAllowedToApproveExpenseReport(report, submitToAccountID);
-}
-
 /**
  * What missing payment method does this report action indicate, if any?
  */
@@ -10573,7 +10566,6 @@ export {
     isAdminsOnlyPostingRoom,
     isAllowedToApproveExpenseReport,
     isAllowedToComment,
-    isAllowedToSubmitDraftExpenseReport,
     isAnnounceRoom,
     isArchivedNonExpenseReport,
     isArchivedReport,
diff --git a/src/pages/ReimbursementAccount/NonUSD/Finish/index.tsx b/src/pages/ReimbursementAccount/NonUSD/Finish/index.tsx
index 618112ce964c0..8217667b39bda 100644
--- a/src/pages/ReimbursementAccount/NonUSD/Finish/index.tsx
+++ b/src/pages/ReimbursementAccount/NonUSD/Finish/index.tsx
@@ -1,7 +1,6 @@
 import React from 'react';
 import {View} from 'react-native';
 import {useOnyx} from 'react-native-onyx';
-import Button from '@components/Button';
 import HeaderWithBackButton from '@components/HeaderWithBackButton';
 import * as Expensicons from '@components/Icon/Expensicons';
 import {ChatBubble} from '@components/Icon/Expensicons';

From 611d96e607249585f9ca0931004fcf4c7f1e2648 Mon Sep 17 00:00:00 2001
From: Jan Nowakowski <janeknowakowski9@gmail.com>
Date: Fri, 18 Apr 2025 12:11:30 +0200
Subject: [PATCH 30/42] fix 59999\#issuecomment-2814854160

---
 src/libs/ReportPreviewActionUtils.ts | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/libs/ReportPreviewActionUtils.ts b/src/libs/ReportPreviewActionUtils.ts
index aa33561dd4701..dbb3cb83fcae5 100644
--- a/src/libs/ReportPreviewActionUtils.ts
+++ b/src/libs/ReportPreviewActionUtils.ts
@@ -107,6 +107,10 @@ function canPay(report: Report, violations: OnyxCollection<TransactionViolation[
         return true;
     }
 
+    if (!isProcessing) {
+        return false;
+    }
+
     const isIOU = isIOUReport(report);
 
     if (isIOU && isReportPayer && !isReimbursed) {

From 390d1db798b4a4074b18baf66998178fc2ede4e1 Mon Sep 17 00:00:00 2001
From: Jan Nowakowski <janeknowakowski9@gmail.com>
Date: Fri, 18 Apr 2025 12:16:54 +0200
Subject: [PATCH 31/42] fix 59999\#issuecomment-2814873758

---
 src/libs/ReportPrimaryActionUtils.ts   |  7 +++++++
 src/libs/ReportSecondaryActionUtils.ts | 10 ++++++++--
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/src/libs/ReportPrimaryActionUtils.ts b/src/libs/ReportPrimaryActionUtils.ts
index 5a6dd211c43df..a7caccc9dd675 100644
--- a/src/libs/ReportPrimaryActionUtils.ts
+++ b/src/libs/ReportPrimaryActionUtils.ts
@@ -37,6 +37,7 @@ import {
     hasPendingRTERViolation as hasPendingRTERViolationTransactionUtils,
     isDuplicate,
     isOnHold as isOnHoldTransactionUtils,
+    isReceiptBeingScanned,
     shouldShowBrokenConnectionViolationForMultipleTransactions,
     shouldShowBrokenConnectionViolation as shouldShowBrokenConnectionViolationTransactionUtils,
 } from './TransactionUtils';
@@ -48,6 +49,12 @@ function isSubmitAction(report: Report, reportTransactions: Transaction[], polic
     const isManualSubmitEnabled = getCorrectedAutoReportingFrequency(policy) === CONST.POLICY.AUTO_REPORTING_FREQUENCIES.MANUAL;
     const transactionAreComplete = reportTransactions.every((transaction) => transaction.amount !== 0 || transaction.modifiedAmount !== 0);
 
+    const isAnyReceiptBeingScanned = reportTransactions?.some((transaction) => isReceiptBeingScanned(transaction));
+
+    if (isAnyReceiptBeingScanned) {
+        return false;
+    }
+
     const submitToAccountID = getSubmitToAccountID(policy, report);
 
     if (submitToAccountID === report.ownerAccountID && policy?.preventSelfApproval) {
diff --git a/src/libs/ReportSecondaryActionUtils.ts b/src/libs/ReportSecondaryActionUtils.ts
index bcd44b18e4e20..c97324bf90d01 100644
--- a/src/libs/ReportSecondaryActionUtils.ts
+++ b/src/libs/ReportSecondaryActionUtils.ts
@@ -34,7 +34,13 @@ import {
 import {getSession} from './SessionUtils';
 import {allHavePendingRTERViolation, isDuplicate, isOnHold as isOnHoldTransactionUtils, shouldShowBrokenConnectionViolationForMultipleTransactions} from './TransactionUtils';
 
-function isSubmitAction(report: Report, policy?: Policy): boolean {
+function isSubmitAction(report: Report, reportTransactions: Transaction[], policy?: Policy): boolean {
+    const transactionAreComplete = reportTransactions.every((transaction) => transaction.amount !== 0 || transaction.modifiedAmount !== 0);
+
+    if (!transactionAreComplete) {
+        return false;
+    }
+
     const isExpenseReport = isExpenseReportUtils(report);
 
     if (!isExpenseReport || report?.total === 0) {
@@ -392,7 +398,7 @@ function getSecondaryReportActions(
 ): Array<ValueOf<typeof CONST.REPORT.SECONDARY_ACTIONS>> {
     const options: Array<ValueOf<typeof CONST.REPORT.SECONDARY_ACTIONS>> = [];
 
-    if (isSubmitAction(report, policy)) {
+    if (isSubmitAction(report, reportTransactions, policy)) {
         options.push(CONST.REPORT.SECONDARY_ACTIONS.SUBMIT);
     }
 

From b7832eeb73a8d019c8f84d49751f2a1d1da1ff20 Mon Sep 17 00:00:00 2001
From: Jan Nowakowski <janeknowakowski9@gmail.com>
Date: Fri, 18 Apr 2025 12:48:20 +0200
Subject: [PATCH 32/42] fix 59999\#issuecomment-2814939366

---
 src/CONST.ts                         |  1 +
 src/components/MoneyReportHeader.tsx | 12 ++++++++++++
 src/libs/ReportPrimaryActionUtils.ts |  8 ++++++++
 3 files changed, 21 insertions(+)

diff --git a/src/CONST.ts b/src/CONST.ts
index 53636f086fa34..ad25db9900442 100755
--- a/src/CONST.ts
+++ b/src/CONST.ts
@@ -1184,6 +1184,7 @@ const CONST = {
             PAY: 'pay',
             EXPORT_TO_ACCOUNTING: 'exportToAccounting',
             REMOVE_HOLD: 'removeHold',
+            REVIEW_DUPLICATES: 'reviewDuplicates',
             MARK_AS_CASH: 'markAsCash',
         },
         TRANSACTION_PRIMARY_ACTIONS: {
diff --git a/src/components/MoneyReportHeader.tsx b/src/components/MoneyReportHeader.tsx
index dc575b970e93b..021c5f768404e 100644
--- a/src/components/MoneyReportHeader.tsx
+++ b/src/components/MoneyReportHeader.tsx
@@ -535,6 +535,18 @@ function MoneyReportHeader({policy, report: moneyRequestReport, transactionThrea
                 onPress={markAsCash}
             />
         ),
+        [CONST.REPORT.PRIMARY_ACTIONS.REVIEW_DUPLICATES]: (
+            <Button
+                success
+                text={translate('iou.reviewDuplicates')}
+                onPress={() => {
+                    if (!transactionThreadReportID) {
+                        return;
+                    }
+                    Navigation.navigate(ROUTES.TRANSACTION_DUPLICATE_REVIEW_PAGE.getRoute(transactionThreadReportID, Navigation.getReportRHPActiveRoute()));
+                }}
+            />
+        ),
     };
 
     const secondaryActions = useMemo(() => {
diff --git a/src/libs/ReportPrimaryActionUtils.ts b/src/libs/ReportPrimaryActionUtils.ts
index a7caccc9dd675..95e3b723fb99b 100644
--- a/src/libs/ReportPrimaryActionUtils.ts
+++ b/src/libs/ReportPrimaryActionUtils.ts
@@ -194,6 +194,10 @@ function isRemoveHoldAction(report: Report, reportTransactions: Transaction[]) {
 }
 
 function isReviewDuplicatesAction(report: Report, reportTransactions: Transaction[], policy?: Policy) {
+    if (reportTransactions.length !== 1) {
+        return false;
+    }
+
     const hasDuplicates = reportTransactions.some((transaction) => isDuplicate(transaction.transactionID));
 
     if (!hasDuplicates) {
@@ -245,6 +249,10 @@ function getReportPrimaryAction(
     violations: OnyxCollection<TransactionViolation[]>,
     policy?: Policy,
 ): ValueOf<typeof CONST.REPORT.PRIMARY_ACTIONS> | '' {
+    if (isReviewDuplicatesAction(report, reportTransactions, policy)) {
+        return CONST.REPORT.PRIMARY_ACTIONS.REVIEW_DUPLICATES;
+    }
+
     if (isRemoveHoldAction(report, reportTransactions)) {
         return CONST.REPORT.PRIMARY_ACTIONS.REMOVE_HOLD;
     }

From 2e39ba8f926bc18d69e437f8fe442de38a3e2914 Mon Sep 17 00:00:00 2001
From: Jan Nowakowski <janeknowakowski9@gmail.com>
Date: Fri, 18 Apr 2025 13:34:26 +0200
Subject: [PATCH 33/42] fix 59999\#issuecomment-2815075448

---
 src/libs/ReportPreviewActionUtils.ts | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/libs/ReportPreviewActionUtils.ts b/src/libs/ReportPreviewActionUtils.ts
index dbb3cb83fcae5..5a66e64e96d65 100644
--- a/src/libs/ReportPreviewActionUtils.ts
+++ b/src/libs/ReportPreviewActionUtils.ts
@@ -163,8 +163,16 @@ function canReview(report: Report, violations: OnyxCollection<TransactionViolati
     const isSubmitter = isCurrentUserSubmitter(report.reportID);
     const isReimbursed = isSettled(report);
     const isApprover = isApproverMember(policy, getCurrentUserAccountID());
-    const areWorkflowsEnabled = policy ? policy.areWorkflowsEnabled : false;
-    return hasAnyViolations && (isSubmitter || isApprover) && areWorkflowsEnabled && !isReimbursed;
+
+    if (!hasAnyViolations || !(isSubmitter || isApprover) || isReimbursed) {
+        return false;
+    }
+
+    if (policy) {
+        return !!policy.areWorkflowsEnabled;
+    }
+
+    return true;
 }
 
 function getReportPreviewAction(

From 172a0f9dbf3d9ebe07476862cfa2903e3d5613f4 Mon Sep 17 00:00:00 2001
From: Jan Nowakowski <janeknowakowski9@gmail.com>
Date: Tue, 22 Apr 2025 13:07:43 +0200
Subject: [PATCH 34/42] Hide new logic behind beta

---
 src/components/MoneyReportHeaderOld.tsx       | 730 ++++++++++++++++++
 src/components/MoneyRequestHeaderOld.tsx      | 231 ++++++
 .../ReportActionItem/ReportPreviewOld.tsx     | 709 +++++++++++++++++
 src/libs/ReportUtils.ts                       |   8 +
 src/libs/TransactionUtils/index.ts            |  10 +
 src/pages/home/ReportScreen.tsx               |  23 +-
 .../home/report/PureReportActionItem.tsx      |  18 +-
 7 files changed, 1725 insertions(+), 4 deletions(-)
 create mode 100644 src/components/MoneyReportHeaderOld.tsx
 create mode 100644 src/components/MoneyRequestHeaderOld.tsx
 create mode 100644 src/components/ReportActionItem/ReportPreviewOld.tsx

diff --git a/src/components/MoneyReportHeaderOld.tsx b/src/components/MoneyReportHeaderOld.tsx
new file mode 100644
index 0000000000000..bbe004c11e332
--- /dev/null
+++ b/src/components/MoneyReportHeaderOld.tsx
@@ -0,0 +1,730 @@
+import {useRoute} from '@react-navigation/native';
+import React, {useCallback, useEffect, useMemo, useRef, useState} from 'react';
+import {View} from 'react-native';
+import type {OnyxEntry} from 'react-native-onyx';
+import {useOnyx} from 'react-native-onyx';
+import useLocalize from '@hooks/useLocalize';
+import useNetwork from '@hooks/useNetwork';
+import usePaymentAnimations from '@hooks/usePaymentAnimations';
+import useResponsiveLayout from '@hooks/useResponsiveLayout';
+import useTheme from '@hooks/useTheme';
+import useThemeStyles from '@hooks/useThemeStyles';
+import {exportReportToCSV} from '@libs/actions/Report';
+import {convertToDisplayString} from '@libs/CurrencyUtils';
+import Navigation from '@libs/Navigation/Navigation';
+import {buildOptimisticNextStepForPreventSelfApprovalsEnabled} from '@libs/NextStepUtils';
+import {getConnectedIntegration} from '@libs/PolicyUtils';
+import {getIOUActionForTransactionID, getOriginalMessage, isDeletedAction, isMoneyRequestAction, isTrackExpenseAction} from '@libs/ReportActionsUtils';
+import {
+    canBeExported,
+    canDeleteCardTransactionByLiabilityType,
+    canDeleteTransaction,
+    getArchiveReason,
+    getBankAccountRoute,
+    getMoneyRequestSpendBreakdown,
+    getNonHeldAndFullAmount,
+    getTransactionsWithReceipts,
+    hasHeldExpenses as hasHeldExpensesReportUtils,
+    hasOnlyHeldExpenses as hasOnlyHeldExpensesReportUtils,
+    hasUpdatedTotal,
+    isAllowedToApproveExpenseReport,
+    isAllowedToSubmitDraftExpenseReport,
+    isArchivedReportWithID,
+    isInvoiceReport,
+    isProcessingReport,
+    isReportApproved,
+    isReportOwner,
+    isWaitingForSubmissionFromCurrentUser as isWaitingForSubmissionFromCurrentUserReportUtils,
+    navigateBackOnDeleteTransaction,
+    reportTransactionsSelector,
+} from '@libs/ReportUtils';
+import {
+    allHavePendingRTERViolation,
+    checkIfShouldShowMarkAsCashButton,
+    getTransaction,
+    hasDuplicateTransactions,
+    isDuplicate as isDuplicateTransactionUtils,
+    isExpensifyCardTransaction,
+    isOnHold as isOnHoldTransactionUtils,
+    isPayAtEndExpense as isPayAtEndExpenseTransactionUtils,
+    isPending,
+    isReceiptBeingScanned,
+    shouldShowBrokenConnectionViolationForMultipleTransactions,
+    shouldShowRTERViolationMessage,
+} from '@libs/TransactionUtils';
+import variables from '@styles/variables';
+import {
+    approveMoneyRequest,
+    canApproveIOU,
+    canIOUBePaid as canIOUBePaidAction,
+    canSubmitReport,
+    deleteMoneyRequest,
+    deleteTrackExpense,
+    getNextApproverAccountID,
+    payInvoice,
+    payMoneyRequest,
+    submitReport,
+    unholdRequest,
+} from '@userActions/IOU';
+import {markAsCash as markAsCashAction} from '@userActions/Transaction';
+import CONST from '@src/CONST';
+import useDelegateUserDetails from '@src/hooks/useDelegateUserDetails';
+import ONYXKEYS from '@src/ONYXKEYS';
+import type {Route} from '@src/ROUTES';
+import ROUTES from '@src/ROUTES';
+import SCREENS from '@src/SCREENS';
+import type * as OnyxTypes from '@src/types/onyx';
+import type {PaymentMethodType} from '@src/types/onyx/OriginalMessage';
+import type IconAsset from '@src/types/utils/IconAsset';
+import isLoadingOnyxValue from '@src/types/utils/isLoadingOnyxValue';
+import BrokenConnectionDescription from './BrokenConnectionDescription';
+import Button from './Button';
+import ButtonWithDropdownMenu from './ButtonWithDropdownMenu';
+import ConfirmModal from './ConfirmModal';
+import DecisionModal from './DecisionModal';
+import DelegateNoAccessModal from './DelegateNoAccessModal';
+import HeaderWithBackButton from './HeaderWithBackButton';
+import Icon from './Icon';
+import * as Expensicons from './Icon/Expensicons';
+import type {PaymentMethod} from './KYCWall/types';
+import LoadingBar from './LoadingBar';
+import MoneyReportHeaderStatusBar from './MoneyReportHeaderStatusBar';
+import type {MoneyRequestHeaderStatusBarProps} from './MoneyRequestHeaderStatusBar';
+import MoneyRequestHeaderStatusBar from './MoneyRequestHeaderStatusBar';
+import {useMoneyRequestReportContext} from './MoneyRequestReportView/MoneyRequestReportContext';
+import type {ActionHandledType} from './ProcessMoneyReportHoldMenu';
+import ProcessMoneyReportHoldMenu from './ProcessMoneyReportHoldMenu';
+import ExportWithDropdownMenu from './ReportActionItem/ExportWithDropdownMenu';
+import AnimatedSettlementButton from './SettlementButton/AnimatedSettlementButton';
+
+type MoneyReportHeaderProps = {
+    /** The report currently being looked at */
+    report: OnyxEntry<OnyxTypes.Report>;
+
+    /** The policy tied to the expense report */
+    policy: OnyxEntry<OnyxTypes.Policy>;
+
+    /** Array of report actions for the report */
+    reportActions: OnyxTypes.ReportAction[];
+
+    /** The reportID of the transaction thread report associated with this current report, if any */
+    // eslint-disable-next-line react/no-unused-prop-types
+    transactionThreadReportID: string | undefined;
+
+    /** Whether back button should be displayed in header */
+    shouldDisplayBackButton?: boolean;
+
+    /** Method to trigger when pressing close button of the header */
+    onBackButtonPress: () => void;
+};
+
+function MoneyReportHeaderOld({policy, report: moneyRequestReport, transactionThreadReportID, reportActions, shouldDisplayBackButton = false, onBackButtonPress}: MoneyReportHeaderProps) {
+    // We need to use isSmallScreenWidth instead of shouldUseNarrowLayout to use a correct layout for the hold expense modal https://github.com/Expensify/App/pull/47990#issuecomment-2362382026
+    // eslint-disable-next-line rulesdir/prefer-shouldUseNarrowLayout-instead-of-isSmallScreenWidth
+    const {shouldUseNarrowLayout, isSmallScreenWidth} = useResponsiveLayout();
+    const route = useRoute();
+    // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
+    const [chatReport] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${moneyRequestReport?.chatReportID || CONST.DEFAULT_NUMBER_ID}`);
+    // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
+    const [nextStep] = useOnyx(`${ONYXKEYS.COLLECTION.NEXT_STEP}${moneyRequestReport?.reportID || CONST.DEFAULT_NUMBER_ID}`);
+    const [transactionThreadReport] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${transactionThreadReportID}`);
+    const [session] = useOnyx(ONYXKEYS.SESSION);
+    const requestParentReportAction = useMemo(() => {
+        if (!reportActions || !transactionThreadReport?.parentReportActionID) {
+            return null;
+        }
+        return reportActions.find((action): action is OnyxTypes.ReportAction<typeof CONST.REPORT.ACTIONS.TYPE.IOU> => action.reportActionID === transactionThreadReport.parentReportActionID);
+    }, [reportActions, transactionThreadReport?.parentReportActionID]);
+    const [transactions] = useOnyx(ONYXKEYS.COLLECTION.TRANSACTION, {
+        selector: (_transactions) => reportTransactionsSelector(_transactions, moneyRequestReport?.reportID),
+        initialValue: [],
+    });
+    const [transaction] = useOnyx(`${ONYXKEYS.COLLECTION.TRANSACTION}${isMoneyRequestAction(requestParentReportAction) && getOriginalMessage(requestParentReportAction)?.IOUTransactionID}`);
+    const [dismissedHoldUseExplanation, dismissedHoldUseExplanationResult] = useOnyx(ONYXKEYS.NVP_DISMISSED_HOLD_USE_EXPLANATION, {initialValue: true});
+    const isLoadingHoldUseExplained = isLoadingOnyxValue(dismissedHoldUseExplanationResult);
+
+    const {isPaidAnimationRunning, isApprovedAnimationRunning, stopAnimation, startAnimation, startApprovedAnimation} = usePaymentAnimations();
+    const styles = useThemeStyles();
+    const theme = useTheme();
+    const [isDeleteRequestModalVisible, setIsDeleteRequestModalVisible] = useState(false);
+    const {translate} = useLocalize();
+    const {isOffline} = useNetwork();
+    const {reimbursableSpend} = getMoneyRequestSpendBreakdown(moneyRequestReport);
+    const isOnHold = isOnHoldTransactionUtils(transaction);
+    const isDeletedParentAction = !!requestParentReportAction && isDeletedAction(requestParentReportAction);
+    const isDuplicate = isDuplicateTransactionUtils(transaction?.transactionID) && (!isReportApproved({report: moneyRequestReport}) || isApprovedAnimationRunning);
+
+    // Only the requestor can delete the request, admins can only edit it.
+    const isActionOwner =
+        typeof requestParentReportAction?.actorAccountID === 'number' && typeof session?.accountID === 'number' && requestParentReportAction.actorAccountID === session?.accountID;
+    const canDeleteRequest = isActionOwner && canDeleteTransaction(moneyRequestReport) && !isDeletedParentAction;
+    const [isHoldMenuVisible, setIsHoldMenuVisible] = useState(false);
+    const [paymentType, setPaymentType] = useState<PaymentMethodType>();
+    const [requestType, setRequestType] = useState<ActionHandledType>();
+    const canAllowSettlement = hasUpdatedTotal(moneyRequestReport, policy);
+    const policyType = policy?.type;
+    const connectedIntegration = getConnectedIntegration(policy);
+    const navigateBackToAfterDelete = useRef<Route>();
+    const hasScanningReceipt = getTransactionsWithReceipts(moneyRequestReport?.reportID).some((t) => isReceiptBeingScanned(t));
+    const hasOnlyPendingTransactions = useMemo(() => {
+        return !!transactions && transactions.length > 0 && transactions.every((t) => isExpensifyCardTransaction(t) && isPending(t));
+    }, [transactions]);
+    const transactionIDs = useMemo(() => transactions?.map((t) => t.transactionID) ?? [], [transactions]);
+    const [allViolations] = useOnyx(ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS);
+    const violations = useMemo(
+        () => Object.fromEntries(Object.entries(allViolations ?? {}).filter(([key]) => transactionIDs.includes(key.replace(ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS, '')))),
+        [allViolations, transactionIDs],
+    );
+    // Check if there is pending rter violation in all transactionViolations with given transactionIDs.
+    const hasAllPendingRTERViolations = allHavePendingRTERViolation(transactionIDs, violations);
+    // Check if user should see broken connection violation warning.
+    const shouldShowBrokenConnectionViolation = shouldShowBrokenConnectionViolationForMultipleTransactions(transactionIDs, moneyRequestReport, policy, violations);
+    const hasOnlyHeldExpenses = hasOnlyHeldExpensesReportUtils(moneyRequestReport?.reportID);
+    const isPayAtEndExpense = isPayAtEndExpenseTransactionUtils(transaction);
+    const isArchivedReport = isArchivedReportWithID(moneyRequestReport?.reportID);
+    const [archiveReason] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${moneyRequestReport?.reportID}`, {selector: getArchiveReason});
+
+    const getCanIOUBePaid = useCallback(
+        (onlyShowPayElsewhere = false, shouldCheckApprovedState = true) =>
+            canIOUBePaidAction(moneyRequestReport, chatReport, policy, transaction ? [transaction] : undefined, onlyShowPayElsewhere, undefined, undefined, shouldCheckApprovedState),
+        [moneyRequestReport, chatReport, policy, transaction],
+    );
+
+    const [isDownloadErrorModalVisible, setIsDownloadErrorModalVisible] = useState(false);
+
+    const {selectedTransactionsID, setSelectedTransactionsID} = useMoneyRequestReportContext();
+
+    const selectedTransactionsOptions = useMemo(() => {
+        if (!selectedTransactionsID.length) {
+            return [];
+        }
+        const options = [];
+        const selectedTransactions = selectedTransactionsID.map((transactionID) => getTransaction(transactionID)).filter((t) => !!t);
+
+        const anyTransactionOnHold = selectedTransactions.some(isOnHoldTransactionUtils);
+        const allTransactionOnHold = selectedTransactions.every(isOnHoldTransactionUtils);
+        const isReportReimbursed = moneyRequestReport?.stateNum === CONST.REPORT.STATE_NUM.APPROVED && moneyRequestReport?.statusNum === CONST.REPORT.STATUS_NUM.REIMBURSED;
+
+        if (!anyTransactionOnHold && selectedTransactions.length === 1 && !isReportReimbursed) {
+            options.push({
+                text: translate('iou.hold'),
+                icon: Expensicons.Stopwatch,
+                value: CONST.REPORT.SECONDARY_ACTIONS.HOLD,
+                onSelected: () => {
+                    if (!moneyRequestReport?.reportID) {
+                        return;
+                    }
+                    Navigation.navigate(ROUTES.SEARCH_MONEY_REQUEST_REPORT_HOLD_TRANSACTIONS.getRoute({reportID: moneyRequestReport.reportID}));
+                },
+            });
+        }
+
+        if (allTransactionOnHold && selectedTransactions.length === 1) {
+            options.push({
+                text: translate('iou.unhold'),
+                icon: Expensicons.Stopwatch,
+                value: 'UNHOLD',
+                onSelected: () => {
+                    selectedTransactionsID.forEach((transactionID) => {
+                        const action = getIOUActionForTransactionID(reportActions, transactionID);
+                        if (!action?.childReportID) {
+                            return;
+                        }
+                        unholdRequest(transactionID, action?.childReportID);
+                    });
+                    // it's needed in order to recalculate options
+                    setSelectedTransactionsID([...selectedTransactionsID]);
+                },
+            });
+        }
+
+        options.push({
+            value: CONST.REPORT.SECONDARY_ACTIONS.DOWNLOAD,
+            text: translate('common.download'),
+            icon: Expensicons.Download,
+            onSelected: () => {
+                if (!moneyRequestReport) {
+                    return;
+                }
+                exportReportToCSV({reportID: moneyRequestReport.reportID, transactionIDList: selectedTransactionsID}, () => {
+                    setIsDownloadErrorModalVisible(true);
+                });
+            },
+        });
+
+        const canAllSelectedTransactionsBeRemoved = selectedTransactionsID.every((transactionID) => {
+            const canRemoveTransaction = canDeleteCardTransactionByLiabilityType(transactionID);
+            const action = getIOUActionForTransactionID(reportActions, transactionID);
+            const isActionDeleted = isDeletedAction(action);
+            const isIOUActionOwner = typeof action?.actorAccountID === 'number' && typeof session?.accountID === 'number' && action.actorAccountID === session?.accountID;
+
+            return canRemoveTransaction && isIOUActionOwner && !isActionDeleted;
+        });
+
+        const canRemoveReportTransaction = canDeleteTransaction(moneyRequestReport);
+
+        if (canRemoveReportTransaction && canAllSelectedTransactionsBeRemoved) {
+            options.push({
+                text: translate('common.delete'),
+                icon: Expensicons.Trashcan,
+                value: CONST.REPORT.SECONDARY_ACTIONS.DELETE,
+                onSelected: () => {
+                    const iouActions = reportActions.filter((action) => isMoneyRequestAction(action));
+
+                    const transactionsWithActions = selectedTransactions.map((t) => ({
+                        transactionID: t?.transactionID,
+                        action: iouActions.find((action) => {
+                            const IOUTransactionID = (getOriginalMessage(action) as OnyxTypes.OriginalMessageIOU)?.IOUTransactionID;
+
+                            return t?.transactionID === IOUTransactionID;
+                        }),
+                    }));
+
+                    transactionsWithActions.forEach(({transactionID, action}) => action && deleteMoneyRequest(transactionID, action));
+                    setSelectedTransactionsID([]);
+                },
+            });
+        }
+        return options;
+    }, [moneyRequestReport, reportActions, selectedTransactionsID, session?.accountID, setSelectedTransactionsID, translate]);
+
+    const shouldShowSelectedTransactionsButton = !!selectedTransactionsOptions.length;
+
+    const canIOUBePaid = useMemo(() => getCanIOUBePaid(), [getCanIOUBePaid]);
+    const canIOUBePaidAndApproved = useMemo(() => getCanIOUBePaid(false, false), [getCanIOUBePaid]);
+    const onlyShowPayElsewhere = useMemo(() => !canIOUBePaid && getCanIOUBePaid(true), [canIOUBePaid, getCanIOUBePaid]);
+
+    const shouldShowMarkAsCashButton =
+        !!transactionThreadReportID && checkIfShouldShowMarkAsCashButton(hasAllPendingRTERViolations, shouldShowBrokenConnectionViolation, moneyRequestReport, policy);
+
+    const shouldShowPayButton = isPaidAnimationRunning || canIOUBePaid || onlyShowPayElsewhere;
+
+    const shouldShowApproveButton = useMemo(
+        () => (canApproveIOU(moneyRequestReport, policy) && !hasOnlyPendingTransactions) || isApprovedAnimationRunning,
+        [moneyRequestReport, policy, hasOnlyPendingTransactions, isApprovedAnimationRunning],
+    );
+
+    const shouldDisableApproveButton = shouldShowApproveButton && !isAllowedToApproveExpenseReport(moneyRequestReport);
+
+    const isAdmin = policy?.role === CONST.POLICY.ROLE.ADMIN;
+
+    const filteredTransactions = transactions?.filter((t) => t) ?? [];
+    const shouldShowSubmitButton = canSubmitReport(moneyRequestReport, policy, filteredTransactions, violations);
+
+    const shouldShowExportIntegrationButton = !shouldShowPayButton && !shouldShowSubmitButton && connectedIntegration && isAdmin && canBeExported(moneyRequestReport);
+
+    const shouldShowSettlementButton =
+        !shouldShowSelectedTransactionsButton &&
+        !shouldShowSubmitButton &&
+        (shouldShowPayButton || shouldShowApproveButton) &&
+        !shouldShowRTERViolationMessage(transactions) &&
+        !shouldShowExportIntegrationButton &&
+        !shouldShowBrokenConnectionViolation;
+
+    const shouldDisableSubmitButton = shouldShowSubmitButton && !isAllowedToSubmitDraftExpenseReport(moneyRequestReport);
+    const isFromPaidPolicy = policyType === CONST.POLICY.TYPE.TEAM || policyType === CONST.POLICY.TYPE.CORPORATE;
+
+    const hasDuplicates = hasDuplicateTransactions(moneyRequestReport?.reportID);
+    const shouldShowStatusBar =
+        hasAllPendingRTERViolations || shouldShowBrokenConnectionViolation || hasOnlyHeldExpenses || hasScanningReceipt || isPayAtEndExpense || hasOnlyPendingTransactions || hasDuplicates;
+
+    // When prevent self-approval is enabled & the current user is submitter AND they're submitting to theirself, we need to show the optimistic next step
+    // We should always show this optimistic message for policies with preventSelfApproval
+    // to avoid any flicker during transitions between online/offline states
+    const nextApproverAccountID = getNextApproverAccountID(moneyRequestReport);
+    const isSubmitterSameAsNextApprover = isReportOwner(moneyRequestReport) && nextApproverAccountID === moneyRequestReport?.ownerAccountID;
+    const optimisticNextStep = isSubmitterSameAsNextApprover && policy?.preventSelfApproval ? buildOptimisticNextStepForPreventSelfApprovalsEnabled() : nextStep;
+
+    const shouldShowNextStep = isFromPaidPolicy && !!optimisticNextStep?.message?.length && !shouldShowStatusBar;
+    const shouldShowAnyButton =
+        shouldShowSelectedTransactionsButton ||
+        isDuplicate ||
+        shouldShowSettlementButton ||
+        shouldShowApproveButton ||
+        shouldShowSubmitButton ||
+        shouldShowNextStep ||
+        shouldShowMarkAsCashButton ||
+        shouldShowExportIntegrationButton;
+    const bankAccountRoute = getBankAccountRoute(chatReport);
+    const formattedAmount = convertToDisplayString(reimbursableSpend, moneyRequestReport?.currency);
+    const {nonHeldAmount, fullAmount, hasValidNonHeldAmount} = getNonHeldAndFullAmount(moneyRequestReport, shouldShowPayButton);
+    const isAnyTransactionOnHold = hasHeldExpensesReportUtils(moneyRequestReport?.reportID);
+    const displayedAmount = isAnyTransactionOnHold && canAllowSettlement && hasValidNonHeldAmount ? nonHeldAmount : formattedAmount;
+    const isMoreContentShown = shouldShowNextStep || shouldShowStatusBar || (shouldShowAnyButton && shouldUseNarrowLayout);
+    const {isDelegateAccessRestricted} = useDelegateUserDetails();
+    const [isNoDelegateAccessMenuVisible, setIsNoDelegateAccessMenuVisible] = useState(false);
+    const [isLoadingReportData] = useOnyx(ONYXKEYS.IS_LOADING_REPORT_DATA);
+
+    const isReportInRHP = route.name === SCREENS.SEARCH.REPORT_RHP;
+    const shouldDisplaySearchRouter = !isReportInRHP || isSmallScreenWidth;
+
+    const confirmPayment = useCallback(
+        (type?: PaymentMethodType | undefined, payAsBusiness?: boolean, methodID?: number, paymentMethod?: PaymentMethod) => {
+            if (!type || !chatReport) {
+                return;
+            }
+            setPaymentType(type);
+            setRequestType(CONST.IOU.REPORT_ACTION_TYPE.PAY);
+            if (isDelegateAccessRestricted) {
+                setIsNoDelegateAccessMenuVisible(true);
+            } else if (isAnyTransactionOnHold) {
+                setIsHoldMenuVisible(true);
+            } else if (isInvoiceReport(moneyRequestReport)) {
+                startAnimation();
+                payInvoice(type, chatReport, moneyRequestReport, payAsBusiness, methodID, paymentMethod);
+            } else {
+                startAnimation();
+                payMoneyRequest(type, chatReport, moneyRequestReport, true);
+            }
+        },
+        [chatReport, isAnyTransactionOnHold, isDelegateAccessRestricted, moneyRequestReport, startAnimation],
+    );
+
+    const confirmApproval = () => {
+        setRequestType(CONST.IOU.REPORT_ACTION_TYPE.APPROVE);
+        if (isDelegateAccessRestricted) {
+            setIsNoDelegateAccessMenuVisible(true);
+        } else if (isAnyTransactionOnHold) {
+            setIsHoldMenuVisible(true);
+        } else {
+            startApprovedAnimation();
+            approveMoneyRequest(moneyRequestReport, true);
+        }
+    };
+
+    const deleteTransaction = useCallback(() => {
+        if (requestParentReportAction) {
+            const iouTransactionID = isMoneyRequestAction(requestParentReportAction) ? getOriginalMessage(requestParentReportAction)?.IOUTransactionID : undefined;
+            if (isTrackExpenseAction(requestParentReportAction)) {
+                navigateBackToAfterDelete.current = deleteTrackExpense(moneyRequestReport?.reportID, iouTransactionID, requestParentReportAction, true);
+            } else {
+                navigateBackToAfterDelete.current = deleteMoneyRequest(iouTransactionID, requestParentReportAction, true);
+            }
+        }
+
+        setIsDeleteRequestModalVisible(false);
+    }, [moneyRequestReport?.reportID, requestParentReportAction, setIsDeleteRequestModalVisible]);
+
+    const markAsCash = useCallback(() => {
+        if (!requestParentReportAction) {
+            return;
+        }
+        const iouTransactionID = isMoneyRequestAction(requestParentReportAction) ? getOriginalMessage(requestParentReportAction)?.IOUTransactionID : undefined;
+        const reportID = transactionThreadReport?.reportID;
+
+        if (!iouTransactionID || !reportID) {
+            return;
+        }
+        markAsCashAction(iouTransactionID, reportID);
+    }, [requestParentReportAction, transactionThreadReport?.reportID]);
+
+    const getStatusIcon: (src: IconAsset) => React.ReactNode = (src) => (
+        <Icon
+            src={src}
+            height={variables.iconSizeSmall}
+            width={variables.iconSizeSmall}
+            fill={theme.icon}
+        />
+    );
+
+    const getStatusBarProps: () => MoneyRequestHeaderStatusBarProps | undefined = () => {
+        if (isPayAtEndExpense) {
+            if (!isArchivedReport) {
+                return {icon: getStatusIcon(Expensicons.Hourglass), description: translate('iou.bookingPendingDescription')};
+            }
+            if (isArchivedReport && archiveReason === CONST.REPORT.ARCHIVE_REASON.BOOKING_END_DATE_HAS_PASSED) {
+                return {icon: getStatusIcon(Expensicons.Box), description: translate('iou.bookingArchivedDescription')};
+            }
+        }
+        if (hasOnlyHeldExpenses) {
+            return {icon: getStatusIcon(Expensicons.Stopwatch), description: translate('iou.expensesOnHold')};
+        }
+
+        if (hasDuplicates) {
+            return {icon: getStatusIcon(Expensicons.Flag), description: translate('iou.duplicateTransaction', {isSubmitted: isProcessingReport(moneyRequestReport)})};
+        }
+
+        if (!!transaction?.transactionID && shouldShowBrokenConnectionViolation) {
+            return {
+                icon: getStatusIcon(Expensicons.Hourglass),
+                description: (
+                    <BrokenConnectionDescription
+                        transactionID={transaction?.transactionID}
+                        report={moneyRequestReport}
+                        policy={policy}
+                    />
+                ),
+            };
+        }
+        if (hasAllPendingRTERViolations) {
+            return {icon: getStatusIcon(Expensicons.Hourglass), description: translate('iou.pendingMatchWithCreditCardDescription')};
+        }
+        if (hasOnlyPendingTransactions) {
+            return {icon: getStatusIcon(Expensicons.CreditCardHourglass), description: translate('iou.transactionPendingDescription')};
+        }
+        if (hasScanningReceipt) {
+            return {icon: getStatusIcon(Expensicons.ReceiptScan), description: translate('iou.receiptScanInProgressDescription')};
+        }
+    };
+
+    const statusBarProps = getStatusBarProps();
+    const shouldAddGapToContents =
+        shouldUseNarrowLayout &&
+        (isDuplicate || shouldShowSettlementButton || !!shouldShowExportIntegrationButton || shouldShowSubmitButton || shouldShowMarkAsCashButton) &&
+        (!!statusBarProps || shouldShowNextStep);
+
+    // The submit button should be success green colour only if the user is the submitter and the policy does not have Scheduled Submit turned on
+    const isWaitingForSubmissionFromCurrentUser = useMemo(() => isWaitingForSubmissionFromCurrentUserReportUtils(chatReport, policy), [chatReport, policy]);
+
+    const shouldDuplicateButtonBeSuccess = useMemo(
+        () => isDuplicate && !shouldShowSettlementButton && !shouldShowExportIntegrationButton && !shouldShowSubmitButton && !shouldShowMarkAsCashButton,
+        [isDuplicate, shouldShowSettlementButton, shouldShowExportIntegrationButton, shouldShowSubmitButton, shouldShowMarkAsCashButton],
+    );
+
+    useEffect(() => {
+        // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
+        if (isLoadingHoldUseExplained || dismissedHoldUseExplanation || !isOnHold) {
+            return;
+        }
+        Navigation.navigate(ROUTES.PROCESS_MONEY_REQUEST_HOLD.getRoute(Navigation.getReportRHPActiveRoute()));
+    }, [dismissedHoldUseExplanation, isLoadingHoldUseExplained, isOnHold]);
+
+    useEffect(() => {
+        if (canDeleteRequest) {
+            return;
+        }
+
+        setIsDeleteRequestModalVisible(false);
+    }, [canDeleteRequest]);
+
+    const shouldShowBackButton = shouldDisplayBackButton || shouldUseNarrowLayout;
+
+    return (
+        <View style={[styles.pt0, styles.borderBottom]}>
+            <HeaderWithBackButton
+                shouldShowReportAvatarWithDisplay
+                shouldEnableDetailPageNavigation
+                shouldShowPinButton={false}
+                report={moneyRequestReport}
+                policy={policy}
+                shouldShowBackButton={shouldShowBackButton}
+                shouldDisplaySearchRouter={shouldDisplaySearchRouter}
+                onBackButtonPress={onBackButtonPress}
+                shouldShowBorderBottom={false}
+            >
+                {shouldShowSelectedTransactionsButton && !shouldUseNarrowLayout && (
+                    <View>
+                        <ButtonWithDropdownMenu
+                            onPress={() => null}
+                            options={selectedTransactionsOptions}
+                            customText={translate('workspace.common.selected', {count: selectedTransactionsID.length})}
+                            isSplitButton={false}
+                            shouldAlwaysShowDropdownMenu
+                        />
+                    </View>
+                )}
+                {!shouldShowSelectedTransactionsButton && isDuplicate && !shouldUseNarrowLayout && (
+                    <View style={[shouldDuplicateButtonBeSuccess ? styles.ml2 : styles.mh2]}>
+                        <Button
+                            success={shouldDuplicateButtonBeSuccess}
+                            text={translate('iou.reviewDuplicates')}
+                            style={styles.p0}
+                            onPress={() => {
+                                Navigation.navigate(ROUTES.TRANSACTION_DUPLICATE_REVIEW_PAGE.getRoute(transactionThreadReportID, Navigation.getReportRHPActiveRoute()));
+                            }}
+                        />
+                    </View>
+                )}
+                {!shouldShowSelectedTransactionsButton && shouldShowSettlementButton && !shouldUseNarrowLayout && (
+                    <View style={styles.pv2}>
+                        <AnimatedSettlementButton
+                            isPaidAnimationRunning={isPaidAnimationRunning}
+                            isApprovedAnimationRunning={isApprovedAnimationRunning}
+                            onAnimationFinish={stopAnimation}
+                            canIOUBePaid={canIOUBePaidAndApproved || isPaidAnimationRunning}
+                            onlyShowPayElsewhere={onlyShowPayElsewhere}
+                            currency={moneyRequestReport?.currency}
+                            confirmApproval={confirmApproval}
+                            policyID={moneyRequestReport?.policyID}
+                            chatReportID={chatReport?.reportID}
+                            iouReport={moneyRequestReport}
+                            onPress={confirmPayment}
+                            enablePaymentsRoute={ROUTES.ENABLE_PAYMENTS}
+                            addBankAccountRoute={bankAccountRoute}
+                            shouldHidePaymentOptions={!shouldShowPayButton}
+                            shouldShowApproveButton={shouldShowApproveButton}
+                            shouldDisableApproveButton={shouldDisableApproveButton}
+                            style={[styles.pv2]}
+                            formattedAmount={!hasOnlyHeldExpenses ? displayedAmount : ''}
+                            isDisabled={isOffline && !canAllowSettlement}
+                            isLoading={!isOffline && !canAllowSettlement}
+                        />
+                    </View>
+                )}
+                {!shouldShowSelectedTransactionsButton && !!shouldShowExportIntegrationButton && !shouldUseNarrowLayout && (
+                    <View style={[styles.pv2]}>
+                        <ExportWithDropdownMenu
+                            policy={policy}
+                            report={moneyRequestReport}
+                            connectionName={connectedIntegration}
+                        />
+                    </View>
+                )}
+                {!shouldShowSelectedTransactionsButton && !!moneyRequestReport && shouldShowSubmitButton && !shouldUseNarrowLayout && (
+                    <View style={styles.pv2}>
+                        <Button
+                            success={isWaitingForSubmissionFromCurrentUser}
+                            text={translate('common.submit')}
+                            style={[styles.mnw120, styles.pv2, styles.pr0]}
+                            onPress={() => submitReport(moneyRequestReport)}
+                            isDisabled={shouldDisableSubmitButton}
+                        />
+                    </View>
+                )}
+                {!shouldShowSelectedTransactionsButton && shouldShowMarkAsCashButton && !shouldUseNarrowLayout && (
+                    <View style={[styles.pv2]}>
+                        <Button
+                            success
+                            text={translate('iou.markAsCash')}
+                            style={[styles.pv2, styles.pr0]}
+                            onPress={markAsCash}
+                        />
+                    </View>
+                )}
+            </HeaderWithBackButton>
+            {!!isMoreContentShown && (
+                <View style={[styles.dFlex, styles.flexColumn, shouldAddGapToContents && styles.gap3, styles.pb3, styles.ph5]}>
+                    <View style={[styles.dFlex, styles.w100, styles.flexRow, styles.gap3]}>
+                        {shouldShowSelectedTransactionsButton && shouldUseNarrowLayout && (
+                            <ButtonWithDropdownMenu
+                                onPress={() => null}
+                                options={selectedTransactionsOptions}
+                                customText={translate('workspace.common.selected', {count: selectedTransactionsID.length})}
+                                isSplitButton={false}
+                                shouldAlwaysShowDropdownMenu
+                                wrapperStyle={styles.w100}
+                            />
+                        )}
+
+                        {!shouldShowSelectedTransactionsButton && isDuplicate && shouldUseNarrowLayout && (
+                            <Button
+                                success={shouldDuplicateButtonBeSuccess}
+                                text={translate('iou.reviewDuplicates')}
+                                style={[styles.flex1, styles.pr0]}
+                                onPress={() => {
+                                    Navigation.navigate(ROUTES.TRANSACTION_DUPLICATE_REVIEW_PAGE.getRoute(transactionThreadReportID, Navigation.getReportRHPActiveRoute()));
+                                }}
+                            />
+                        )}
+                        {!shouldShowSelectedTransactionsButton && shouldShowSettlementButton && shouldUseNarrowLayout && (
+                            <AnimatedSettlementButton
+                                isPaidAnimationRunning={isPaidAnimationRunning}
+                                isApprovedAnimationRunning={isApprovedAnimationRunning}
+                                onAnimationFinish={stopAnimation}
+                                canIOUBePaid={canIOUBePaidAndApproved || isPaidAnimationRunning}
+                                wrapperStyle={[styles.flex1]}
+                                onlyShowPayElsewhere={onlyShowPayElsewhere}
+                                currency={moneyRequestReport?.currency}
+                                confirmApproval={confirmApproval}
+                                policyID={moneyRequestReport?.policyID}
+                                chatReportID={moneyRequestReport?.chatReportID}
+                                iouReport={moneyRequestReport}
+                                onPress={confirmPayment}
+                                enablePaymentsRoute={ROUTES.ENABLE_PAYMENTS}
+                                addBankAccountRoute={bankAccountRoute}
+                                shouldHidePaymentOptions={!shouldShowPayButton}
+                                shouldShowApproveButton={shouldShowApproveButton}
+                                formattedAmount={!hasOnlyHeldExpenses ? displayedAmount : ''}
+                                shouldDisableApproveButton={shouldDisableApproveButton}
+                                isDisabled={isOffline && !canAllowSettlement}
+                                isLoading={!isOffline && !canAllowSettlement}
+                            />
+                        )}
+                        {!shouldShowSelectedTransactionsButton && !!shouldShowExportIntegrationButton && shouldUseNarrowLayout && (
+                            <ExportWithDropdownMenu
+                                policy={policy}
+                                report={moneyRequestReport}
+                                connectionName={connectedIntegration}
+                            />
+                        )}
+                        {!shouldShowSelectedTransactionsButton && !!moneyRequestReport && shouldShowSubmitButton && shouldUseNarrowLayout && (
+                            <Button
+                                success={isWaitingForSubmissionFromCurrentUser}
+                                text={translate('common.submit')}
+                                style={[styles.flex1, styles.pr0]}
+                                onPress={() => submitReport(moneyRequestReport)}
+                                isDisabled={shouldDisableSubmitButton}
+                            />
+                        )}
+                        {!shouldShowSelectedTransactionsButton && shouldShowMarkAsCashButton && shouldUseNarrowLayout && (
+                            <Button
+                                success
+                                text={translate('iou.markAsCash')}
+                                style={[styles.flex1, styles.pr0]}
+                                onPress={markAsCash}
+                            />
+                        )}
+                    </View>
+                    {shouldShowNextStep && <MoneyReportHeaderStatusBar nextStep={optimisticNextStep} />}
+                    {!!statusBarProps && (
+                        <MoneyRequestHeaderStatusBar
+                            icon={statusBarProps.icon}
+                            description={statusBarProps.description}
+                        />
+                    )}
+                </View>
+            )}
+            <LoadingBar shouldShow={(isLoadingReportData && shouldUseNarrowLayout) ?? false} />
+            {isHoldMenuVisible && requestType !== undefined && (
+                <ProcessMoneyReportHoldMenu
+                    nonHeldAmount={!hasOnlyHeldExpenses && hasValidNonHeldAmount ? nonHeldAmount : undefined}
+                    requestType={requestType}
+                    fullAmount={fullAmount}
+                    onClose={() => setIsHoldMenuVisible(false)}
+                    isVisible={isHoldMenuVisible}
+                    paymentType={paymentType}
+                    chatReport={chatReport}
+                    moneyRequestReport={moneyRequestReport}
+                    startAnimation={() => {
+                        if (requestType === CONST.IOU.REPORT_ACTION_TYPE.APPROVE) {
+                            startApprovedAnimation();
+                        } else {
+                            startAnimation();
+                        }
+                    }}
+                    transactionCount={transactionIDs?.length ?? 0}
+                />
+            )}
+            <DelegateNoAccessModal
+                isNoDelegateAccessMenuVisible={isNoDelegateAccessMenuVisible}
+                onClose={() => setIsNoDelegateAccessMenuVisible(false)}
+            />
+
+            <ConfirmModal
+                title={translate('iou.deleteExpense', {count: 1})}
+                isVisible={isDeleteRequestModalVisible}
+                onConfirm={deleteTransaction}
+                onCancel={() => setIsDeleteRequestModalVisible(false)}
+                onModalHide={() => navigateBackOnDeleteTransaction(navigateBackToAfterDelete.current)}
+                prompt={translate('iou.deleteConfirmation', {count: 1})}
+                confirmText={translate('common.delete')}
+                cancelText={translate('common.cancel')}
+                danger
+                shouldEnableNewFocusManagement
+            />
+            <DecisionModal
+                title={translate('common.downloadFailedTitle')}
+                prompt={translate('common.downloadFailedDescription')}
+                isSmallScreenWidth={isSmallScreenWidth}
+                onSecondOptionSubmit={() => setIsDownloadErrorModalVisible(false)}
+                secondOptionText={translate('common.buttonConfirm')}
+                isVisible={isDownloadErrorModalVisible}
+                onClose={() => setIsDownloadErrorModalVisible(false)}
+            />
+        </View>
+    );
+}
+
+MoneyReportHeaderOld.displayName = 'MoneyReportHeaderOld';
+
+export default MoneyReportHeaderOld;
diff --git a/src/components/MoneyRequestHeaderOld.tsx b/src/components/MoneyRequestHeaderOld.tsx
new file mode 100644
index 0000000000000..a6c48eb289f3c
--- /dev/null
+++ b/src/components/MoneyRequestHeaderOld.tsx
@@ -0,0 +1,231 @@
+import {useRoute} from '@react-navigation/native';
+import type {ReactNode} from 'react';
+import React, {useCallback, useEffect} from 'react';
+import {View} from 'react-native';
+import type {OnyxEntry} from 'react-native-onyx';
+import {useOnyx} from 'react-native-onyx';
+import useLocalize from '@hooks/useLocalize';
+import useResponsiveLayout from '@hooks/useResponsiveLayout';
+import useTheme from '@hooks/useTheme';
+import useThemeStyles from '@hooks/useThemeStyles';
+import useTransactionViolations from '@hooks/useTransactionViolations';
+import Navigation from '@libs/Navigation/Navigation';
+import {getOriginalMessage, isMoneyRequestAction} from '@libs/ReportActionsUtils';
+import {
+    checkIfShouldShowMarkAsCashButton,
+    hasPendingRTERViolation as hasPendingRTERViolationTransactionUtils,
+    hasReceipt,
+    isDuplicate as isDuplicateTransactionUtils,
+    isExpensifyCardTransaction,
+    isOnHold as isOnHoldTransactionUtils,
+    isPending,
+    isReceiptBeingScanned,
+    shouldShowBrokenConnectionViolation as shouldShowBrokenConnectionViolationTransactionUtils,
+} from '@libs/TransactionUtils';
+import variables from '@styles/variables';
+import {markAsCash as markAsCashAction} from '@userActions/Transaction';
+import CONST from '@src/CONST';
+import ONYXKEYS from '@src/ONYXKEYS';
+import ROUTES from '@src/ROUTES';
+import SCREENS from '@src/SCREENS';
+import type {Policy, Report, ReportAction} from '@src/types/onyx';
+import type IconAsset from '@src/types/utils/IconAsset';
+import isLoadingOnyxValue from '@src/types/utils/isLoadingOnyxValue';
+import BrokenConnectionDescription from './BrokenConnectionDescription';
+import Button from './Button';
+import HeaderWithBackButton from './HeaderWithBackButton';
+import Icon from './Icon';
+import * as Expensicons from './Icon/Expensicons';
+import LoadingBar from './LoadingBar';
+import type {MoneyRequestHeaderStatusBarProps} from './MoneyRequestHeaderStatusBar';
+import MoneyRequestHeaderStatusBar from './MoneyRequestHeaderStatusBar';
+import MoneyRequestReportTransactionsNavigation from './MoneyRequestReportView/MoneyRequestReportTransactionsNavigation';
+
+type MoneyRequestHeaderProps = {
+    /** The report currently being looked at */
+    report: OnyxEntry<Report>;
+
+    /** The policy which the report is tied to */
+    policy: OnyxEntry<Policy>;
+
+    /** The report action the transaction is tied to from the parent report */
+    parentReportAction: OnyxEntry<ReportAction>;
+
+    /** Method to trigger when pressing close button of the header */
+    onBackButtonPress: () => void;
+};
+
+function MoneyRequestHeaderOld({report, parentReportAction, policy, onBackButtonPress}: MoneyRequestHeaderProps) {
+    // We need to use isSmallScreenWidth instead of shouldUseNarrowLayout to use a correct layout for the hold expense modal https://github.com/Expensify/App/pull/47990#issuecomment-2362382026
+    // eslint-disable-next-line rulesdir/prefer-shouldUseNarrowLayout-instead-of-isSmallScreenWidth
+    const {shouldUseNarrowLayout, isSmallScreenWidth} = useResponsiveLayout();
+    const route = useRoute();
+    const [parentReport] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${report?.parentReportID ?? CONST.DEFAULT_NUMBER_ID}`);
+    const [transaction] = useOnyx(
+        `${ONYXKEYS.COLLECTION.TRANSACTION}${
+            isMoneyRequestAction(parentReportAction) ? getOriginalMessage(parentReportAction)?.IOUTransactionID ?? CONST.DEFAULT_NUMBER_ID : CONST.DEFAULT_NUMBER_ID
+        }`,
+    );
+    const transactionViolations = useTransactionViolations(transaction?.transactionID);
+
+    const [dismissedHoldUseExplanation, dismissedHoldUseExplanationResult] = useOnyx(ONYXKEYS.NVP_DISMISSED_HOLD_USE_EXPLANATION, {initialValue: true});
+    const [isLoadingReportData] = useOnyx(ONYXKEYS.IS_LOADING_REPORT_DATA);
+    const isLoadingHoldUseExplained = isLoadingOnyxValue(dismissedHoldUseExplanationResult);
+    const styles = useThemeStyles();
+    const theme = useTheme();
+    const {translate} = useLocalize();
+    const isOnHold = isOnHoldTransactionUtils(transaction);
+    const isDuplicate = isDuplicateTransactionUtils(transaction?.transactionID);
+    const reportID = report?.reportID;
+
+    const isReportInRHP = route.name === SCREENS.SEARCH.REPORT_RHP;
+    const shouldDisplaySearchRouter = !isReportInRHP || isSmallScreenWidth;
+    const shouldDisplayTransactionNavigation = !!(reportID && isReportInRHP);
+
+    const hasPendingRTERViolation = hasPendingRTERViolationTransactionUtils(transactionViolations);
+
+    const shouldShowBrokenConnectionViolation = shouldShowBrokenConnectionViolationTransactionUtils(parentReport, policy, transactionViolations);
+    const shouldShowMarkAsCashButton = checkIfShouldShowMarkAsCashButton(hasPendingRTERViolation, shouldShowBrokenConnectionViolation, parentReport, policy);
+
+    const markAsCash = useCallback(() => {
+        markAsCashAction(transaction?.transactionID, reportID);
+    }, [reportID, transaction?.transactionID]);
+
+    const isScanning = hasReceipt(transaction) && isReceiptBeingScanned(transaction);
+
+    const getStatusIcon: (src: IconAsset) => ReactNode = (src) => (
+        <Icon
+            src={src}
+            height={variables.iconSizeSmall}
+            width={variables.iconSizeSmall}
+            fill={theme.icon}
+        />
+    );
+
+    const getStatusBarProps: () => MoneyRequestHeaderStatusBarProps | undefined = () => {
+        if (isOnHold) {
+            return {icon: getStatusIcon(Expensicons.Stopwatch), description: translate('iou.expenseOnHold')};
+        }
+
+        if (isDuplicate) {
+            return {icon: getStatusIcon(Expensicons.Flag), description: translate('iou.expenseDuplicate')};
+        }
+
+        if (isExpensifyCardTransaction(transaction) && isPending(transaction)) {
+            return {icon: getStatusIcon(Expensicons.CreditCardHourglass), description: translate('iou.transactionPendingDescription')};
+        }
+        if (shouldShowBrokenConnectionViolation) {
+            return {
+                icon: getStatusIcon(Expensicons.Hourglass),
+                description: (
+                    <BrokenConnectionDescription
+                        transactionID={transaction?.transactionID}
+                        report={parentReport}
+                        policy={policy}
+                    />
+                ),
+            };
+        }
+        if (hasPendingRTERViolation) {
+            return {icon: getStatusIcon(Expensicons.Hourglass), description: translate('iou.pendingMatchWithCreditCardDescription')};
+        }
+        if (isScanning) {
+            return {icon: getStatusIcon(Expensicons.ReceiptScan), description: translate('iou.receiptScanInProgressDescription')};
+        }
+    };
+
+    const statusBarProps = getStatusBarProps();
+
+    useEffect(() => {
+        // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
+        if (isLoadingHoldUseExplained || dismissedHoldUseExplanation || !isOnHold) {
+            return;
+        }
+        Navigation.navigate(ROUTES.PROCESS_MONEY_REQUEST_HOLD.getRoute(Navigation.getReportRHPActiveRoute()));
+    }, [dismissedHoldUseExplanation, isLoadingHoldUseExplained, isOnHold]);
+
+    return (
+        <View style={[styles.pl0, styles.borderBottom]}>
+            <HeaderWithBackButton
+                shouldShowBorderBottom={false}
+                shouldShowReportAvatarWithDisplay
+                shouldEnableDetailPageNavigation
+                shouldShowPinButton={false}
+                report={
+                    reportID
+                        ? {
+                              ...report,
+                              reportID,
+                              ownerAccountID: parentReport?.ownerAccountID,
+                          }
+                        : undefined
+                }
+                policy={policy}
+                shouldShowBackButton={shouldUseNarrowLayout}
+                shouldDisplaySearchRouter={shouldDisplaySearchRouter}
+                onBackButtonPress={onBackButtonPress}
+            >
+                {shouldShowMarkAsCashButton && !shouldUseNarrowLayout && (
+                    <Button
+                        success
+                        text={translate('iou.markAsCash')}
+                        style={[styles.p0]}
+                        onPress={markAsCash}
+                    />
+                )}
+                {isDuplicate && !shouldUseNarrowLayout && (
+                    <Button
+                        success
+                        text={translate('iou.reviewDuplicates')}
+                        style={[styles.p0, styles.ml2]}
+                        onPress={() => {
+                            if (!reportID) {
+                                return;
+                            }
+                            Navigation.navigate(ROUTES.TRANSACTION_DUPLICATE_REVIEW_PAGE.getRoute(reportID, Navigation.getReportRHPActiveRoute()));
+                        }}
+                    />
+                )}
+                {shouldDisplayTransactionNavigation && <MoneyRequestReportTransactionsNavigation currentReportID={reportID} />}
+            </HeaderWithBackButton>
+            {shouldShowMarkAsCashButton && shouldUseNarrowLayout && (
+                <View style={[styles.ph5, styles.pb3]}>
+                    <Button
+                        success
+                        text={translate('iou.markAsCash')}
+                        style={[styles.w100, styles.pr0]}
+                        onPress={markAsCash}
+                    />
+                </View>
+            )}
+            {isDuplicate && shouldUseNarrowLayout && (
+                <View style={[styles.ph5, styles.pb3]}>
+                    <Button
+                        success
+                        text={translate('iou.reviewDuplicates')}
+                        style={[styles.w100, styles.pr0]}
+                        onPress={() => {
+                            if (!reportID) {
+                                return;
+                            }
+                            Navigation.navigate(ROUTES.TRANSACTION_DUPLICATE_REVIEW_PAGE.getRoute(reportID, Navigation.getReportRHPActiveRoute()));
+                        }}
+                    />
+                </View>
+            )}
+            {!!statusBarProps && (
+                <View style={[styles.ph5, styles.pb3]}>
+                    <MoneyRequestHeaderStatusBar
+                        icon={statusBarProps.icon}
+                        description={statusBarProps.description}
+                    />
+                </View>
+            )}
+            <LoadingBar shouldShow={(isLoadingReportData && shouldUseNarrowLayout) ?? false} />
+        </View>
+    );
+}
+
+MoneyRequestHeaderOld.displayName = 'MoneyRequestHeaderOld';
+
+export default MoneyRequestHeaderOld;
diff --git a/src/components/ReportActionItem/ReportPreviewOld.tsx b/src/components/ReportActionItem/ReportPreviewOld.tsx
new file mode 100644
index 0000000000000..04f1b177b6670
--- /dev/null
+++ b/src/components/ReportActionItem/ReportPreviewOld.tsx
@@ -0,0 +1,709 @@
+import truncate from 'lodash/truncate';
+import React, {useCallback, useEffect, useMemo, useState} from 'react';
+import type {StyleProp, ViewStyle} from 'react-native';
+import {View} from 'react-native';
+import Animated, {useAnimatedStyle, useSharedValue, withDelay, withSpring, withTiming} from 'react-native-reanimated';
+import Button from '@components/Button';
+import {getButtonRole} from '@components/Button/utils';
+import DelegateNoAccessModal from '@components/DelegateNoAccessModal';
+import Icon from '@components/Icon';
+import * as Expensicons from '@components/Icon/Expensicons';
+import type {PaymentMethod} from '@components/KYCWall/types';
+import OfflineWithFeedback from '@components/OfflineWithFeedback';
+import PressableWithoutFeedback from '@components/Pressable/PressableWithoutFeedback';
+import type {ActionHandledType} from '@components/ProcessMoneyReportHoldMenu';
+import ProcessMoneyReportHoldMenu from '@components/ProcessMoneyReportHoldMenu';
+import {useSearchContext} from '@components/Search/SearchContext';
+import AnimatedSettlementButton from '@components/SettlementButton/AnimatedSettlementButton';
+import {showContextMenuForReport} from '@components/ShowContextMenuContext';
+import Text from '@components/Text';
+import useDelegateUserDetails from '@hooks/useDelegateUserDetails';
+import useLocalize from '@hooks/useLocalize';
+import useNetwork from '@hooks/useNetwork';
+import useOnyx from '@hooks/useOnyx';
+import usePaymentAnimations from '@hooks/usePaymentAnimations';
+import usePolicy from '@hooks/usePolicy';
+import useReportWithTransactionsAndViolations from '@hooks/useReportWithTransactionsAndViolations';
+import useTheme from '@hooks/useTheme';
+import useThemeStyles from '@hooks/useThemeStyles';
+import useTransactionViolations from '@hooks/useTransactionViolations';
+import ControlSelection from '@libs/ControlSelection';
+import {convertToDisplayString} from '@libs/CurrencyUtils';
+import {canUseTouchScreen} from '@libs/DeviceCapabilities';
+import Navigation from '@libs/Navigation/Navigation';
+import Parser from '@libs/Parser';
+import Performance from '@libs/Performance';
+import {getConnectedIntegration} from '@libs/PolicyUtils';
+import {getThumbnailAndImageURIs} from '@libs/ReceiptUtils';
+import {getReportActionText} from '@libs/ReportActionsUtils';
+import {
+    areAllRequestsBeingSmartScanned as areAllRequestsBeingSmartScannedReportUtils,
+    canBeExported,
+    getArchiveReason,
+    getBankAccountRoute,
+    getDisplayNameForParticipant,
+    getInvoicePayerName,
+    getMoneyRequestSpendBreakdown,
+    getNonHeldAndFullAmount,
+    getPolicyName,
+    getTransactionsWithReceipts,
+    hasActionsWithErrors,
+    hasHeldExpenses as hasHeldExpensesReportUtils,
+    hasMissingInvoiceBankAccount,
+    hasMissingPaymentMethod,
+    hasMissingSmartscanFields as hasMissingSmartscanFieldsReportUtils,
+    hasNonReimbursableTransactions as hasNonReimbursableTransactionsReportUtils,
+    hasNoticeTypeViolations,
+    hasOnlyHeldExpenses as hasOnlyHeldExpensesReportUtils,
+    hasOnlyTransactionsWithPendingRoutes as hasOnlyTransactionsWithPendingRoutesReportUtils,
+    hasReportViolations,
+    hasUpdatedTotal,
+    hasViolations,
+    hasWarningTypeViolations,
+    isAllowedToApproveExpenseReport,
+    isAllowedToSubmitDraftExpenseReport,
+    isArchivedReportWithID,
+    isInvoiceReport as isInvoiceReportUtils,
+    isInvoiceRoom as isInvoiceRoomReportUtils,
+    isPayAtEndExpenseReport,
+    isPolicyExpenseChat as isPolicyExpenseChatReportUtils,
+    isReportApproved,
+    isReportOwner,
+    isSettled,
+    isTripRoom as isTripRoomReportUtils,
+    isWaitingForSubmissionFromCurrentUser as isWaitingForSubmissionFromCurrentUserReportUtils,
+} from '@libs/ReportUtils';
+import StringUtils from '@libs/StringUtils';
+import {
+    getDescription,
+    getMerchant,
+    hasPendingUI,
+    isCardTransaction,
+    isPartialMerchant,
+    isPending,
+    isReceiptBeingScanned,
+    shouldShowBrokenConnectionViolationForMultipleTransactions,
+} from '@libs/TransactionUtils';
+import {contextMenuRef} from '@pages/home/report/ContextMenu/ReportActionContextMenu';
+import type {ContextMenuAnchor} from '@pages/home/report/ContextMenu/ReportActionContextMenu';
+import variables from '@styles/variables';
+import {approveMoneyRequest, canApproveIOU, canIOUBePaid as canIOUBePaidIOUActions, canSubmitReport, payInvoice, payMoneyRequest, submitReport} from '@userActions/IOU';
+import Timing from '@userActions/Timing';
+import CONST from '@src/CONST';
+import type {TranslationPaths} from '@src/languages/types';
+import ONYXKEYS from '@src/ONYXKEYS';
+import ROUTES from '@src/ROUTES';
+import type {ReportAction} from '@src/types/onyx';
+import type {PaymentMethodType} from '@src/types/onyx/OriginalMessage';
+import ExportWithDropdownMenu from './ExportWithDropdownMenu';
+import type {PendingMessageProps} from './MoneyRequestPreview/types';
+import ReportActionItemImages from './ReportActionItemImages';
+
+type ReportPreviewProps = {
+    /** All the data of the action */
+    action: ReportAction;
+
+    /** The associated chatReport */
+    chatReportID: string | undefined;
+
+    /** The active IOUReport, used for Onyx subscription */
+    iouReportID: string | undefined;
+
+    /** The report's policyID, used for Onyx subscription */
+    policyID: string | undefined;
+
+    /** Extra styles to pass to View wrapper */
+    containerStyles?: StyleProp<ViewStyle>;
+
+    /** Popover context menu anchor, used for showing context menu */
+    contextMenuAnchor?: ContextMenuAnchor;
+
+    /** Callback for updating context menu active state, used for showing context menu */
+    checkIfContextMenuActive?: () => void;
+
+    /** Callback when the payment options popover is shown */
+    onPaymentOptionsShow?: () => void;
+
+    /** Callback when the payment options popover is closed */
+    onPaymentOptionsHide?: () => void;
+
+    /** Whether a message is a whisper */
+    isWhisper?: boolean;
+
+    /** Whether the corresponding report action item is hovered */
+    isHovered?: boolean;
+
+    /** Whether  context menu should be shown on press */
+    shouldDisplayContextMenu?: boolean;
+};
+
+function ReportPreviewOld({
+    iouReportID,
+    policyID,
+    chatReportID,
+    action,
+    containerStyles,
+    contextMenuAnchor,
+    isHovered = false,
+    isWhisper = false,
+    checkIfContextMenuActive = () => {},
+    onPaymentOptionsShow,
+    onPaymentOptionsHide,
+    shouldDisplayContextMenu = true,
+}: ReportPreviewProps) {
+    const policy = usePolicy(policyID);
+    const [chatReport] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${chatReportID}`);
+    const [iouReport, transactions, violations] = useReportWithTransactionsAndViolations(iouReportID);
+    const lastTransaction = transactions?.at(0);
+    const transactionIDList = transactions?.map((reportTransaction) => reportTransaction.transactionID) ?? [];
+    const [userWallet] = useOnyx(ONYXKEYS.USER_WALLET);
+    const [invoiceReceiverPolicy] = useOnyx(
+        `${ONYXKEYS.COLLECTION.POLICY}${chatReport?.invoiceReceiver && 'policyID' in chatReport.invoiceReceiver ? chatReport.invoiceReceiver.policyID : CONST.DEFAULT_NUMBER_ID}`,
+    );
+    const [invoiceReceiverPersonalDetail] = useOnyx(ONYXKEYS.PERSONAL_DETAILS_LIST, {
+        selector: (personalDetails) =>
+            personalDetails?.[chatReport?.invoiceReceiver && 'accountID' in chatReport.invoiceReceiver ? chatReport.invoiceReceiver.accountID : CONST.DEFAULT_NUMBER_ID],
+    });
+    const theme = useTheme();
+    const styles = useThemeStyles();
+    const {translate} = useLocalize();
+    const {isOffline} = useNetwork();
+    const {isOnSearch} = useSearchContext();
+
+    const {hasMissingSmartscanFields, areAllRequestsBeingSmartScanned, hasOnlyTransactionsWithPendingRoutes, hasNonReimbursableTransactions} = useMemo(
+        () => ({
+            hasMissingSmartscanFields: hasMissingSmartscanFieldsReportUtils(iouReportID, transactions),
+            areAllRequestsBeingSmartScanned: areAllRequestsBeingSmartScannedReportUtils(iouReportID, action),
+            hasOnlyTransactionsWithPendingRoutes: hasOnlyTransactionsWithPendingRoutesReportUtils(iouReportID),
+            hasNonReimbursableTransactions: hasNonReimbursableTransactionsReportUtils(iouReportID),
+        }),
+        // When transactions get updated these status may have changed, so that is a case where we also want to run this.
+        // eslint-disable-next-line react-compiler/react-compiler, react-hooks/exhaustive-deps
+        [transactions, iouReportID, action],
+    );
+
+    const {isPaidAnimationRunning, isApprovedAnimationRunning, stopAnimation, startAnimation, startApprovedAnimation} = usePaymentAnimations();
+    const [isHoldMenuVisible, setIsHoldMenuVisible] = useState(false);
+    const [requestType, setRequestType] = useState<ActionHandledType>();
+    const [paymentType, setPaymentType] = useState<PaymentMethodType>();
+
+    const getCanIOUBePaid = useCallback(
+        (onlyShowPayElsewhere = false, shouldCheckApprovedState = true) =>
+            canIOUBePaidIOUActions(iouReport, chatReport, policy, transactions, onlyShowPayElsewhere, undefined, undefined, shouldCheckApprovedState),
+        [iouReport, chatReport, policy, transactions],
+    );
+
+    const canIOUBePaid = useMemo(() => getCanIOUBePaid(), [getCanIOUBePaid]);
+    const canIOUBePaidAndApproved = useMemo(() => getCanIOUBePaid(false, false), [getCanIOUBePaid]);
+    const onlyShowPayElsewhere = useMemo(() => !canIOUBePaid && getCanIOUBePaid(true), [canIOUBePaid, getCanIOUBePaid]);
+    const shouldShowPayButton = isPaidAnimationRunning || canIOUBePaid || onlyShowPayElsewhere;
+    const shouldShowApproveButton = useMemo(() => canApproveIOU(iouReport, policy), [iouReport, policy]) || isApprovedAnimationRunning;
+
+    const shouldDisableApproveButton = shouldShowApproveButton && !isAllowedToApproveExpenseReport(iouReport);
+
+    const {nonHeldAmount, fullAmount, hasValidNonHeldAmount} = getNonHeldAndFullAmount(iouReport, shouldShowPayButton);
+    const hasOnlyHeldExpenses = hasOnlyHeldExpensesReportUtils(iouReport?.reportID);
+
+    const managerID = iouReport?.managerID ?? action.childManagerAccountID ?? CONST.DEFAULT_NUMBER_ID;
+    const {totalDisplaySpend, reimbursableSpend} = getMoneyRequestSpendBreakdown(iouReport);
+    const [reports] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}`);
+    const iouSettled = isSettled(iouReportID, isOnSearch ? reports : undefined) || action?.childStatusNum === CONST.REPORT.STATUS_NUM.REIMBURSED;
+    const previewMessageOpacity = useSharedValue(1);
+    const previewMessageStyle = useAnimatedStyle(() => ({
+        opacity: previewMessageOpacity.get(),
+    }));
+    const checkMarkScale = useSharedValue(iouSettled ? 1 : 0);
+
+    const isApproved = isReportApproved({report: iouReport, parentReportAction: action});
+    const thumbsUpScale = useSharedValue(isApproved ? 1 : 0);
+    const thumbsUpStyle = useAnimatedStyle(() => ({
+        ...styles.defaultCheckmarkWrapper,
+        transform: [{scale: thumbsUpScale.get()}],
+    }));
+
+    const isPolicyExpenseChat = isPolicyExpenseChatReportUtils(chatReport);
+    const isInvoiceRoom = isInvoiceRoomReportUtils(chatReport);
+    const isTripRoom = isTripRoomReportUtils(chatReport);
+
+    const canAllowSettlement = hasUpdatedTotal(iouReport, policy);
+    const numberOfRequests = transactions?.length ?? 0;
+    const moneyRequestComment = numberOfRequests < 2 ? action?.childLastMoneyRequestComment ?? '' : '';
+    const transactionsWithReceipts = getTransactionsWithReceipts(iouReportID);
+    const numberOfScanningReceipts = transactionsWithReceipts.filter((transaction) => isReceiptBeingScanned(transaction)).length;
+    const numberOfPendingRequests = transactionsWithReceipts.filter((transaction) => isPending(transaction) && isCardTransaction(transaction)).length;
+
+    const hasReceipts = transactionsWithReceipts.length > 0;
+    const isScanning = hasReceipts && areAllRequestsBeingSmartScanned;
+    const hasErrors =
+        (hasMissingSmartscanFields && !iouSettled) ||
+        // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
+        hasViolations(iouReportID, violations, true) ||
+        hasNoticeTypeViolations(iouReportID, violations, true) ||
+        hasWarningTypeViolations(iouReportID, violations, true) ||
+        (isReportOwner(iouReport) && hasReportViolations(iouReportID)) ||
+        hasActionsWithErrors(iouReportID);
+    const lastThreeTransactions = transactions?.slice(-3) ?? [];
+    const lastThreeReceipts = lastThreeTransactions.map((transaction) => ({...getThumbnailAndImageURIs(transaction), transaction}));
+    const lastTransactionViolations = useTransactionViolations(lastTransaction?.transactionID);
+    const showRTERViolationMessage = numberOfRequests === 1 && hasPendingUI(lastTransaction, lastTransactionViolations);
+    const shouldShowBrokenConnectionViolation = numberOfRequests === 1 && shouldShowBrokenConnectionViolationForMultipleTransactions(transactionIDList, iouReport, policy, violations);
+    let formattedMerchant = numberOfRequests === 1 ? getMerchant(lastTransaction) : null;
+    const formattedDescription = numberOfRequests === 1 ? Parser.htmlToMarkdown(getDescription(lastTransaction)) : null;
+
+    if (isPartialMerchant(formattedMerchant ?? '')) {
+        formattedMerchant = null;
+    }
+
+    const isArchived = isArchivedReportWithID(iouReport?.reportID);
+    const isAdmin = policy?.role === CONST.POLICY.ROLE.ADMIN;
+    const filteredTransactions = transactions?.filter((transaction) => transaction) ?? [];
+    const shouldShowSubmitButton = canSubmitReport(iouReport, policy, filteredTransactions, violations);
+    const shouldDisableSubmitButton = shouldShowSubmitButton && !isAllowedToSubmitDraftExpenseReport(iouReport);
+
+    // The submit button should be success green colour only if the user is submitter and the policy does not have Scheduled Submit turned on
+    const isWaitingForSubmissionFromCurrentUser = useMemo(() => isWaitingForSubmissionFromCurrentUserReportUtils(chatReport, policy), [chatReport, policy]);
+
+    const {isDelegateAccessRestricted} = useDelegateUserDetails();
+    const [isNoDelegateAccessMenuVisible, setIsNoDelegateAccessMenuVisible] = useState(false);
+
+    const confirmPayment = useCallback(
+        (type: PaymentMethodType | undefined, payAsBusiness?: boolean, methodID?: number, paymentMethod?: PaymentMethod) => {
+            if (!type) {
+                return;
+            }
+            setPaymentType(type);
+            setRequestType(CONST.IOU.REPORT_ACTION_TYPE.PAY);
+            if (isDelegateAccessRestricted) {
+                setIsNoDelegateAccessMenuVisible(true);
+            } else if (hasHeldExpensesReportUtils(iouReport?.reportID)) {
+                setIsHoldMenuVisible(true);
+            } else if (chatReport && iouReport) {
+                startAnimation();
+                if (isInvoiceReportUtils(iouReport)) {
+                    payInvoice(type, chatReport, iouReport, payAsBusiness, methodID, paymentMethod);
+                } else {
+                    payMoneyRequest(type, chatReport, iouReport);
+                }
+            }
+        },
+        [chatReport, iouReport, isDelegateAccessRestricted, startAnimation],
+    );
+
+    const confirmApproval = () => {
+        setRequestType(CONST.IOU.REPORT_ACTION_TYPE.APPROVE);
+        if (isDelegateAccessRestricted) {
+            setIsNoDelegateAccessMenuVisible(true);
+        } else if (hasHeldExpensesReportUtils(iouReport?.reportID)) {
+            setIsHoldMenuVisible(true);
+        } else {
+            startApprovedAnimation();
+            approveMoneyRequest(iouReport, true);
+        }
+    };
+
+    const getSettlementAmount = () => {
+        if (hasOnlyHeldExpenses) {
+            return '';
+        }
+
+        // We shouldn't display the nonHeldAmount as the default option if it's not valid since we cannot pay partially in this case
+        if (hasHeldExpensesReportUtils(iouReport?.reportID) && canAllowSettlement && hasValidNonHeldAmount) {
+            return nonHeldAmount;
+        }
+
+        return convertToDisplayString(reimbursableSpend, iouReport?.currency);
+    };
+
+    const getDisplayAmount = (): string => {
+        if (totalDisplaySpend) {
+            return convertToDisplayString(totalDisplaySpend, iouReport?.currency);
+        }
+        if (isScanning) {
+            return translate('iou.receiptStatusTitle');
+        }
+        if (hasOnlyTransactionsWithPendingRoutes) {
+            return translate('iou.fieldPending');
+        }
+
+        // If iouReport is not available, get amount from the action message (Ex: "Domain20821's Workspace owes $33.00" or "paid ₫60" or "paid -₫60 elsewhere")
+        let displayAmount = '';
+        const actionMessage = getReportActionText(action);
+        const splits = actionMessage.split(' ');
+
+        splits.forEach((split) => {
+            if (!/\d/.test(split)) {
+                return;
+            }
+
+            displayAmount = split;
+        });
+
+        return displayAmount;
+    };
+
+    // We're using this function to check if the parsed result of getDisplayAmount equals
+    // to 0 in order to hide the subtitle (merchant / description) when the expense
+    // is removed from OD report and display amount changes to 0 (any currency)
+    function isDisplayAmountZero(displayAmount: string) {
+        if (!displayAmount || displayAmount === '') {
+            return false;
+        }
+        const numericPart = displayAmount.replace(/[^\d.-]/g, '');
+        const amount = parseFloat(numericPart);
+        return !Number.isNaN(amount) && amount === 0;
+    }
+
+    const previewMessage = useMemo(() => {
+        if (isScanning) {
+            return totalDisplaySpend ? `${translate('common.receipt')} ${CONST.DOT_SEPARATOR} ${translate('common.scanning')}` : `${translate('common.receipt')}`;
+        }
+        if (numberOfPendingRequests === 1 && numberOfRequests === 1) {
+            return `${translate('common.receipt')} ${CONST.DOT_SEPARATOR} ${translate('iou.pending')}`;
+        }
+        if (showRTERViolationMessage) {
+            return `${translate('common.receipt')} ${CONST.DOT_SEPARATOR} ${translate('iou.pendingMatch')}`;
+        }
+
+        let payerOrApproverName;
+        if (isPolicyExpenseChat || isTripRoom) {
+            payerOrApproverName = getPolicyName({report: chatReport, policy});
+        } else if (isInvoiceRoom) {
+            payerOrApproverName = getInvoicePayerName(chatReport, invoiceReceiverPolicy, invoiceReceiverPersonalDetail);
+        } else {
+            payerOrApproverName = getDisplayNameForParticipant({accountID: managerID, shouldUseShortForm: true});
+        }
+
+        if (isApproved) {
+            return translate('iou.managerApproved', {manager: payerOrApproverName});
+        }
+        let paymentVerb: TranslationPaths = 'iou.payerOwes';
+        if (iouSettled || iouReport?.isWaitingOnBankAccount) {
+            paymentVerb = 'iou.payerPaid';
+        } else if (hasNonReimbursableTransactions) {
+            paymentVerb = 'iou.payerSpent';
+            payerOrApproverName = getDisplayNameForParticipant({accountID: chatReport?.ownerAccountID, shouldUseShortForm: true});
+        }
+        return translate(paymentVerb, {payer: payerOrApproverName});
+    }, [
+        isScanning,
+        numberOfPendingRequests,
+        numberOfRequests,
+        showRTERViolationMessage,
+        isPolicyExpenseChat,
+        isTripRoom,
+        isInvoiceRoom,
+        isApproved,
+        iouSettled,
+        iouReport?.isWaitingOnBankAccount,
+        hasNonReimbursableTransactions,
+        translate,
+        totalDisplaySpend,
+        chatReport,
+        policy,
+        invoiceReceiverPolicy,
+        invoiceReceiverPersonalDetail,
+        managerID,
+    ]);
+
+    const bankAccountRoute = getBankAccountRoute(chatReport);
+
+    const shouldShowSettlementButton = !shouldShowSubmitButton && (shouldShowPayButton || shouldShowApproveButton) && !showRTERViolationMessage && !shouldShowBrokenConnectionViolation;
+
+    const shouldPromptUserToAddBankAccount = (hasMissingPaymentMethod(userWallet, iouReportID) || hasMissingInvoiceBankAccount(iouReportID)) && !iouSettled;
+    const shouldShowRBR = hasErrors && !iouSettled;
+
+    /*
+     Show subtitle if at least one of the expenses is not being smart scanned, and either:
+     - There is more than one expense – in this case, the "X expenses, Y scanning" subtitle is shown;
+     - There is only one expense, it has a receipt and is not being smart scanned – in this case, the expense merchant or description is shown;
+
+     * There is an edge case when there is only one distance expense with a pending route and amount = 0.
+       In this case, we don't want to show the merchant or description because it says: "Pending route...", which is already displayed in the amount field.
+     */
+    const shouldShowSingleRequestMerchantOrDescription =
+        numberOfRequests === 1 && (!!formattedMerchant || !!formattedDescription) && !(hasOnlyTransactionsWithPendingRoutes && !totalDisplaySpend);
+    const shouldShowSubtitle = !isScanning && (shouldShowSingleRequestMerchantOrDescription || numberOfRequests > 1) && !isDisplayAmountZero(getDisplayAmount());
+
+    const isPayAtEndExpense = isPayAtEndExpenseReport(iouReportID, transactions);
+    const [archiveReason] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${iouReportID}`, {selector: getArchiveReason});
+
+    const getPendingMessageProps: () => PendingMessageProps = () => {
+        if (isPayAtEndExpense) {
+            if (!isArchived) {
+                return {shouldShow: true, messageIcon: Expensicons.Hourglass, messageDescription: translate('iou.bookingPending')};
+            }
+            if (isArchived && archiveReason === CONST.REPORT.ARCHIVE_REASON.BOOKING_END_DATE_HAS_PASSED) {
+                return {
+                    shouldShow: true,
+                    messageIcon: Expensicons.Box,
+                    messageDescription: translate('iou.bookingArchived'),
+                };
+            }
+        }
+        if (shouldShowBrokenConnectionViolation) {
+            return {shouldShow: true, messageIcon: Expensicons.Hourglass, messageDescription: translate('violations.brokenConnection530Error')};
+        }
+        return {shouldShow: false};
+    };
+
+    const pendingMessageProps = getPendingMessageProps();
+
+    const {supportText} = useMemo(() => {
+        if (formattedMerchant && formattedMerchant !== CONST.TRANSACTION.DEFAULT_MERCHANT && formattedMerchant !== CONST.TRANSACTION.PARTIAL_TRANSACTION_MERCHANT) {
+            return {supportText: truncate(formattedMerchant, {length: CONST.REQUEST_PREVIEW.MAX_LENGTH})};
+        }
+        if (formattedDescription ?? moneyRequestComment) {
+            return {supportText: truncate(StringUtils.lineBreaksToSpaces(formattedDescription ?? moneyRequestComment), {length: CONST.REQUEST_PREVIEW.MAX_LENGTH})};
+        }
+
+        if (numberOfRequests === 1) {
+            return {
+                supportText: '',
+            };
+        }
+        return {
+            supportText: translate('iou.expenseCountWithStatus', {
+                scanningReceipts: numberOfScanningReceipts,
+                pendingReceipts: numberOfPendingRequests,
+                count: numberOfRequests,
+            }),
+        };
+    }, [formattedMerchant, formattedDescription, moneyRequestComment, translate, numberOfRequests, numberOfScanningReceipts, numberOfPendingRequests]);
+
+    /*
+     * Manual export
+     */
+    const connectedIntegration = getConnectedIntegration(policy);
+
+    const shouldShowExportIntegrationButton = !shouldShowPayButton && !shouldShowSubmitButton && connectedIntegration && isAdmin && canBeExported(iouReport);
+
+    useEffect(() => {
+        if (!isPaidAnimationRunning || isApprovedAnimationRunning) {
+            return;
+        }
+
+        previewMessageOpacity.set(
+            withTiming(0.75, {duration: CONST.ANIMATION_PAID_DURATION / 2}, () => {
+                previewMessageOpacity.set(withTiming(1, {duration: CONST.ANIMATION_PAID_DURATION / 2}));
+            }),
+        );
+        // We only want to animate the text when the text changes
+        // eslint-disable-next-line react-compiler/react-compiler, react-hooks/exhaustive-deps
+    }, [previewMessage, previewMessageOpacity]);
+
+    useEffect(() => {
+        if (!iouSettled) {
+            return;
+        }
+
+        checkMarkScale.set(isPaidAnimationRunning ? withDelay(CONST.ANIMATION_PAID_CHECKMARK_DELAY, withSpring(1, {duration: CONST.ANIMATION_PAID_DURATION})) : 1);
+    }, [isPaidAnimationRunning, iouSettled, checkMarkScale]);
+
+    useEffect(() => {
+        if (!isApproved) {
+            return;
+        }
+
+        thumbsUpScale.set(isApprovedAnimationRunning ? withDelay(CONST.ANIMATION_THUMBSUP_DELAY, withSpring(1, {duration: CONST.ANIMATION_THUMBSUP_DURATION})) : 1);
+    }, [isApproved, isApprovedAnimationRunning, thumbsUpScale]);
+
+    const openReportFromPreview = useCallback(() => {
+        if (!iouReportID || contextMenuRef.current?.isContextMenuOpening) {
+            return;
+        }
+        Performance.markStart(CONST.TIMING.OPEN_REPORT_FROM_PREVIEW);
+        Timing.start(CONST.TIMING.OPEN_REPORT_FROM_PREVIEW);
+        Navigation.navigate(ROUTES.REPORT_WITH_ID.getRoute(iouReportID));
+    }, [iouReportID]);
+
+    return (
+        <OfflineWithFeedback
+            pendingAction={iouReport?.pendingFields?.preview}
+            shouldDisableOpacity={!!(action.pendingAction ?? action.isOptimisticAction)}
+            needsOffscreenAlphaCompositing
+        >
+            <View style={[styles.chatItemMessage, containerStyles]}>
+                <PressableWithoutFeedback
+                    onPress={openReportFromPreview}
+                    onPressIn={() => canUseTouchScreen() && ControlSelection.block()}
+                    onPressOut={() => ControlSelection.unblock()}
+                    onLongPress={(event) => {
+                        if (!shouldDisplayContextMenu) {
+                            return;
+                        }
+
+                        showContextMenuForReport(event, contextMenuAnchor, chatReportID, action, checkIfContextMenuActive);
+                    }}
+                    shouldUseHapticsOnLongPress
+                    // This is added to omit console error about nested buttons as its forbidden on web platform
+                    style={[styles.flexRow, styles.justifyContentBetween, styles.reportPreviewBox, isOnSearch ? styles.borderedContentCardLarge : {}]}
+                    role={getButtonRole(true)}
+                    isNested
+                    accessibilityLabel={translate('iou.viewDetails')}
+                >
+                    <View style={[styles.reportPreviewBox, isHovered || isScanning || isWhisper ? styles.reportPreviewBoxHoverBorder : undefined]}>
+                        {lastThreeReceipts.length > 0 && (
+                            <ReportActionItemImages
+                                images={lastThreeReceipts}
+                                total={numberOfRequests}
+                                size={CONST.RECEIPT.MAX_REPORT_PREVIEW_RECEIPTS}
+                            />
+                        )}
+                        <View style={[styles.expenseAndReportPreviewBoxBody, hasReceipts ? styles.mtn1 : {}]}>
+                            <View style={shouldShowSettlementButton ? {} : styles.expenseAndReportPreviewTextButtonContainer}>
+                                <View style={styles.expenseAndReportPreviewTextContainer}>
+                                    <View style={styles.flexRow}>
+                                        <Animated.View style={[styles.flex1, styles.flexRow, styles.alignItemsCenter, previewMessageStyle]}>
+                                            <Text
+                                                style={[styles.textLabelSupporting, styles.lh20]}
+                                                testID="reportPreview-previewMessage"
+                                            >
+                                                {previewMessage}
+                                            </Text>
+                                        </Animated.View>
+                                        {shouldShowRBR && (
+                                            <Icon
+                                                src={Expensicons.DotIndicator}
+                                                fill={theme.danger}
+                                            />
+                                        )}
+                                        {!shouldShowRBR && shouldPromptUserToAddBankAccount && (
+                                            <Icon
+                                                src={Expensicons.DotIndicator}
+                                                fill={theme.success}
+                                            />
+                                        )}
+                                    </View>
+                                    <View style={styles.reportPreviewAmountSubtitleContainer}>
+                                        <View style={styles.flexRow}>
+                                            <View style={[styles.flex1, styles.flexRow, styles.alignItemsCenter]}>
+                                                <Text style={styles.textHeadlineH1}>{getDisplayAmount()}</Text>
+                                                {iouSettled && (
+                                                    <Animated.View style={[styles.defaultCheckmarkWrapper, {transform: [{scale: checkMarkScale}]}]}>
+                                                        <Icon
+                                                            src={Expensicons.Checkmark}
+                                                            fill={theme.iconSuccessFill}
+                                                        />
+                                                    </Animated.View>
+                                                )}
+                                                {isApproved && (
+                                                    <Animated.View style={thumbsUpStyle}>
+                                                        <Icon
+                                                            src={Expensicons.ThumbsUp}
+                                                            fill={theme.icon}
+                                                        />
+                                                    </Animated.View>
+                                                )}
+                                            </View>
+                                        </View>
+                                        {shouldShowSubtitle && !!supportText && (
+                                            <View style={styles.flexRow}>
+                                                <View style={[styles.flex1, styles.flexRow, styles.alignItemsCenter]}>
+                                                    <Text style={[styles.textLabelSupporting, styles.textNormal, styles.lh20]}>{supportText}</Text>
+                                                </View>
+                                            </View>
+                                        )}
+                                        {pendingMessageProps.shouldShow && (
+                                            <View style={[styles.flex1, styles.flexRow, styles.alignItemsCenter, styles.mt2]}>
+                                                <Icon
+                                                    src={pendingMessageProps.messageIcon}
+                                                    height={variables.iconSizeExtraSmall}
+                                                    width={variables.iconSizeExtraSmall}
+                                                    fill={theme.icon}
+                                                />
+                                                <Text style={[styles.textMicroSupporting, styles.ml1, styles.amountSplitPadding]}>{pendingMessageProps.messageDescription}</Text>
+                                            </View>
+                                        )}
+                                    </View>
+                                </View>
+                                {shouldShowSettlementButton && (
+                                    <AnimatedSettlementButton
+                                        onlyShowPayElsewhere={onlyShowPayElsewhere}
+                                        isPaidAnimationRunning={isPaidAnimationRunning}
+                                        isApprovedAnimationRunning={isApprovedAnimationRunning}
+                                        canIOUBePaid={canIOUBePaidAndApproved || isPaidAnimationRunning}
+                                        onAnimationFinish={stopAnimation}
+                                        formattedAmount={getSettlementAmount() ?? ''}
+                                        currency={iouReport?.currency}
+                                        policyID={policyID}
+                                        chatReportID={chatReportID}
+                                        iouReport={iouReport}
+                                        onPress={confirmPayment}
+                                        onPaymentOptionsShow={onPaymentOptionsShow}
+                                        onPaymentOptionsHide={onPaymentOptionsHide}
+                                        confirmApproval={confirmApproval}
+                                        enablePaymentsRoute={ROUTES.ENABLE_PAYMENTS}
+                                        addBankAccountRoute={bankAccountRoute}
+                                        shouldAddTopMargin
+                                        shouldHidePaymentOptions={!shouldShowPayButton}
+                                        shouldShowApproveButton={shouldShowApproveButton}
+                                        shouldDisableApproveButton={shouldDisableApproveButton}
+                                        kycWallAnchorAlignment={{
+                                            horizontal: CONST.MODAL.ANCHOR_ORIGIN_HORIZONTAL.LEFT,
+                                            vertical: CONST.MODAL.ANCHOR_ORIGIN_VERTICAL.BOTTOM,
+                                        }}
+                                        paymentMethodDropdownAnchorAlignment={{
+                                            horizontal: CONST.MODAL.ANCHOR_ORIGIN_HORIZONTAL.RIGHT,
+                                            vertical: CONST.MODAL.ANCHOR_ORIGIN_VERTICAL.BOTTOM,
+                                        }}
+                                        isDisabled={isOffline && !canAllowSettlement}
+                                        isLoading={!isOffline && !canAllowSettlement}
+                                    />
+                                )}
+                                {!!shouldShowExportIntegrationButton && !shouldShowSettlementButton && (
+                                    <ExportWithDropdownMenu
+                                        policy={policy}
+                                        report={iouReport}
+                                        connectionName={connectedIntegration}
+                                        wrapperStyle={styles.flexReset}
+                                        dropdownAnchorAlignment={{
+                                            horizontal: CONST.MODAL.ANCHOR_ORIGIN_HORIZONTAL.RIGHT,
+                                            vertical: CONST.MODAL.ANCHOR_ORIGIN_VERTICAL.BOTTOM,
+                                        }}
+                                    />
+                                )}
+                                {shouldShowSubmitButton && (
+                                    <Button
+                                        success={isWaitingForSubmissionFromCurrentUser}
+                                        text={translate('common.submit')}
+                                        onPress={() => iouReport && submitReport(iouReport)}
+                                        isDisabled={shouldDisableSubmitButton}
+                                    />
+                                )}
+                            </View>
+                        </View>
+                    </View>
+                </PressableWithoutFeedback>
+            </View>
+            <DelegateNoAccessModal
+                isNoDelegateAccessMenuVisible={isNoDelegateAccessMenuVisible}
+                onClose={() => setIsNoDelegateAccessMenuVisible(false)}
+            />
+
+            {isHoldMenuVisible && !!iouReport && requestType !== undefined && (
+                <ProcessMoneyReportHoldMenu
+                    nonHeldAmount={!hasOnlyHeldExpenses && hasValidNonHeldAmount ? nonHeldAmount : undefined}
+                    requestType={requestType}
+                    fullAmount={fullAmount}
+                    onClose={() => setIsHoldMenuVisible(false)}
+                    isVisible={isHoldMenuVisible}
+                    paymentType={paymentType}
+                    chatReport={chatReport}
+                    moneyRequestReport={iouReport}
+                    transactionCount={numberOfRequests}
+                    startAnimation={() => {
+                        if (requestType === CONST.IOU.REPORT_ACTION_TYPE.APPROVE) {
+                            startApprovedAnimation();
+                        } else {
+                            startAnimation();
+                        }
+                    }}
+                />
+            )}
+        </OfflineWithFeedback>
+    );
+}
+
+ReportPreviewOld.displayName = 'ReportPreview';
+
+export default ReportPreviewOld;
diff --git a/src/libs/ReportUtils.ts b/src/libs/ReportUtils.ts
index 0557ce8af620d..9d8b383cb0247 100644
--- a/src/libs/ReportUtils.ts
+++ b/src/libs/ReportUtils.ts
@@ -9215,6 +9215,13 @@ function isAllowedToApproveExpenseReport(report: OnyxEntry<Report>, approverAcco
     return !(policy?.preventSelfApproval && isOwner);
 }
 
+function isAllowedToSubmitDraftExpenseReport(report: OnyxEntry<Report>): boolean {
+    const policy = getPolicy(report?.policyID);
+    const submitToAccountID = getSubmitToAccountID(policy, report);
+
+    return isAllowedToApproveExpenseReport(report, submitToAccountID);
+}
+
 /**
  * What missing payment method does this report action indicate, if any?
  */
@@ -10804,6 +10811,7 @@ export {
     populateOptimisticReportFormula,
     getOutstandingReports,
     isReportOutstanding,
+    isAllowedToSubmitDraftExpenseReport,
 };
 
 export type {
diff --git a/src/libs/TransactionUtils/index.ts b/src/libs/TransactionUtils/index.ts
index 63a86fdf9c34a..417e3e74b10dc 100644
--- a/src/libs/TransactionUtils/index.ts
+++ b/src/libs/TransactionUtils/index.ts
@@ -902,6 +902,15 @@ function allHavePendingRTERViolation(transactionIds: string[], transactionViolat
     return transactionsWithRTERViolations.length > 0 && transactionsWithRTERViolations.every((value) => value === true);
 }
 
+function checkIfShouldShowMarkAsCashButton(hasRTERVPendingViolation: boolean, shouldDisplayBrokenConnectionViolation: boolean, report: OnyxEntry<Report>, policy: OnyxEntry<Policy>) {
+    if (hasRTERVPendingViolation) {
+        return true;
+    }
+    return (
+        shouldDisplayBrokenConnectionViolation && (!isPolicyAdmin(policy) || isCurrentUserSubmitter(report?.reportID)) && !isReportApproved({report}) && !isReportManuallyReimbursed(report)
+    );
+}
+
 /**
  * Check if there is any transaction without RTER violation within the given transactionIDs.
  */
@@ -1602,6 +1611,7 @@ export {
     shouldShowRTERViolationMessage,
     isPartialTransaction,
     isPendingCardOrScanningTransaction,
+    checkIfShouldShowMarkAsCashButton,
 };
 
 export type {TransactionChanges};
diff --git a/src/pages/home/ReportScreen.tsx b/src/pages/home/ReportScreen.tsx
index 8363b9c04dd4f..e528a74dd5210 100644
--- a/src/pages/home/ReportScreen.tsx
+++ b/src/pages/home/ReportScreen.tsx
@@ -10,7 +10,9 @@ import FullPageNotFoundView from '@components/BlockingViews/FullPageNotFoundView
 import DragAndDropProvider from '@components/DragAndDrop/Provider';
 import * as Expensicons from '@components/Icon/Expensicons';
 import MoneyReportHeader from '@components/MoneyReportHeader';
+import MoneyReportHeaderOld from '@components/MoneyReportHeaderOld';
 import MoneyRequestHeader from '@components/MoneyRequestHeader';
+import MoneyRequestHeaderOld from '@components/MoneyRequestHeaderOld';
 import OfflineWithFeedback from '@components/OfflineWithFeedback';
 import ReportActionsSkeletonView from '@components/ReportActionsSkeletonView';
 import ScreenWrapper from '@components/ScreenWrapper';
@@ -138,7 +140,7 @@ function ReportScreen({route, navigation}: ReportScreenProps) {
     const [firstRender, setFirstRender] = useState(true);
     const isSkippingOpenReport = useRef(false);
     const flatListRef = useRef<FlatList>(null);
-    const {canUseDefaultRooms} = usePermissions();
+    const {canUseDefaultRooms, canUseTableReportView} = usePermissions();
     const reactionListRef = useRef<ReactionListRef>(null);
     const {isOffline} = useNetwork();
     const {shouldUseNarrowLayout, isInNarrowPaneModal} = useResponsiveLayout();
@@ -339,13 +341,20 @@ function ReportScreen({route, navigation}: ReportScreenProps) {
     );
 
     if (isSingleTransactionView) {
-        headerView = (
+        headerView = canUseTableReportView ? (
             <MoneyRequestHeader
                 report={report}
                 policy={policy}
                 parentReportAction={parentReportAction}
                 onBackButtonPress={onBackButtonPress}
             />
+        ) : (
+            <MoneyRequestHeaderOld
+                report={report}
+                policy={policy}
+                parentReportAction={parentReportAction}
+                onBackButtonPress={onBackButtonPress}
+            />
         );
     }
 
@@ -357,7 +366,7 @@ function ReportScreen({route, navigation}: ReportScreenProps) {
     }, [transactionThreadReportID, route?.params?.reportActionID, linkedAction, reportID, navigation]);
 
     if (isMoneyRequestReport(report) || isInvoiceReport(report)) {
-        headerView = (
+        headerView = canUseTableReportView ? (
             <MoneyReportHeader
                 report={report}
                 policy={policy}
@@ -365,6 +374,14 @@ function ReportScreen({route, navigation}: ReportScreenProps) {
                 reportActions={reportActions}
                 onBackButtonPress={onBackButtonPress}
             />
+        ) : (
+            <MoneyReportHeaderOld
+                report={report}
+                policy={policy}
+                transactionThreadReportID={transactionThreadReportID}
+                reportActions={reportActions}
+                onBackButtonPress={onBackButtonPress}
+            />
         );
     }
 
diff --git a/src/pages/home/report/PureReportActionItem.tsx b/src/pages/home/report/PureReportActionItem.tsx
index 13f555a867615..8cda29e180038 100644
--- a/src/pages/home/report/PureReportActionItem.tsx
+++ b/src/pages/home/report/PureReportActionItem.tsx
@@ -28,6 +28,7 @@ import IssueCardMessage from '@components/ReportActionItem/IssueCardMessage';
 import MoneyRequestAction from '@components/ReportActionItem/MoneyRequestAction';
 import MoneyRequestReportPreview from '@components/ReportActionItem/MoneyRequestReportPreview';
 import ReportPreview from '@components/ReportActionItem/ReportPreview';
+import ReportPreviewOld from '@components/ReportActionItem/ReportPreviewOld';
 import TaskAction from '@components/ReportActionItem/TaskAction';
 import TaskPreview from '@components/ReportActionItem/TaskPreview';
 import TransactionPreview from '@components/ReportActionItem/TransactionPreview';
@@ -853,7 +854,7 @@ function PureReportActionItem({
                 />
             );
         } else if (action.actionName === CONST.REPORT.ACTIONS.TYPE.REPORT_PREVIEW) {
-            children = (
+            children = canUseTableReportView ? (
                 <ReportPreview
                     iouReportID={getIOUReportIDFromReportActionPreview(action)}
                     chatReportID={reportID}
@@ -868,6 +869,21 @@ function PureReportActionItem({
                     isWhisper={isWhisper}
                     shouldDisplayContextMenu={shouldDisplayContextMenu}
                 />
+            ) : (
+                <ReportPreviewOld
+                    iouReportID={getIOUReportIDFromReportActionPreview(action)}
+                    chatReportID={reportID}
+                    policyID={report?.policyID}
+                    containerStyles={displayAsGroup ? [] : [styles.mt2]}
+                    action={action}
+                    isHovered={hovered}
+                    contextMenuAnchor={popoverAnchorRef.current}
+                    checkIfContextMenuActive={toggleContextMenuFromActiveReportAction}
+                    onPaymentOptionsShow={() => setIsPaymentMethodPopoverActive(true)}
+                    onPaymentOptionsHide={() => setIsPaymentMethodPopoverActive(false)}
+                    isWhisper={isWhisper}
+                    shouldDisplayContextMenu={shouldDisplayContextMenu}
+                />
             );
         } else if (isTaskAction(action)) {
             children = <TaskAction action={action} />;

From 724a2f079a6857ec8c59678764b0b21586ed4bab Mon Sep 17 00:00:00 2001
From: Jan Nowakowski <janeknowakowski9@gmail.com>
Date: Tue, 22 Apr 2025 13:25:16 +0200
Subject: [PATCH 35/42] fix tests

---
 tests/unit/ReportSecondaryActionUtilsTest.ts | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/tests/unit/ReportSecondaryActionUtilsTest.ts b/tests/unit/ReportSecondaryActionUtilsTest.ts
index 3b737b5522617..15d91fe4df8bb 100644
--- a/tests/unit/ReportSecondaryActionUtilsTest.ts
+++ b/tests/unit/ReportSecondaryActionUtilsTest.ts
@@ -436,7 +436,7 @@ describe('getSecondaryAction', () => {
         } as unknown as Report;
         const policy = {
             id: POLICY_ID,
-            employeeList: {[CURRENT_USER_EMAIL]: {}},
+            employeeList: {[CURRENT_USER_EMAIL]: {role: CONST.POLICY.ROLE.ADMIN}},
             role: CONST.POLICY.ROLE.ADMIN,
         } as unknown as Policy;
         await Onyx.merge(`${ONYXKEYS.COLLECTION.POLICY}${POLICY_ID}`, policy);
@@ -444,7 +444,8 @@ describe('getSecondaryAction', () => {
         const policy2 = {
             id: POLICY_ID2,
             ownerAccountID: CURRENT_USER_ACCOUNT_ID,
-            employeeList: {[CURRENT_USER_EMAIL]: {}},
+            employeeList: {[CURRENT_USER_EMAIL]: {role: CONST.POLICY.ROLE.ADMIN}},
+            role: CONST.POLICY.ROLE.ADMIN,
         };
         await Onyx.merge(`${ONYXKEYS.COLLECTION.POLICY}${POLICY_ID2}`, policy2);
 

From ae9a729c4c95ccbfeb06ea7a684ed5c99da2f864 Mon Sep 17 00:00:00 2001
From: Jan Nowakowski <janeknowakowski9@gmail.com>
Date: Tue, 22 Apr 2025 20:45:06 +0200
Subject: [PATCH 36/42] fix typecheck

---
 src/libs/TransactionUtils/index.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/libs/TransactionUtils/index.ts b/src/libs/TransactionUtils/index.ts
index 417e3e74b10dc..8ffe13ae74070 100644
--- a/src/libs/TransactionUtils/index.ts
+++ b/src/libs/TransactionUtils/index.ts
@@ -26,7 +26,7 @@ import {
     isPolicyAdmin,
 } from '@libs/PolicyUtils';
 import {getOriginalMessage, getReportAction, isMoneyRequestAction} from '@libs/ReportActionsUtils';
-import {getReportOrDraftReport, getReportTransactions, isCurrentUserSubmitter, isOpenExpenseReport, isProcessingReport, isReportIDApproved, isSettled, isThread} from '@libs/ReportUtils';
+import {getReportOrDraftReport, getReportTransactions, isCurrentUserSubmitter, isOpenExpenseReport, isProcessingReport, isReportApproved, isReportIDApproved, isReportManuallyReimbursed, isSettled, isThread} from '@libs/ReportUtils';
 import type {IOURequestType} from '@userActions/IOU';
 import CONST from '@src/CONST';
 import type {IOUType} from '@src/CONST';

From 67e9a4a19c9854d426bc4fc99244c5f6d99d70d8 Mon Sep 17 00:00:00 2001
From: Jan Nowakowski <janeknowakowski9@gmail.com>
Date: Tue, 22 Apr 2025 20:57:48 +0200
Subject: [PATCH 37/42] fix prettier

---
 src/libs/TransactionUtils/index.ts | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/src/libs/TransactionUtils/index.ts b/src/libs/TransactionUtils/index.ts
index 8ffe13ae74070..e43306352be4a 100644
--- a/src/libs/TransactionUtils/index.ts
+++ b/src/libs/TransactionUtils/index.ts
@@ -26,7 +26,18 @@ import {
     isPolicyAdmin,
 } from '@libs/PolicyUtils';
 import {getOriginalMessage, getReportAction, isMoneyRequestAction} from '@libs/ReportActionsUtils';
-import {getReportOrDraftReport, getReportTransactions, isCurrentUserSubmitter, isOpenExpenseReport, isProcessingReport, isReportApproved, isReportIDApproved, isReportManuallyReimbursed, isSettled, isThread} from '@libs/ReportUtils';
+import {
+    getReportOrDraftReport,
+    getReportTransactions,
+    isCurrentUserSubmitter,
+    isOpenExpenseReport,
+    isProcessingReport,
+    isReportApproved,
+    isReportIDApproved,
+    isReportManuallyReimbursed,
+    isSettled,
+    isThread,
+} from '@libs/ReportUtils';
 import type {IOURequestType} from '@userActions/IOU';
 import CONST from '@src/CONST';
 import type {IOUType} from '@src/CONST';

From ad97b7c1fb998d6f5ae8fe8f5cbb54bf2f39ebcb Mon Sep 17 00:00:00 2001
From: Jan Nowakowski <janeknowakowski9@gmail.com>
Date: Wed, 23 Apr 2025 09:47:10 +0200
Subject: [PATCH 38/42] Check beta on ReportDetailsPage

---
 src/pages/ReportDetailsPage.tsx | 212 +++++++++++++++++++++++++++++---
 1 file changed, 197 insertions(+), 15 deletions(-)

diff --git a/src/pages/ReportDetailsPage.tsx b/src/pages/ReportDetailsPage.tsx
index 2dc9365a17c5f..0fcd81528eb2e 100644
--- a/src/pages/ReportDetailsPage.tsx
+++ b/src/pages/ReportDetailsPage.tsx
@@ -9,6 +9,7 @@ import FullPageNotFoundView from '@components/BlockingViews/FullPageNotFoundView
 import Button from '@components/Button';
 import ConfirmModal from '@components/ConfirmModal';
 import DecisionModal from '@components/DecisionModal';
+import DelegateNoAccessModal from '@components/DelegateNoAccessModal';
 import DisplayNames from '@components/DisplayNames';
 import FixedFooter from '@components/FixedFooter';
 import Header from '@components/Header';
@@ -28,8 +29,10 @@ import PromotedActionsBar, {PromotedActions} from '@components/PromotedActionsBa
 import RoomHeaderAvatars from '@components/RoomHeaderAvatars';
 import ScreenWrapper from '@components/ScreenWrapper';
 import ScrollView from '@components/ScrollView';
+import {useSearchContext} from '@components/Search/SearchContext';
 import Text from '@components/Text';
 import TextWithCopy from '@components/TextWithCopy';
+import useDelegateUserDetails from '@hooks/useDelegateUserDetails';
 import useLocalize from '@hooks/useLocalize';
 import useNetwork from '@hooks/useNetwork';
 import usePaginatedReportActions from '@hooks/usePaginatedReportActions';
@@ -46,7 +49,9 @@ import {getConnectedIntegration, isPolicyAdmin as isPolicyAdminUtil, isPolicyEmp
 import {getOneTransactionThreadReportID, getOriginalMessage, getTrackExpenseActionableWhisper, isDeletedAction, isMoneyRequestAction, isTrackExpenseAction} from '@libs/ReportActionsUtils';
 import {
     canDeleteCardTransactionByLiabilityType,
+    canDeleteTransaction,
     canEditReportDescription as canEditReportDescriptionUtil,
+    canHoldUnholdReportAction as canHoldUnholdReportActionUtil,
     canJoinChat,
     canLeaveChat,
     canWriteInReport,
@@ -72,6 +77,7 @@ import {
     isConciergeChatReport,
     isDefaultRoom as isDefaultRoomUtil,
     isExpenseReport as isExpenseReportUtil,
+    isExported,
     isGroupChat as isGroupChatUtil,
     isHiddenForCurrentUser,
     isInvoiceReport as isInvoiceReportUtil,
@@ -91,15 +97,26 @@ import {
     isUserCreatedPolicyRoom as isUserCreatedPolicyRoomUtil,
     navigateBackOnDeleteTransaction,
     navigateToPrivateNotes,
+    reportTransactionsSelector,
     shouldDisableRename as shouldDisableRenameUtil,
     shouldUseFullTitleToDisplay,
 } from '@libs/ReportUtils';
 import StringUtils from '@libs/StringUtils';
-import {deleteMoneyRequest, deleteTrackExpense, getNavigationUrlAfterTrackExpenseDelete, getNavigationUrlOnMoneyRequestDelete, unapproveExpenseReport} from '@userActions/IOU';
+import {
+    canCancelPayment,
+    cancelPayment as cancelPaymentAction,
+    canUnapproveIOU,
+    deleteMoneyRequest,
+    deleteTrackExpense,
+    getNavigationUrlAfterTrackExpenseDelete,
+    getNavigationUrlOnMoneyRequestDelete,
+    unapproveExpenseReport,
+} from '@userActions/IOU';
 import {
     clearAvatarErrors,
     clearPolicyRoomNameErrors,
     downloadReportPDF,
+    exportReportToCSV,
     exportReportToPDF,
     getReportPrivateNote,
     hasErrorInPrivateNotes,
@@ -147,7 +164,7 @@ type CaseID = ValueOf<typeof CASES>;
 function ReportDetailsPage({policies, report, route, reportMetadata}: ReportDetailsPageProps) {
     const {translate} = useLocalize();
     const {isOffline} = useNetwork();
-    const {canUsePDFExport} = usePermissions();
+    const {canUsePDFExport, canUseTableReportView} = usePermissions();
     const theme = useTheme();
     const styles = useThemeStyles();
     const backTo = route.params.backTo;
@@ -164,8 +181,10 @@ function ReportDetailsPage({policies, report, route, reportMetadata}: ReportDeta
         selector: (actions) => (report?.parentReportActionID ? actions?.[report.parentReportActionID] : undefined),
     });
     const [reportNameValuePairs] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT_NAME_VALUE_PAIRS}${report?.reportID || CONST.DEFAULT_NUMBER_ID}`);
+    const [parentReportNameValuePairs] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT_NAME_VALUE_PAIRS}${report?.parentReportID || CONST.DEFAULT_NUMBER_ID}`);
     /* eslint-enable @typescript-eslint/prefer-nullish-coalescing */
     const {reportActions} = usePaginatedReportActions(report.reportID);
+    const {currentSearchHash} = useSearchContext();
 
     // We need to use isSmallScreenWidth instead of shouldUseNarrowLayout to apply the correct modal type for the decision modal
     // eslint-disable-next-line rulesdir/prefer-shouldUseNarrowLayout-instead-of-isSmallScreenWidth
@@ -178,14 +197,20 @@ function ReportDetailsPage({policies, report, route, reportMetadata}: ReportDeta
     const [isDebugModeEnabled] = useOnyx(ONYXKEYS.USER, {selector: (user) => !!user?.isDebugModeEnabled});
     const [personalDetails] = useOnyx(ONYXKEYS.PERSONAL_DETAILS_LIST);
     const [session] = useOnyx(ONYXKEYS.SESSION);
+    const [transactions] = useOnyx(ONYXKEYS.COLLECTION.TRANSACTION, {
+        selector: (_transactions) => reportTransactionsSelector(_transactions, report.reportID),
+        initialValue: [],
+    });
 
     const {removeTransaction} = useMoneyRequestReportContext();
 
     const [isLastMemberLeavingGroupModalVisible, setIsLastMemberLeavingGroupModalVisible] = useState(false);
     const [isDeleteModalVisible, setIsDeleteModalVisible] = useState(false);
     const [isUnapproveModalVisible, setIsUnapproveModalVisible] = useState(false);
+    const [isConfirmModalVisible, setIsConfirmModalVisible] = useState(false);
     const [isPDFModalVisible, setIsPDFModalVisible] = useState(false);
     const [offlineModalVisible, setOfflineModalVisible] = useState(false);
+    const [downloadErrorModalVisible, setDownloadErrorModalVisible] = useState(false);
     const policy = useMemo(() => policies?.[`${ONYXKEYS.COLLECTION.POLICY}${report?.policyID}`], [policies, report?.policyID]);
     const isPolicyAdmin = useMemo(() => isPolicyAdminUtil(policy), [policy]);
     const isPolicyEmployee = useMemo(() => isPolicyEmployeeUtil(report?.policyID, policies), [report?.policyID, policies]);
@@ -256,6 +281,13 @@ function ReportDetailsPage({policies, report, route, reportMetadata}: ReportDeta
         caseID = CASES.DEFAULT;
     }
 
+    const transactionIDList = useMemo(() => {
+        if (caseID !== CASES.MONEY_REPORT || !transactions) {
+            return [];
+        }
+        return transactions.map((transaction) => transaction.transactionID);
+    }, [caseID, transactions]);
+
     // Get the active chat members by filtering out the pending members with delete action
     const activeChatMembers = participants.flatMap((accountID) => {
         const pendingMember = reportMetadata?.pendingChatMembers?.findLast((member) => member.accountID === accountID.toString());
@@ -290,10 +322,12 @@ function ReportDetailsPage({policies, report, route, reportMetadata}: ReportDeta
         return report;
     }, [caseID, parentReport, report]);
 
+    const moneyRequestAction = transactionThreadReportID ? requestParentReportAction : parentReportAction;
+
     const canActionTask = canActionTaskAction(report, session?.accountID ?? CONST.DEFAULT_NUMBER_ID);
     const shouldShowTaskDeleteButton =
         isTaskReport && !isCanceledTaskReport && canWriteInReport(report) && report.stateNum !== CONST.REPORT.STATE_NUM.APPROVED && !isClosedReport(report) && canModifyTask && canActionTask;
-    const canDeleteRequest = isActionOwner && isSelfDMTrackExpenseReport && !isDeletedParentAction;
+    const canDeleteRequest = isActionOwner && (canDeleteTransaction(moneyRequestReport) || isSelfDMTrackExpenseReport) && !isDeletedParentAction;
     const iouTransactionID = isMoneyRequestAction(requestParentReportAction) ? getOriginalMessage(requestParentReportAction)?.IOUTransactionID : '';
     const isCardTransactionCanBeDeleted = canDeleteCardTransactionByLiabilityType(iouTransactionID);
     const shouldShowDeleteButton = shouldShowTaskDeleteButton || (canDeleteRequest && isCardTransactionCanBeDeleted);
@@ -327,6 +361,22 @@ function ReportDetailsPage({policies, report, route, reportMetadata}: ReportDeta
         });
     }, [isPolicyEmployee, isPolicyExpenseChat, isRootGroupChat, report.reportID, report.visibility]);
 
+    const [moneyRequestReportActions] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${moneyRequestReport?.reportID}`);
+    const isMoneyRequestExported = isExported(moneyRequestReportActions);
+    const {isDelegateAccessRestricted} = useDelegateUserDetails();
+    const [isNoDelegateAccessMenuVisible, setIsNoDelegateAccessMenuVisible] = useState(false);
+
+    const unapproveExpenseReportOrShowModal = useCallback(() => {
+        if (isDelegateAccessRestricted) {
+            setIsNoDelegateAccessMenuVisible(true);
+        } else if (isMoneyRequestExported) {
+            setIsUnapproveModalVisible(true);
+            return;
+        }
+        Navigation.dismissModal();
+        unapproveExpenseReport(moneyRequestReport);
+    }, [isMoneyRequestExported, moneyRequestReport, isDelegateAccessRestricted]);
+
     const shouldShowLeaveButton = canLeaveChat(report, policy);
     const shouldShowGoToWorkspace = shouldShowPolicy(policy, false, session?.email) && !policy?.isJoinRequestPending;
 
@@ -349,6 +399,17 @@ function ReportDetailsPage({policies, report, route, reportMetadata}: ReportDeta
     const shouldShowNotificationPref = !isMoneyRequestReport && !isHiddenForCurrentUser(report);
     const shouldShowWriteCapability = !isMoneyRequestReport;
     const shouldShowMenuItem = shouldShowNotificationPref || shouldShowWriteCapability || (!!report?.visibility && report.chatType !== CONST.REPORT.CHAT_TYPE.INVOICE);
+    const shouldShowCancelPaymentButton = caseID === CASES.MONEY_REPORT && canCancelPayment(moneyRequestReport, session);
+    const [chatReport] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${moneyRequestReport?.chatReportID}`);
+
+    const cancelPayment = useCallback(() => {
+        if (!chatReport) {
+            return;
+        }
+
+        cancelPaymentAction(moneyRequestReport, chatReport);
+        setIsConfirmModalVisible(false);
+    }, [moneyRequestReport, chatReport]);
 
     const beginPDFExport = useCallback(() => {
         setIsPDFModalVisible(true);
@@ -484,22 +545,75 @@ function ReportDetailsPage({policies, report, route, reportMetadata}: ReportDeta
             }
         }
 
-        if (canUsePDFExport && caseID === CASES.MONEY_REPORT) {
+        if (!canUseTableReportView && shouldShowCancelPaymentButton) {
             items.push({
-                key: CONST.REPORT_DETAILS_MENU_ITEM.DOWNLOAD_PDF,
-                translationKey: 'common.downloadAsPDF',
-                icon: Expensicons.Document,
+                key: CONST.REPORT_DETAILS_MENU_ITEM.CANCEL_PAYMENT,
+                icon: Expensicons.Trashcan,
+                translationKey: 'iou.cancelPayment',
+                isAnonymousAction: false,
+                action: () => setIsConfirmModalVisible(true),
+            });
+        }
+
+        if (caseID === CASES.MONEY_REPORT) {
+            if (!canUseTableReportView) {
+                items.push({
+                    key: CONST.REPORT_DETAILS_MENU_ITEM.DOWNLOAD_CSV,
+                    translationKey: 'common.downloadAsCSV',
+                    icon: Expensicons.Table,
+                    isAnonymousAction: false,
+                    action: () => {
+                        if (isOffline) {
+                            setOfflineModalVisible(true);
+                            return;
+                        }
+
+                        exportReportToCSV({reportID: report.reportID, transactionIDList}, () => {
+                            setDownloadErrorModalVisible(true);
+                        });
+                    },
+                });
+            }
+
+            if (canUsePDFExport) {
+                items.push({
+                    key: CONST.REPORT_DETAILS_MENU_ITEM.DOWNLOAD_PDF,
+                    translationKey: 'common.downloadAsPDF',
+                    icon: Expensicons.Document,
+                    isAnonymousAction: false,
+                    action: () => {
+                        if (isOffline) {
+                            setOfflineModalVisible(true);
+                        } else {
+                            beginPDFExport();
+                        }
+                    },
+                });
+            }
+        }
+
+        if (policy && connectedIntegration && isPolicyAdmin && !isSingleTransactionView && isExpenseReport) {
+            items.push({
+                key: CONST.REPORT_DETAILS_MENU_ITEM.EXPORT,
+                translationKey: 'common.export',
+                icon: Expensicons.Export,
                 isAnonymousAction: false,
                 action: () => {
-                    if (isOffline) {
-                        setOfflineModalVisible(true);
-                    } else {
-                        beginPDFExport();
-                    }
+                    Navigation.navigate(ROUTES.REPORT_WITH_ID_DETAILS_EXPORT.getRoute(report?.reportID, connectedIntegration, backTo));
                 },
             });
         }
 
+        if (!canUseTableReportView && canUnapproveIOU(report, policy)) {
+            items.push({
+                key: CONST.REPORT_DETAILS_MENU_ITEM.UNAPPROVE,
+                icon: Expensicons.CircularArrowBackwards,
+                translationKey: 'iou.unapprove',
+                isAnonymousAction: false,
+                action: () => unapproveExpenseReportOrShowModal(),
+            });
+        }
+
         if (shouldShowGoToWorkspace) {
             items.push({
                 key: CONST.REPORT_DETAILS_MENU_ITEM.GO_TO_WORKSPACE,
@@ -564,8 +678,14 @@ function ReportDetailsPage({policies, report, route, reportMetadata}: ReportDeta
         isInvoiceReport,
         isTaskReport,
         isCanceledTaskReport,
-        canUsePDFExport,
+        canUseTableReportView,
+        shouldShowCancelPaymentButton,
         caseID,
+        policy,
+        connectedIntegration,
+        isPolicyAdmin,
+        isSingleTransactionView,
+        isExpenseReport,
         shouldShowGoToWorkspace,
         shouldShowLeaveButton,
         isDebugModeEnabled,
@@ -578,8 +698,11 @@ function ReportDetailsPage({policies, report, route, reportMetadata}: ReportDeta
         session,
         canModifyTask,
         canActionTask,
+        canUsePDFExport,
         isOffline,
+        transactionIDList,
         beginPDFExport,
+        unapproveExpenseReportOrShowModal,
         isRootGroupChat,
         leaveChat,
     ]);
@@ -655,6 +778,11 @@ function ReportDetailsPage({policies, report, route, reportMetadata}: ReportDeta
         );
     }, [report, icons, isMoneyRequestReport, isInvoiceReport, isGroupChat, isThread, styles]);
 
+    const canHoldUnholdReportAction = canHoldUnholdReportActionUtil(moneyRequestAction);
+    const shouldShowHoldAction =
+        caseID !== CASES.DEFAULT &&
+        (canHoldUnholdReportAction.canHoldRequest || canHoldUnholdReportAction.canUnholdRequest) &&
+        !isArchivedNonExpenseReport(transactionThreadReportID ? report : parentReport, transactionThreadReportID ? reportNameValuePairs : parentReportNameValuePairs);
     const canJoin = canJoinChat(report, parentReportAction, policy);
 
     const promotedActions = useMemo(() => {
@@ -664,6 +792,19 @@ function ReportDetailsPage({policies, report, route, reportMetadata}: ReportDeta
             result.push(PromotedActions.join(report));
         }
 
+        if (!canUseTableReportView && isExpenseReport && shouldShowHoldAction) {
+            result.push(
+                PromotedActions.hold({
+                    isTextHold: canHoldUnholdReportAction.canHoldRequest,
+                    reportAction: moneyRequestAction,
+                    reportID: transactionThreadReportID ? report.reportID : moneyRequestAction?.childReportID,
+                    isDelegateAccessRestricted,
+                    setIsNoDelegateAccessMenuVisible,
+                    currentSearchHash,
+                }),
+            );
+        }
+
         if (report) {
             result.push(PromotedActions.pin(report));
         }
@@ -671,7 +812,19 @@ function ReportDetailsPage({policies, report, route, reportMetadata}: ReportDeta
         result.push(PromotedActions.share(report, backTo));
 
         return result;
-    }, [report, canJoin, backTo]);
+    }, [
+        canJoin,
+        canUseTableReportView,
+        isExpenseReport,
+        shouldShowHoldAction,
+        report,
+        backTo,
+        canHoldUnholdReportAction.canHoldRequest,
+        moneyRequestAction,
+        transactionThreadReportID,
+        isDelegateAccessRestricted,
+        currentSearchHash,
+    ]);
 
     const nameSectionExpenseIOU = (
         <View style={[styles.reportDetailsRoomInfo, styles.mw100]}>
@@ -954,6 +1107,19 @@ function ReportDetailsPage({policies, report, route, reportMetadata}: ReportDeta
                     confirmText={translate('common.leave')}
                     cancelText={translate('common.cancel')}
                 />
+                {!canUseTableReportView && (
+                    <ConfirmModal
+                        title={translate('iou.cancelPayment')}
+                        isVisible={isConfirmModalVisible}
+                        onConfirm={cancelPayment}
+                        onCancel={() => setIsConfirmModalVisible(false)}
+                        prompt={translate('iou.cancelPaymentConfirmation')}
+                        confirmText={translate('iou.cancelPayment')}
+                        cancelText={translate('common.dismiss')}
+                        danger
+                        shouldEnableNewFocusManagement
+                    />
+                )}
                 <ConfirmModal
                     title={caseID === CASES.DEFAULT ? translate('task.deleteTask') : translate('iou.deleteExpense', {count: 1})}
                     isVisible={isDeleteModalVisible}
@@ -969,6 +1135,12 @@ function ReportDetailsPage({policies, report, route, reportMetadata}: ReportDeta
                     shouldEnableNewFocusManagement
                     onModalHide={navigateToTargetUrl}
                 />
+                {!canUseTableReportView && (
+                    <DelegateNoAccessModal
+                        isNoDelegateAccessMenuVisible={isNoDelegateAccessMenuVisible}
+                        onClose={() => setIsNoDelegateAccessMenuVisible(false)}
+                    />
+                )}
                 <ConfirmModal
                     title={translate('iou.unapproveReport')}
                     isVisible={isUnapproveModalVisible}
@@ -992,7 +1164,17 @@ function ReportDetailsPage({policies, report, route, reportMetadata}: ReportDeta
                     isVisible={offlineModalVisible}
                     onClose={() => setOfflineModalVisible(false)}
                 />
-
+                {!canUseTableReportView && (
+                    <DecisionModal
+                        title={translate('common.downloadFailedTitle')}
+                        prompt={translate('common.downloadFailedDescription')}
+                        isSmallScreenWidth={isSmallScreenWidth}
+                        onSecondOptionSubmit={() => setDownloadErrorModalVisible(false)}
+                        secondOptionText={translate('common.buttonConfirm')}
+                        isVisible={downloadErrorModalVisible}
+                        onClose={() => setDownloadErrorModalVisible(false)}
+                    />
+                )}
                 <Modal
                     onClose={() => setIsPDFModalVisible(false)}
                     isVisible={isPDFModalVisible}

From 4428dfaa37937222bc1424941e336d1596d74deb Mon Sep 17 00:00:00 2001
From: Jan Nowakowski <janeknowakowski9@gmail.com>
Date: Wed, 23 Apr 2025 10:14:18 +0200
Subject: [PATCH 39/42] make tests deterministic

---
 tests/actions/ReportPreviewActionUtilsTest.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tests/actions/ReportPreviewActionUtilsTest.ts b/tests/actions/ReportPreviewActionUtilsTest.ts
index 63cbf49eca134..d2f0ed61bf2ee 100644
--- a/tests/actions/ReportPreviewActionUtilsTest.ts
+++ b/tests/actions/ReportPreviewActionUtilsTest.ts
@@ -86,6 +86,7 @@ describe('getReportPreviewAction', () => {
         policy.type = CONST.POLICY.TYPE.CORPORATE;
         policy.approver = CURRENT_USER_EMAIL;
         policy.approvalMode = CONST.POLICY.APPROVAL_MODE.BASIC;
+        policy.preventSelfApproval = false;
 
         await Onyx.merge(`${ONYXKEYS.COLLECTION.REPORT}${REPORT_ID}`, report);
 

From 6f9eca26a475a307d2202132a1ca954e51767adf Mon Sep 17 00:00:00 2001
From: Jan Nowakowski <janeknowakowski9@gmail.com>
Date: Wed, 23 Apr 2025 12:02:57 +0200
Subject: [PATCH 40/42] Do not remove option to export csv from details page

---
 src/pages/ReportDetailsPage.tsx | 52 +++++++++++++++------------------
 1 file changed, 24 insertions(+), 28 deletions(-)

diff --git a/src/pages/ReportDetailsPage.tsx b/src/pages/ReportDetailsPage.tsx
index 0fcd81528eb2e..08cec2f6cd1df 100644
--- a/src/pages/ReportDetailsPage.tsx
+++ b/src/pages/ReportDetailsPage.tsx
@@ -556,24 +556,22 @@ function ReportDetailsPage({policies, report, route, reportMetadata}: ReportDeta
         }
 
         if (caseID === CASES.MONEY_REPORT) {
-            if (!canUseTableReportView) {
-                items.push({
-                    key: CONST.REPORT_DETAILS_MENU_ITEM.DOWNLOAD_CSV,
-                    translationKey: 'common.downloadAsCSV',
-                    icon: Expensicons.Table,
-                    isAnonymousAction: false,
-                    action: () => {
-                        if (isOffline) {
-                            setOfflineModalVisible(true);
-                            return;
-                        }
+            items.push({
+                key: CONST.REPORT_DETAILS_MENU_ITEM.DOWNLOAD_CSV,
+                translationKey: 'common.downloadAsCSV',
+                icon: Expensicons.Table,
+                isAnonymousAction: false,
+                action: () => {
+                    if (isOffline) {
+                        setOfflineModalVisible(true);
+                        return;
+                    }
 
-                        exportReportToCSV({reportID: report.reportID, transactionIDList}, () => {
-                            setDownloadErrorModalVisible(true);
-                        });
-                    },
-                });
-            }
+                    exportReportToCSV({reportID: report.reportID, transactionIDList}, () => {
+                        setDownloadErrorModalVisible(true);
+                    });
+                },
+            });
 
             if (canUsePDFExport) {
                 items.push({
@@ -1164,17 +1162,15 @@ function ReportDetailsPage({policies, report, route, reportMetadata}: ReportDeta
                     isVisible={offlineModalVisible}
                     onClose={() => setOfflineModalVisible(false)}
                 />
-                {!canUseTableReportView && (
-                    <DecisionModal
-                        title={translate('common.downloadFailedTitle')}
-                        prompt={translate('common.downloadFailedDescription')}
-                        isSmallScreenWidth={isSmallScreenWidth}
-                        onSecondOptionSubmit={() => setDownloadErrorModalVisible(false)}
-                        secondOptionText={translate('common.buttonConfirm')}
-                        isVisible={downloadErrorModalVisible}
-                        onClose={() => setDownloadErrorModalVisible(false)}
-                    />
-                )}
+                <DecisionModal
+                    title={translate('common.downloadFailedTitle')}
+                    prompt={translate('common.downloadFailedDescription')}
+                    isSmallScreenWidth={isSmallScreenWidth}
+                    onSecondOptionSubmit={() => setDownloadErrorModalVisible(false)}
+                    secondOptionText={translate('common.buttonConfirm')}
+                    isVisible={downloadErrorModalVisible}
+                    onClose={() => setDownloadErrorModalVisible(false)}
+                />
                 <Modal
                     onClose={() => setIsPDFModalVisible(false)}
                     isVisible={isPDFModalVisible}

From 7311c4a7d9009c4617556989640731300711e101 Mon Sep 17 00:00:00 2001
From: Jan Nowakowski <janeknowakowski9@gmail.com>
Date: Wed, 23 Apr 2025 19:53:59 +0200
Subject: [PATCH 41/42] fix ts

---
 src/pages/home/ReportScreen.tsx | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/pages/home/ReportScreen.tsx b/src/pages/home/ReportScreen.tsx
index db24968f12c15..99ce8a9d697da 100644
--- a/src/pages/home/ReportScreen.tsx
+++ b/src/pages/home/ReportScreen.tsx
@@ -308,7 +308,6 @@ function ReportScreen({route, navigation}: ReportScreenProps) {
     const didSubscribeToReportLeavingEvents = useRef(false);
     const isTransactionThreadView = isReportTransactionThread(report);
 
-    const {canUseTableReportView} = usePermissions();
     const isMoneyRequestOrInvoiceReport = isMoneyRequestReport(report) || isInvoiceReport(report);
 
     useEffect(() => {

From 44e1cadf1bc71f8e8a7f48d8ab9eeb83420e2ab1 Mon Sep 17 00:00:00 2001
From: Jan Nowakowski <janeknowakowski9@gmail.com>
Date: Thu, 24 Apr 2025 08:48:05 +0200
Subject: [PATCH 42/42] after merge

---
 src/libs/MoneyRequestReportUtils.ts | 73 +----------------------------
 1 file changed, 2 insertions(+), 71 deletions(-)

diff --git a/src/libs/MoneyRequestReportUtils.ts b/src/libs/MoneyRequestReportUtils.ts
index 494962b1e2fae..b3f3303a3c1b3 100644
--- a/src/libs/MoneyRequestReportUtils.ts
+++ b/src/libs/MoneyRequestReportUtils.ts
@@ -67,21 +67,12 @@ function selectAllTransactionsForReport(transactions: OnyxCollection<Transaction
     });
 }
 
-const IOU_REPORT_PREVIEW_BUTTON = {
-    PAY: CONST.REPORT.PRIMARY_ACTIONS.PAY,
-    APPROVE: CONST.REPORT.PRIMARY_ACTIONS.APPROVE,
-    EXPORT: CONST.REPORT.PRIMARY_ACTIONS.EXPORT_TO_ACCOUNTING,
-    REVIEW: CONST.REPORT.PRIMARY_ACTIONS.REVIEW_DUPLICATES,
-    SUBMIT: CONST.REPORT.PRIMARY_ACTIONS.SUBMIT,
-    NONE: undefined,
-};
-
 /**
  * Determines the total amount to be displayed based on the selected button type in the IOU Report Preview.
  *
  * @param report - Onyx report object
  * @param policy - Onyx policy object
- * @param buttonType - The type of button selected which determines how amounts are calculated and displayed.
+ * @param reportPreviewAction - The action that will take place when button is clicked which determines how amounts are calculated and displayed.
  * @returns - The total amount to be formatted as a string. Returns an empty string if no amount is applicable.
  */
 const getTotalAmountForIOUReportPreviewButton = (report: OnyxEntry<Report>, policy: OnyxEntry<Policy>, reportPreviewAction: ValueOf<typeof CONST.REPORT.REPORT_PREVIEW_ACTIONS>) => {
@@ -112,64 +103,4 @@ const getTotalAmountForIOUReportPreviewButton = (report: OnyxEntry<Report>, poli
     return convertToDisplayString(totalDisplaySpend, report?.currency);
 };
 
-/**
- * Determines the appropriate button type for the IOU Report Preview based on the given flags.
- *
- * @param flags - An object containing boolean flags indicating button visibility options.
- * @param flags.shouldShowSubmitButton - Flag indicating if the submit button should be shown.
- * @param flags.shouldShowExportIntegrationButton - Flag indicating if the export integration button should be shown.
- * @param flags.shouldShowRBR - Flag indicating if the RBR button should be shown.
- * @param flags.shouldShowSettlementButton - Flag indicating if the settlement button should be shown.
- * @param flags.shouldShowPayButton - Flag indicating if the pay button should be shown.
- * @param flags.shouldShowApproveButton - Flag indicating if the approve button should be shown.
- * @returns - Returns the type of button that should be displayed based on the input flags.
- */
-const getIOUReportPreviewButtonType = ({
-    shouldShowSubmitButton,
-    shouldShowExportIntegrationButton,
-    shouldShowApproveButton,
-    shouldShowSettlementButton,
-    shouldShowPayButton,
-    shouldShowRBR,
-}: {
-    shouldShowSubmitButton: boolean;
-    shouldShowExportIntegrationButton: boolean;
-    shouldShowRBR: boolean;
-    shouldShowSettlementButton: boolean;
-    shouldShowPayButton: boolean;
-    shouldShowApproveButton: boolean;
-}): ValueOf<typeof IOU_REPORT_PREVIEW_BUTTON> => {
-    const shouldShowSettlementWithoutRBR = shouldShowSettlementButton && !shouldShowRBR;
-    const shouldShowSettlementOrRBR = shouldShowSettlementButton || shouldShowRBR;
-    const shouldShowSettlementOrExport = shouldShowSettlementButton || shouldShowExportIntegrationButton;
-
-    if (shouldShowSettlementWithoutRBR && shouldShowPayButton) {
-        return IOU_REPORT_PREVIEW_BUTTON.PAY;
-    }
-    if (shouldShowSettlementWithoutRBR && shouldShowApproveButton) {
-        return IOU_REPORT_PREVIEW_BUTTON.APPROVE;
-    }
-
-    if (!shouldShowSettlementOrRBR && shouldShowExportIntegrationButton) {
-        return IOU_REPORT_PREVIEW_BUTTON.EXPORT;
-    }
-
-    if (shouldShowRBR && !shouldShowSubmitButton && shouldShowSettlementOrExport) {
-        return IOU_REPORT_PREVIEW_BUTTON.REVIEW;
-    }
-
-    if (shouldShowSubmitButton) {
-        return IOU_REPORT_PREVIEW_BUTTON.SUBMIT;
-    }
-
-    return IOU_REPORT_PREVIEW_BUTTON.NONE;
-};
-
-export {
-    isActionVisibleOnMoneyRequestReport,
-    getThreadReportIDsForTransactions,
-    getTotalAmountForIOUReportPreviewButton,
-    selectAllTransactionsForReport,
-    getIOUReportPreviewButtonType,
-    IOU_REPORT_PREVIEW_BUTTON,
-};
+export {isActionVisibleOnMoneyRequestReport, getThreadReportIDsForTransactions, getTotalAmountForIOUReportPreviewButton, selectAllTransactionsForReport};