From e1385cb4e30733bae3be7e7bdc36db03bf555438 Mon Sep 17 00:00:00 2001
From: Jan Nowakowski <janeknowakowski9@gmail.com>
Date: Mon, 10 Mar 2025 12:27:19 +0100
Subject: [PATCH 01/54] Simplified actions on report header

---
 src/components/AvatarWithDisplayName.tsx     |  16 +-
 src/components/MoneyReportHeader.tsx         | 397 +++++++++++--------
 src/languages/en.ts                          |   2 +-
 src/languages/es.ts                          |   2 +-
 src/libs/PolicyUtils.ts                      |  14 -
 src/libs/ReportPrimaryActionUtils.ts         |   5 +-
 src/libs/ReportSecondaryActionUtils.ts       |  26 +-
 tests/unit/ReportSecondaryActionUtilsTest.ts |  49 ++-
 8 files changed, 288 insertions(+), 223 deletions(-)

diff --git a/src/components/AvatarWithDisplayName.tsx b/src/components/AvatarWithDisplayName.tsx
index a8b3e1d35119..6d4fd8cfdd4c 100644
--- a/src/components/AvatarWithDisplayName.tsx
+++ b/src/components/AvatarWithDisplayName.tsx
@@ -78,6 +78,7 @@ function AvatarWithDisplayName({policy, report, isAnonymous = false, size = CONS
     const subtitle = getChatRoomSubtitle(report, {isCreateExpenseFlow: true});
     const parentNavigationSubtitleData = getParentNavigationSubtitle(report);
     const isMoneyRequestOrReport = isMoneyRequestReport(report) || isMoneyRequest(report) || isTrackExpenseReport(report) || isInvoiceReport(report);
+    const isSingleTransactionView = isMoneyRequest(report) || isTrackExpenseReport(report);
     const icons = getIcons(report, personalDetails, null, '', -1, policy, invoiceReceiverPolicy);
     const ownerPersonalDetails = getPersonalDetailsForAccountIDs(report?.ownerAccountID ? [report.ownerAccountID] : [], personalDetails);
     const displayNamesWithTooltips = getDisplayNamesWithTooltips(Object.values(ownerPersonalDetails), false);
@@ -155,7 +156,18 @@ function AvatarWithDisplayName({policy, report, isAnonymous = false, size = CONS
                         </View>
                     </PressableWithoutFeedback>
                     <View style={[styles.flex1, styles.flexColumn]}>
-                        <CaretWrapper>
+                        {isSingleTransactionView ? (
+                            <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}
@@ -164,7 +176,7 @@ function AvatarWithDisplayName({policy, report, isAnonymous = false, size = CONS
                                 textStyles={[isAnonymous ? styles.headerAnonymousFooter : styles.headerText, styles.pre]}
                                 shouldUseFullTitle={isMoneyRequestOrReport || isAnonymous}
                             />
-                        </CaretWrapper>
+                        )}
                         {Object.keys(parentNavigationSubtitleData).length > 0 && (
                             <ParentNavigationSubtitle
                                 parentNavigationSubtitleData={parentNavigationSubtitleData}
diff --git a/src/components/MoneyReportHeader.tsx b/src/components/MoneyReportHeader.tsx
index 97ee16ff0015..ce1d09398860 100644
--- a/src/components/MoneyReportHeader.tsx
+++ b/src/components/MoneyReportHeader.tsx
@@ -3,21 +3,27 @@ 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 {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, exportToIntegration, markAsManuallyExported} from '@libs/actions/Report';
 import {convertToDisplayString} from '@libs/CurrencyUtils';
 import Navigation from '@libs/Navigation/Navigation';
 import {getConnectedIntegration} from '@libs/PolicyUtils';
-import {getOriginalMessage, isDeletedAction, isMoneyRequestAction, isTrackExpenseAction} from '@libs/ReportActionsUtils';
+import {getOriginalMessage, getReportAction, isDeletedAction, isMoneyRequestAction, isTrackExpenseAction} from '@libs/ReportActionsUtils';
+import getPrimaryAction from '@libs/ReportPrimaryActionUtils';
+import getSecondaryActions from '@libs/ReportSecondaryActionUtils';
 import {
     canBeExported,
     canDeleteTransaction,
+    changeMoneyRequestHoldStatus,
     getArchiveReason,
     getBankAccountRoute,
+    getIntegrationIcon,
     getMoneyRequestSpendBreakdown,
     getNonHeldAndFullAmount,
     getTransactionsWithReceipts,
@@ -31,6 +37,7 @@ import {
     isInvoiceReport,
     isReportApproved,
     navigateBackOnDeleteTransaction,
+    navigateToDetailsPage,
     reportTransactionsSelector,
 } from '@libs/ReportUtils';
 import {
@@ -49,6 +56,7 @@ import variables from '@styles/variables';
 import {
     approveMoneyRequest,
     canApproveIOU,
+    cancelPayment,
     canIOUBePaid as canIOUBePaidAction,
     canSubmitReport,
     deleteMoneyRequest,
@@ -56,6 +64,7 @@ import {
     payInvoice,
     payMoneyRequest,
     submitReport,
+    unapproveExpenseReport,
 } from '@userActions/IOU';
 import {markAsCash as markAsCashAction} from '@userActions/Transaction';
 import CONST from '@src/CONST';
@@ -70,6 +79,8 @@ 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 {DropdownOption} from './ButtonWithDropdownMenu/types';
 import ConfirmModal from './ConfirmModal';
 import DelegateNoAccessModal from './DelegateNoAccessModal';
 import HeaderWithBackButton from './HeaderWithBackButton';
@@ -82,7 +93,7 @@ import MoneyRequestHeaderStatusBar from './MoneyRequestHeaderStatusBar';
 import type {ActionHandledType} from './ProcessMoneyReportHoldMenu';
 import ProcessMoneyReportHoldMenu from './ProcessMoneyReportHoldMenu';
 import ExportWithDropdownMenu from './ReportActionItem/ExportWithDropdownMenu';
-import AnimatedSettlementButton from './SettlementButton/AnimatedSettlementButton';
+import SettlementButton from './SettlementButton';
 
 type MoneyReportHeaderProps = {
     /** The report currently being looked at */
@@ -119,7 +130,7 @@ function MoneyReportHeader({policy, report: moneyRequestReport, transactionThrea
         }
         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: [],
     });
@@ -127,10 +138,9 @@ function MoneyReportHeader({policy, report: moneyRequestReport, transactionThrea
     const [dismissedHoldUseExplanation, dismissedHoldUseExplanationResult] = useOnyx(ONYXKEYS.NVP_DISMISSED_HOLD_USE_EXPLANATION, {initialValue: true});
     const isLoadingHoldUseExplained = isLoadingOnyxValue(dismissedHoldUseExplanationResult);
 
-    const {isPaidAnimationRunning, isApprovedAnimationRunning, stopAnimation, startAnimation, startApprovedAnimation} = usePaymentAnimations();
+    const {isPaidAnimationRunning, isApprovedAnimationRunning, startAnimation, startApprovedAnimation} = usePaymentAnimations();
     const styles = useThemeStyles();
     const theme = useTheme();
-    const [isDeleteRequestModalVisible, setIsDeleteRequestModalVisible] = useState(false);
     const {translate} = useLocalize();
     const {isOffline} = useNetwork();
     const {reimbursableSpend} = getMoneyRequestSpendBreakdown(moneyRequestReport);
@@ -175,7 +185,6 @@ function MoneyReportHeader({policy, report: moneyRequestReport, transactionThrea
     );
 
     const canIOUBePaid = useMemo(() => getCanIOUBePaid(), [getCanIOUBePaid]);
-    const canIOUBePaidAndApproved = useMemo(() => getCanIOUBePaid(false, false), [getCanIOUBePaid]);
     const onlyShowPayElsewhere = useMemo(() => !canIOUBePaid && getCanIOUBePaid(true), [canIOUBePaid, getCanIOUBePaid]);
 
     const shouldShowMarkAsCashButton =
@@ -264,19 +273,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;
@@ -346,11 +342,6 @@ function MoneyReportHeader({policy, report: moneyRequestReport, transactionThrea
         [chatReport?.isOwnPolicyExpenseChat, policy?.harvesting?.enabled],
     );
 
-    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) {
@@ -359,19 +350,215 @@ function MoneyReportHeader({policy, report: moneyRequestReport, transactionThrea
         Navigation.navigate(ROUTES.PROCESS_MONEY_REQUEST_HOLD.getRoute(Navigation.getReportRHPActiveRoute()));
     }, [dismissedHoldUseExplanation, isLoadingHoldUseExplained, isOnHold]);
 
-    useEffect(() => {
-        if (canDeleteRequest) {
-            return;
+    const unholdAction = () => {
+        const parentReportAction = getReportAction(moneyRequestReport?.parentReportID, moneyRequestReport?.parentReportActionID);
+
+        const moneyRequestAction = transactionThreadReportID ? requestParentReportAction : parentReportAction;
+        if (!moneyRequestAction) {
+            throw new Error('boom');
         }
 
-        setIsDeleteRequestModalVisible(false);
-    }, [canDeleteRequest]);
+        changeMoneyRequestHoldStatus(moneyRequestAction);
+    };
+
+    if (!moneyRequestReport) {
+        return null;
+    }
+    if (!policy) {
+        return null;
+    }
+
+    const primaryAction = getPrimaryAction(moneyRequestReport, policy, transactions, violations);
+
+    const primaryActions = {
+        [CONST.REPORT.PRIMARY_ACTIONS.SUBMIT]: (
+            <Button
+                success={isWaitingForSubmissionFromCurrentUser}
+                text={translate('common.submit')}
+                style={[styles.mnw120, styles.pv2, styles.pr0]}
+                onPress={() => submitReport(moneyRequestReport)}
+                isDisabled={shouldDisableSubmitButton}
+            />
+        ),
+        [CONST.REPORT.PRIMARY_ACTIONS.APPROVE]: (
+            <Button
+                success
+                onPress={confirmApproval}
+                text="Approve"
+            />
+        ),
+        [CONST.REPORT.PRIMARY_ACTIONS.PAY]: (
+            <SettlementButton
+                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}
+            />
+        ),
+        [CONST.REPORT.PRIMARY_ACTIONS.EXPORT_TO_ACCOUNTING]: (
+            <Button
+                success
+                text={translate('workspace.common.exportIntegrationSelected', {connectionName: connectedIntegration})}
+                style={styles.p0}
+                onPress={() => {
+                    exportToIntegration(moneyRequestReport.reportID, connectedIntegration);
+                }}
+            />
+        ),
+        [CONST.REPORT.PRIMARY_ACTIONS.REMOVE_HOLD]: (
+            <Button
+                success
+                text="Unhold"
+                onPress={unholdAction}
+            />
+        ),
+        [CONST.REPORT.PRIMARY_ACTIONS.REVIEW_DUPLICATES]: (
+            <Button
+                success
+                text={translate('iou.reviewDuplicates')}
+                style={styles.p0}
+                onPress={() => {
+                    Navigation.navigate(ROUTES.TRANSACTION_DUPLICATE_REVIEW_PAGE.getRoute(transactionThreadReportID, Navigation.getReportRHPActiveRoute()));
+                }}
+            />
+        ),
+        [CONST.REPORT.PRIMARY_ACTIONS.MARK_AS_CASH]: (
+            <Button
+                success
+                text={translate('iou.markAsCash')}
+                style={[styles.pv2, styles.pr0]}
+                onPress={markAsCash}
+            />
+        ),
+    };
+
+    const secondaryActions = getSecondaryActions(moneyRequestReport, policy, transactions, violations);
+
+    const secondaryActionsImpl: 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 (isOffline) {
+                    return;
+                }
+
+                exportReportToCSV({reportID: moneyRequestReport.reportID, transactionIDList: transactionIDs}, () => {
+                    console.log('Ups');
+                });
+            },
+        },
+        [CONST.REPORT.SECONDARY_ACTIONS.SUBMIT]: {
+            value: CONST.REPORT.SECONDARY_ACTIONS.SUBMIT,
+            text: translate('common.submit'),
+            icon: Expensicons.Send,
+            onSelected: () => {
+                submitReport(moneyRequestReport);
+            },
+        },
+        [CONST.REPORT.SECONDARY_ACTIONS.APPROVE]: {
+            text: translate('iou.approve'),
+            icon: Expensicons.ThumbsUp,
+            value: CONST.REPORT.SECONDARY_ACTIONS.APPROVE,
+            onSelected: () => {
+                approveMoneyRequest(moneyRequestReport);
+            },
+        },
+        [CONST.REPORT.SECONDARY_ACTIONS.UNAPPROVE]: {
+            text: translate('iou.unapprove'),
+            icon: Expensicons.CircularArrowBackwards,
+            value: CONST.REPORT.SECONDARY_ACTIONS.UNAPPROVE,
+            onSelected: () => {
+                unapproveExpenseReport(moneyRequestReport);
+            },
+        },
+        [CONST.REPORT.SECONDARY_ACTIONS.CANCEL_PAYMENT]: {
+            text: translate('iou.cancelPayment'),
+            icon: Expensicons.Trashcan, // Todo change icon
+            value: CONST.REPORT.SECONDARY_ACTIONS.CANCEL_PAYMENT,
+            onSelected: () => {
+                if (!chatReport) {
+                    return;
+                }
+                cancelPayment(moneyRequestReport, chatReport);
+            },
+        },
+        [CONST.REPORT.SECONDARY_ACTIONS.EXPORT_TO_ACCOUNTING]: {
+            text: translate('workspace.common.exportIntegrationSelected', {connectionName: connectedIntegration}),
+            icon: getIntegrationIcon(connectedIntegration),
+            value: CONST.REPORT.SECONDARY_ACTIONS.EXPORT_TO_ACCOUNTING,
+            onSelected: () => {
+                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: () => {
+                markAsManuallyExported(moneyRequestReport.reportID, connectedIntegration);
+            },
+        },
+        [CONST.REPORT.SECONDARY_ACTIONS.HOLD]: {
+            text: translate('iou.hold'),
+            icon: Expensicons.Stopwatch,
+            value: CONST.REPORT.SECONDARY_ACTIONS.HOLD,
+            onSelected: () => {
+                const parentReportAction = getReportAction(moneyRequestReport?.parentReportID, moneyRequestReport?.parentReportActionID);
+
+                const moneyRequestAction = transactionThreadReportID ? requestParentReportAction : parentReportAction;
+                if (!moneyRequestAction) {
+                    throw new Error('boom');
+                }
+
+                changeMoneyRequestHoldStatus(moneyRequestAction);
+            },
+        },
+        [CONST.REPORT.SECONDARY_ACTIONS.CHANGE_WORKSPACE]: {
+            text: 'Change workspace',
+            icon: Expensicons.Buildings,
+            value: CONST.REPORT.SECONDARY_ACTIONS.CHANGE_WORKSPACE,
+            onSelected: () => {
+                console.log('To be implemented');
+            },
+        },
+        [CONST.REPORT.SECONDARY_ACTIONS.DELETE]: {
+            text: translate('common.delete'),
+            icon: Expensicons.Trashcan,
+            value: CONST.REPORT.SECONDARY_ACTIONS.DELETE,
+            onSelected: () => {
+                // deleteMoneyRequest();
+            },
+        },
+    };
+
+    const applicableSecondaryActions = secondaryActions.map((action) => secondaryActionsImpl[action]).filter((p) => !!p);
 
     return (
         <View style={[styles.pt0, styles.borderBottom]}>
             <HeaderWithBackButton
                 shouldShowReportAvatarWithDisplay
-                shouldEnableDetailPageNavigation
                 shouldShowPinButton={false}
                 report={moneyRequestReport}
                 policy={policy}
@@ -380,137 +567,18 @@ function MoneyReportHeader({policy, report: moneyRequestReport, transactionThrea
                 onBackButtonPress={onBackButtonPress}
                 shouldShowBorderBottom={false}
             >
-                {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>
-                )}
-                {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>
-                )}
-                {!!shouldShowExportIntegrationButton && !shouldUseNarrowLayout && (
-                    <View style={[styles.pv2]}>
-                        <ExportWithDropdownMenu
-                            policy={policy}
-                            report={moneyRequestReport}
-                            connectionName={connectedIntegration}
-                        />
-                    </View>
-                )}
-                {!!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>
-                )}
-                {shouldShowMarkAsCashButton && !shouldUseNarrowLayout && (
-                    <View style={[styles.pv2]}>
-                        <Button
-                            success
-                            text={translate('iou.markAsCash')}
-                            style={[styles.pv2, styles.pr0]}
-                            onPress={markAsCash}
-                        />
-                    </View>
-                )}
+                {!!primaryAction && primaryActions[primaryAction]}
+                <ButtonWithDropdownMenu
+                    success={false}
+                    onPress={() => {}}
+                    shouldAlwaysShowDropdownMenu
+                    customText="More"
+                    options={applicableSecondaryActions}
+                    isSplitButton={false}
+                />
             </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]}>
-                        {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()));
-                                }}
-                            />
-                        )}
-                        {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}
-                            />
-                        )}
-                        {!!shouldShowExportIntegrationButton && shouldUseNarrowLayout && (
-                            <ExportWithDropdownMenu
-                                policy={policy}
-                                report={moneyRequestReport}
-                                connectionName={connectedIntegration}
-                            />
-                        )}
-                        {!!moneyRequestReport && shouldShowSubmitButton && shouldUseNarrowLayout && (
-                            <Button
-                                success={isWaitingForSubmissionFromCurrentUser}
-                                text={translate('common.submit')}
-                                style={[styles.flex1, styles.pr0]}
-                                onPress={() => submitReport(moneyRequestReport)}
-                                isDisabled={shouldDisableSubmitButton}
-                            />
-                        )}
-                        {shouldShowMarkAsCashButton && shouldUseNarrowLayout && (
-                            <Button
-                                success
-                                text={translate('iou.markAsCash')}
-                                style={[styles.flex1, styles.pr0]}
-                                onPress={markAsCash}
-                            />
-                        )}
-                    </View>
                     {shouldShowNextStep && <MoneyReportHeaderStatusBar nextStep={nextStep} />}
                     {!!statusBarProps && (
                         <MoneyRequestHeaderStatusBar
@@ -545,19 +613,6 @@ function MoneyReportHeader({policy, report: moneyRequestReport, transactionThrea
                 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
-            />
         </View>
     );
 }
diff --git a/src/languages/en.ts b/src/languages/en.ts
index 127de853ce29..ea3a55bb87fe 100755
--- a/src/languages/en.ts
+++ b/src/languages/en.ts
@@ -2702,7 +2702,7 @@ const translations = {
             defaultDescription: 'One place for all your receipts and expenses.',
             welcomeNote: 'Please use Expensify to submit your receipts for reimbursement, thanks!',
             subscription: 'Subscription',
-            markAsExported: '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 ba838537a2a7..59a15135f536 100644
--- a/src/languages/es.ts
+++ b/src/languages/es.ts
@@ -2725,7 +2725,7 @@ const translations = {
             defaultDescription: 'Un solo lugar para todos tus recibos y gastos.',
             welcomeNote: `Por favor, utiliza Expensify para enviar tus recibos para reembolso, ¡gracias!`,
             subscription: 'Suscripción',
-            markAsExported: 'Marcar como introducido manualmente',
+            markAsExported: 'Marcar como introducido manualmente', // TODO chagne
             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 11a907e4269d..b77ff49b3af9 100644
--- a/src/libs/PolicyUtils.ts
+++ b/src/libs/PolicyUtils.ts
@@ -1368,19 +1368,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?.netsuiteQuickStart?.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,
     canEnablePreventSelfApprovals,
@@ -1521,7 +1508,6 @@ export {
     getDescriptionForPolicyDomainCard,
     getManagerAccountID,
     isPrefferedExporter,
-    isAutoSyncEnabled,
 };
 
 export type {MemberEmailsToAccountIDs};
diff --git a/src/libs/ReportPrimaryActionUtils.ts b/src/libs/ReportPrimaryActionUtils.ts
index fb42a1b1689f..d83a401d1847 100644
--- a/src/libs/ReportPrimaryActionUtils.ts
+++ b/src/libs/ReportPrimaryActionUtils.ts
@@ -4,7 +4,7 @@ import CONST from '@src/CONST';
 import type {Policy, Report, Transaction, TransactionViolation} from '@src/types/onyx';
 import {isApprover as isApprovedMember} from './actions/Policy/Member';
 import {getCurrentUserAccountID} from './actions/Report';
-import {arePaymentsEnabled, getCorrectedAutoReportingFrequency, hasAccountingConnections, isAutoSyncEnabled, isPrefferedExporter} from './PolicyUtils';
+import {arePaymentsEnabled, getConnectedIntegration, getCorrectedAutoReportingFrequency, hasAccountingConnections, hasIntegrationAutoSync, isPrefferedExporter} from './PolicyUtils';
 import {
     isClosedReport,
     isCurrentUserSubmitter,
@@ -85,7 +85,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;
     }
diff --git a/src/libs/ReportSecondaryActionUtils.ts b/src/libs/ReportSecondaryActionUtils.ts
index aaa15749b839..1dc355a91d7f 100644
--- a/src/libs/ReportSecondaryActionUtils.ts
+++ b/src/libs/ReportSecondaryActionUtils.ts
@@ -5,7 +5,15 @@ import CONST from '@src/CONST';
 import type {Policy, Report, ReportAction, Transaction, TransactionViolation} from '@src/types/onyx';
 import {isApprover as isApprovedMember} from './actions/Policy/Member';
 import {getCurrentUserAccountID} from './actions/Report';
-import {arePaymentsEnabled, getCorrectedAutoReportingFrequency, hasAccountingConnections, hasNoPolicyOtherThanPersonalType, isAutoSyncEnabled, isPrefferedExporter} from './PolicyUtils';
+import {
+    arePaymentsEnabled,
+    getConnectedIntegration,
+    getCorrectedAutoReportingFrequency,
+    hasAccountingConnections,
+    hasIntegrationAutoSync,
+    hasNoPolicyOtherThanPersonalType,
+    isPrefferedExporter,
+} from './PolicyUtils';
 import {getIOUActionForReportID, getReportActions, isPayAction} from './ReportActionsUtils';
 import {
     isClosedReport,
@@ -149,7 +157,8 @@ function isExportAction(report: Report, policy: Policy): boolean {
 
     const isAdmin = policy?.role === CONST.POLICY.ROLE.ADMIN;
     const isReimbursed = report.statusNum === CONST.REPORT.STATUS_NUM.REIMBURSED;
-    const syncEnabled = isAutoSyncEnabled(policy);
+    const connectedIntegration = getConnectedIntegration(policy);
+    const syncEnabled = hasIntegrationAutoSync(policy, connectedIntegration);
     const isReportExported = isExported(getReportActions(report));
     const isFinished = isApproved || isReimbursed || isClosed;
 
@@ -183,7 +192,8 @@ function isMarkAsExportedAction(report: Report, policy: Policy): boolean {
     const isAdmin = policy?.role === CONST.POLICY.ROLE.ADMIN;
     const isReimbursed = isSettled(report);
     const hasAccountingConnection = hasAccountingConnections(policy);
-    const syncEnabled = isAutoSyncEnabled(policy);
+    const connectedIntegration = getConnectedIntegration(policy);
+    const syncEnabled = hasIntegrationAutoSync(policy, connectedIntegration);
     const isFinished = isClosedOrApproved || isReimbursed;
 
     if (isAdmin && isFinished && hasAccountingConnection && syncEnabled) {
@@ -294,15 +304,13 @@ function isDeleteAction(report: Report): boolean {
     return isOpen || isProcessing || isApproved;
 }
 
-function getSecondaryAction(
+function getSecondaryActions(
     report: Report,
     policy: Policy,
     reportTransactions: Transaction[],
     violations: OnyxCollection<TransactionViolation[]>,
 ): 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);
@@ -332,10 +340,14 @@ function getSecondaryAction(
         options.push(CONST.REPORT.SECONDARY_ACTIONS.HOLD);
     }
 
+    options.push(CONST.REPORT.SECONDARY_ACTIONS.DOWNLOAD);
+
     if (isChangeWorkspaceAction(report, policy, reportTransactions, violations)) {
         options.push(CONST.REPORT.SECONDARY_ACTIONS.CHANGE_WORKSPACE);
     }
 
+    options.push(CONST.REPORT.SECONDARY_ACTIONS.VIEW_DETAILS);
+
     if (isDeleteAction(report)) {
         options.push(CONST.REPORT.SECONDARY_ACTIONS.DELETE);
     }
@@ -343,4 +355,4 @@ function getSecondaryAction(
     return options;
 }
 
-export default getSecondaryAction;
+export default getSecondaryActions;
diff --git a/tests/unit/ReportSecondaryActionUtilsTest.ts b/tests/unit/ReportSecondaryActionUtilsTest.ts
index 560a6003e6b7..682109465b17 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 getSecondaryActions from '@libs/ReportSecondaryActionUtils';
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
 import type {Policy, Report, ReportAction, Transaction, TransactionViolation} from '@src/types/onyx';
@@ -36,10 +36,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(getSecondaryActions(report, policy, [], {})).toEqual(result);
     });
 
     it('includes SUBMIT option', async () => {
@@ -58,7 +57,7 @@ describe('getSecondaryAction', () => {
         } as unknown as Policy;
         await Onyx.merge(`${ONYXKEYS.COLLECTION.REPORT}${REPORT_ID}`, report);
 
-        const result = getSecondaryAction(report, policy, [], {});
+        const result = getSecondaryActions(report, policy, [], {});
         expect(result.includes(CONST.REPORT.SECONDARY_ACTIONS.SUBMIT)).toBe(true);
     });
 
@@ -88,7 +87,7 @@ describe('getSecondaryAction', () => {
 
         await Onyx.merge(`${ONYXKEYS.COLLECTION.REPORT}${REPORT_ID}`, report);
 
-        const result = getSecondaryAction(report, policy, [transaction], {});
+        const result = getSecondaryActions(report, policy, [transaction], {});
         expect(result.includes(CONST.REPORT.SECONDARY_ACTIONS.APPROVE)).toBe(true);
     });
 
@@ -113,7 +112,7 @@ describe('getSecondaryAction', () => {
             },
         } as unknown as TransactionViolation;
 
-        const result = getSecondaryAction(report, policy, [transaction], {[`${ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS}${TRANSACTION_ID}`]: [violation]});
+        const result = getSecondaryActions(report, policy, [transaction], {[`${ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS}${TRANSACTION_ID}`]: [violation]});
         expect(result.includes(CONST.REPORT.SECONDARY_ACTIONS.APPROVE)).toBe(true);
     });
 
@@ -139,7 +138,7 @@ describe('getSecondaryAction', () => {
             },
         } as unknown as TransactionViolation;
 
-        const result = getSecondaryAction(report, policy, [transaction], {[`${ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS}${TRANSACTION_ID}`]: [violation]});
+        const result = getSecondaryActions(report, policy, [transaction], {[`${ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS}${TRANSACTION_ID}`]: [violation]});
         expect(result.includes(CONST.REPORT.SECONDARY_ACTIONS.APPROVE)).toBe(true);
     });
 
@@ -153,7 +152,7 @@ describe('getSecondaryAction', () => {
         } as unknown as Report;
         const policy = {approver: CURRENT_USER_EMAIL} as unknown as Policy;
 
-        const result = getSecondaryAction(report, policy, [], {});
+        const result = getSecondaryActions(report, policy, [], {});
         expect(result.includes(CONST.REPORT.SECONDARY_ACTIONS.UNAPPROVE)).toBe(true);
     });
 
@@ -167,7 +166,7 @@ describe('getSecondaryAction', () => {
         } as unknown as Report;
         const policy = {} as unknown as Policy;
 
-        const result = getSecondaryAction(report, policy, [], {});
+        const result = getSecondaryActions(report, policy, [], {});
         expect(result.includes(CONST.REPORT.SECONDARY_ACTIONS.CANCEL_PAYMENT)).toBe(true);
     });
 
@@ -194,7 +193,7 @@ describe('getSecondaryAction', () => {
         } as unknown as ReportAction;
         await Onyx.merge(`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${REPORT_ID}`, {[ACTION_ID]: reportAction});
 
-        const result = getSecondaryAction(
+        const result = getSecondaryActions(
             report,
             policy,
             [
@@ -216,7 +215,7 @@ describe('getSecondaryAction', () => {
         const policy = {} as unknown as Policy;
         await Onyx.merge(`${ONYXKEYS.COLLECTION.REPORT}${REPORT_ID}`, report);
 
-        const result = getSecondaryAction(report, policy, [], {});
+        const result = getSecondaryActions(report, policy, [], {});
         expect(result.includes(CONST.REPORT.SECONDARY_ACTIONS.EXPORT_TO_ACCOUNTING)).toBe(true);
     });
 
@@ -234,7 +233,7 @@ describe('getSecondaryAction', () => {
             connections: {[CONST.POLICY.CONNECTIONS.NAME.QBD]: {}},
         } as unknown as Policy;
 
-        const result = getSecondaryAction(report, policy, [], {});
+        const result = getSecondaryActions(report, policy, [], {});
         expect(result.includes(CONST.REPORT.SECONDARY_ACTIONS.EXPORT_TO_ACCOUNTING)).toBe(true);
     });
 
@@ -251,7 +250,7 @@ describe('getSecondaryAction', () => {
             connections: {[CONST.POLICY.CONNECTIONS.NAME.QBD]: {config: {autosync: {enabled: true}}}},
         } as unknown as Policy;
 
-        const result = getSecondaryAction(report, policy, [], {});
+        const result = getSecondaryActions(report, policy, [], {});
         expect(result.includes(CONST.REPORT.SECONDARY_ACTIONS.EXPORT_TO_ACCOUNTING)).toBe(true);
     });
 
@@ -264,7 +263,7 @@ describe('getSecondaryAction', () => {
         const policy = {} as unknown as Policy;
         await Onyx.merge(`${ONYXKEYS.COLLECTION.REPORT}${REPORT_ID}`, report);
 
-        const result = getSecondaryAction(report, policy, [], {});
+        const result = getSecondaryActions(report, policy, [], {});
         expect(result.includes(CONST.REPORT.SECONDARY_ACTIONS.MARK_AS_EXPORTED)).toBe(true);
     });
 
@@ -281,7 +280,7 @@ describe('getSecondaryAction', () => {
             reimbursementChoice: CONST.POLICY.REIMBURSEMENT_CHOICES.REIMBURSEMENT_YES,
         } as unknown as Policy;
 
-        const result = getSecondaryAction(report, policy, [], {});
+        const result = getSecondaryActions(report, policy, [], {});
         expect(result.includes(CONST.REPORT.SECONDARY_ACTIONS.MARK_AS_EXPORTED)).toBe(true);
     });
 
@@ -298,7 +297,7 @@ describe('getSecondaryAction', () => {
             connections: {[CONST.POLICY.CONNECTIONS.NAME.QBD]: {config: {autosync: {enabled: true}}}},
         } as unknown as Policy;
 
-        const result = getSecondaryAction(report, policy, [], {});
+        const result = getSecondaryActions(report, policy, [], {});
         expect(result.includes(CONST.REPORT.SECONDARY_ACTIONS.MARK_AS_EXPORTED)).toBe(true);
     });
 
@@ -314,7 +313,7 @@ describe('getSecondaryAction', () => {
             connections: {[CONST.POLICY.CONNECTIONS.NAME.QBD]: {config: {export: {exporter: CURRENT_USER_EMAIL}}}},
         } as unknown as Policy;
 
-        const result = getSecondaryAction(report, policy, [], {});
+        const result = getSecondaryActions(report, policy, [], {});
         expect(result.includes(CONST.REPORT.SECONDARY_ACTIONS.MARK_AS_EXPORTED)).toBe(true);
     });
 
@@ -328,7 +327,7 @@ describe('getSecondaryAction', () => {
         } as unknown as Report;
         const policy = {} as unknown as Policy;
 
-        const result = getSecondaryAction(report, policy, [], {});
+        const result = getSecondaryActions(report, policy, [], {});
         expect(result.includes(CONST.REPORT.SECONDARY_ACTIONS.HOLD)).toBe(true);
     });
 
@@ -344,7 +343,7 @@ describe('getSecondaryAction', () => {
         } as unknown as Policy;
         await Onyx.merge(`${ONYXKEYS.COLLECTION.REPORT}${REPORT_ID}`, report);
 
-        const result = getSecondaryAction(report, policy, [], {});
+        const result = getSecondaryActions(report, policy, [], {});
         expect(result.includes(CONST.REPORT.SECONDARY_ACTIONS.CHANGE_WORKSPACE)).toBe(true);
     });
 
@@ -359,7 +358,7 @@ describe('getSecondaryAction', () => {
         const policy = {} as unknown as Policy;
         await Onyx.merge(`${ONYXKEYS.COLLECTION.REPORT}${REPORT_ID}`, report);
 
-        const result = getSecondaryAction(report, policy, [], {});
+        const result = getSecondaryActions(report, policy, [], {});
         expect(result.includes(CONST.REPORT.SECONDARY_ACTIONS.CHANGE_WORKSPACE)).toBe(true);
     });
 
@@ -375,7 +374,7 @@ describe('getSecondaryAction', () => {
             approver: CURRENT_USER_EMAIL,
         } as unknown as Policy;
 
-        const result = getSecondaryAction(report, policy, [], {});
+        const result = getSecondaryActions(report, policy, [], {});
         expect(result.includes(CONST.REPORT.SECONDARY_ACTIONS.CHANGE_WORKSPACE)).toBe(true);
     });
 
@@ -391,7 +390,7 @@ describe('getSecondaryAction', () => {
             role: CONST.POLICY.ROLE.ADMIN,
         } as unknown as Policy;
 
-        const result = getSecondaryAction(report, policy, [], {});
+        const result = getSecondaryActions(report, policy, [], {});
         expect(result.includes(CONST.REPORT.SECONDARY_ACTIONS.CHANGE_WORKSPACE)).toBe(true);
     });
 
@@ -406,7 +405,7 @@ describe('getSecondaryAction', () => {
             role: CONST.POLICY.ROLE.ADMIN,
         } as unknown as Policy;
 
-        const result = getSecondaryAction(report, policy, [], {});
+        const result = getSecondaryActions(report, policy, [], {});
         expect(result.includes(CONST.REPORT.SECONDARY_ACTIONS.CHANGE_WORKSPACE)).toBe(true);
     });
 
@@ -424,7 +423,7 @@ describe('getSecondaryAction', () => {
         } as unknown as Policy;
         await Onyx.merge(`${ONYXKEYS.COLLECTION.POLICY}${POLICY_ID}`, policy);
 
-        const result = getSecondaryAction(report, {} as Policy, [], {});
+        const result = getSecondaryActions(report, {} as Policy, [], {});
         expect(result.includes(CONST.REPORT.SECONDARY_ACTIONS.CHANGE_WORKSPACE)).toBe(true);
     });
 
@@ -439,7 +438,7 @@ describe('getSecondaryAction', () => {
         const policy = {} as unknown as Policy;
         await Onyx.merge(`${ONYXKEYS.COLLECTION.REPORT}${REPORT_ID}`, report);
 
-        const result = getSecondaryAction(report, policy, [], {});
+        const result = getSecondaryActions(report, policy, [], {});
         expect(result.includes(CONST.REPORT.SECONDARY_ACTIONS.DELETE)).toBe(true);
     });
 });

From 659a350b496586fff72e2f30904e905a052b2868 Mon Sep 17 00:00:00 2001
From: Jan Nowakowski <janeknowakowski9@gmail.com>
Date: Mon, 10 Mar 2025 17:49:18 +0100
Subject: [PATCH 02/54] Correct display

---
 src/components/MoneyReportHeader.tsx | 42 +++++++++++++++++++++-------
 1 file changed, 32 insertions(+), 10 deletions(-)

diff --git a/src/components/MoneyReportHeader.tsx b/src/components/MoneyReportHeader.tsx
index fad1b88039d0..b0ccdc801a18 100644
--- a/src/components/MoneyReportHeader.tsx
+++ b/src/components/MoneyReportHeader.tsx
@@ -3,7 +3,7 @@ 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 {ValueOf} from 'type-fest';
+import type {ValueOf} from 'type-fest';
 import useLocalize from '@hooks/useLocalize';
 import useNetwork from '@hooks/useNetwork';
 import usePaymentAnimations from '@hooks/usePaymentAnimations';
@@ -571,16 +571,38 @@ function MoneyReportHeader({policy, report: moneyRequestReport, transactionThrea
                 onBackButtonPress={onBackButtonPress}
                 shouldShowBorderBottom={false}
             >
-                {!!primaryAction && primaryActions[primaryAction]}
-                <ButtonWithDropdownMenu
-                    success={false}
-                    onPress={() => {}}
-                    shouldAlwaysShowDropdownMenu
-                    customText="More"
-                    options={applicableSecondaryActions}
-                    isSplitButton={false}
-                />
+                {!shouldUseNarrowLayout && (
+                    <View style={[styles.flexRow, styles.gap2]}>
+                        {!!primaryAction && primaryActions[primaryAction]}
+                        {!!secondaryActions.length && (
+                            <ButtonWithDropdownMenu
+                                success={false}
+                                onPress={() => {}}
+                                shouldAlwaysShowDropdownMenu
+                                customText="More"
+                                options={applicableSecondaryActions}
+                                isSplitButton={false}
+                            />
+                        )}
+                    </View>
+                )}
             </HeaderWithBackButton>
+            {shouldUseNarrowLayout && (
+                <View style={[styles.flexRow, styles.gap2, styles.pb3, styles.ph5, styles.w100, styles.alignItemsCenter, styles.justifyContentCenter]}>
+                    <View style={[styles.flexGrow4]}>{!!primaryAction && primaryActions[primaryAction]}</View>
+                    {!!secondaryActions.length && (
+                        <ButtonWithDropdownMenu
+                            success={false}
+                            onPress={() => {}}
+                            shouldAlwaysShowDropdownMenu
+                            customText="More"
+                            options={applicableSecondaryActions}
+                            isSplitButton={false}
+                            wrapperStyle={[!primaryAction && styles.flexGrow4]}
+                        />
+                    )}
+                </View>
+            )}
             {!!isMoreContentShown && (
                 <View style={[styles.dFlex, styles.flexColumn, shouldAddGapToContents && styles.gap3, styles.pb3, styles.ph5]}>
                     {shouldShowNextStep && <MoneyReportHeaderStatusBar nextStep={optimisticNextStep} />}

From bb6abafe4cf3c16b5ec30ca2fc7397957d5eb72f Mon Sep 17 00:00:00 2001
From: Jan Nowakowski <janeknowakowski9@gmail.com>
Date: Tue, 11 Mar 2025 16:50:37 +0100
Subject: [PATCH 03/54] Remove options from details page and add actions to
 report header

---
 src/components/MoneyReportHeader.tsx | 173 ++++++++++---------------
 src/languages/es.ts                  |   2 +-
 src/pages/ReportDetailsPage.tsx      | 180 +--------------------------
 3 files changed, 73 insertions(+), 282 deletions(-)

diff --git a/src/components/MoneyReportHeader.tsx b/src/components/MoneyReportHeader.tsx
index b0ccdc801a18..1d720c295aa0 100644
--- a/src/components/MoneyReportHeader.tsx
+++ b/src/components/MoneyReportHeader.tsx
@@ -1,5 +1,5 @@
 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';
@@ -15,12 +15,10 @@ import {convertToDisplayString} from '@libs/CurrencyUtils';
 import Navigation from '@libs/Navigation/Navigation';
 import {buildOptimisticNextStepForPreventSelfApprovalsEnabled} from '@libs/NextStepUtils';
 import {getConnectedIntegration} from '@libs/PolicyUtils';
-import {getOriginalMessage, getReportAction, isDeletedAction, isMoneyRequestAction, isTrackExpenseAction} from '@libs/ReportActionsUtils';
+import {getOriginalMessage, getReportAction, isMoneyRequestAction} from '@libs/ReportActionsUtils';
 import getPrimaryAction from '@libs/ReportPrimaryActionUtils';
 import getSecondaryActions from '@libs/ReportSecondaryActionUtils';
 import {
-    canBeExported,
-    canDeleteTransaction,
     changeMoneyRequestHoldStatus,
     getArchiveReason,
     getBankAccountRoute,
@@ -32,45 +30,26 @@ import {
     hasOnlyHeldExpenses as hasOnlyHeldExpensesReportUtils,
     hasUpdatedTotal,
     isAllowedToApproveExpenseReport,
-    isAllowedToSubmitDraftExpenseReport,
     isArchivedReportWithID,
     isInvoiceReport,
-    isReportApproved,
-    navigateBackOnDeleteTransaction,
     navigateToDetailsPage,
     reportTransactionsSelector,
 } from '@libs/ReportUtils';
 import {
     allHavePendingRTERViolation,
-    checkIfShouldShowMarkAsCashButton,
-    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,
-    payInvoice,
-    payMoneyRequest,
-    submitReport,
-    unapproveExpenseReport,
-} from '@userActions/IOU';
+import {approveMoneyRequest, canApproveIOU, cancelPayment, canIOUBePaid as canIOUBePaidAction, payInvoice, payMoneyRequest, submitReport, unapproveExpenseReport} 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';
@@ -80,8 +59,9 @@ import isLoadingOnyxValue from '@src/types/utils/isLoadingOnyxValue';
 import BrokenConnectionDescription from './BrokenConnectionDescription';
 import Button from './Button';
 import ButtonWithDropdownMenu from './ButtonWithDropdownMenu';
-import {DropdownOption} from './ButtonWithDropdownMenu/types';
+import type {DropdownOption} from './ButtonWithDropdownMenu/types';
 import ConfirmModal from './ConfirmModal';
+import DecisionModal from './DecisionModal';
 import DelegateNoAccessModal from './DelegateNoAccessModal';
 import HeaderWithBackButton from './HeaderWithBackButton';
 import Icon from './Icon';
@@ -91,7 +71,6 @@ import type {MoneyRequestHeaderStatusBarProps} from './MoneyRequestHeaderStatusB
 import MoneyRequestHeaderStatusBar from './MoneyRequestHeaderStatusBar';
 import type {ActionHandledType} from './ProcessMoneyReportHoldMenu';
 import ProcessMoneyReportHoldMenu from './ProcessMoneyReportHoldMenu';
-import ExportWithDropdownMenu from './ReportActionItem/ExportWithDropdownMenu';
 import SettlementButton from './SettlementButton';
 
 type MoneyReportHeaderProps = {
@@ -122,7 +101,6 @@ 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;
@@ -137,6 +115,9 @@ function MoneyReportHeader({policy, report: moneyRequestReport, transactionThrea
     const [dismissedHoldUseExplanation, dismissedHoldUseExplanationResult] = useOnyx(ONYXKEYS.NVP_DISMISSED_HOLD_USE_EXPLANATION, {initialValue: true});
     const isLoadingHoldUseExplained = isLoadingOnyxValue(dismissedHoldUseExplanationResult);
 
+    const [downloadErrorModalVisible, setDownloadErrorModalVisible] = useState(false);
+    const [isCancelPaymentModalVisible, setIsCancelPaymentModalVisible] = useState(false);
+
     const {isPaidAnimationRunning, isApprovedAnimationRunning, startAnimation, startApprovedAnimation} = usePaymentAnimations();
     const styles = useThemeStyles();
     const theme = useTheme();
@@ -144,20 +125,13 @@ function MoneyReportHeader({policy, report: moneyRequestReport, transactionThrea
     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));
@@ -186,9 +160,6 @@ function MoneyReportHeader({policy, report: moneyRequestReport, transactionThrea
     const canIOUBePaid = useMemo(() => getCanIOUBePaid(), [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(
@@ -198,21 +169,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 =
-        !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 shouldShowStatusBar =
         hasAllPendingRTERViolations || shouldShowBrokenConnectionViolation || hasOnlyHeldExpenses || hasScanningReceipt || isPayAtEndExpense || hasOnlyPendingTransactions;
@@ -223,20 +179,13 @@ function MoneyReportHeader({policy, report: moneyRequestReport, transactionThrea
     const optimisticNextStep = policy?.preventSelfApproval ? buildOptimisticNextStepForPreventSelfApprovalsEnabled() : nextStep;
 
     const shouldShowNextStep = transactions?.length !== 0 && isFromPaidPolicy && !!optimisticNextStep?.message?.length && !shouldShowStatusBar;
-    const shouldShowAnyButton =
-        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 isMoreContentShown = shouldShowNextStep || shouldShowStatusBar || shouldUseNarrowLayout;
     const {isDelegateAccessRestricted} = useDelegateUserDetails();
     const [isNoDelegateAccessMenuVisible, setIsNoDelegateAccessMenuVisible] = useState(false);
 
@@ -335,16 +284,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 submitter and the policy does not have Scheduled Submit turned on
-    const isWaitingForSubmissionFromCurrentUser = useMemo(
-        () => chatReport?.isOwnPolicyExpenseChat && !policy?.harvesting?.enabled,
-        [chatReport?.isOwnPolicyExpenseChat, policy?.harvesting?.enabled],
-    );
+    const shouldAddGapToContents = shouldUseNarrowLayout && (!!statusBarProps || shouldShowNextStep);
 
     useEffect(() => {
         // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
@@ -354,17 +294,6 @@ function MoneyReportHeader({policy, report: moneyRequestReport, transactionThrea
         Navigation.navigate(ROUTES.PROCESS_MONEY_REQUEST_HOLD.getRoute(Navigation.getReportRHPActiveRoute()));
     }, [dismissedHoldUseExplanation, isLoadingHoldUseExplained, isOnHold]);
 
-    const unholdAction = () => {
-        const parentReportAction = getReportAction(moneyRequestReport?.parentReportID, moneyRequestReport?.parentReportActionID);
-
-        const moneyRequestAction = transactionThreadReportID ? requestParentReportAction : parentReportAction;
-        if (!moneyRequestAction) {
-            throw new Error('boom');
-        }
-
-        changeMoneyRequestHoldStatus(moneyRequestAction);
-    };
-
     if (!moneyRequestReport) {
         return null;
     }
@@ -377,18 +306,16 @@ function MoneyReportHeader({policy, report: moneyRequestReport, transactionThrea
     const primaryActions = {
         [CONST.REPORT.PRIMARY_ACTIONS.SUBMIT]: (
             <Button
-                success={isWaitingForSubmissionFromCurrentUser}
+                success
                 text={translate('common.submit')}
-                style={[styles.mnw120, styles.pv2, styles.pr0]}
                 onPress={() => submitReport(moneyRequestReport)}
-                isDisabled={shouldDisableSubmitButton}
             />
         ),
         [CONST.REPORT.PRIMARY_ACTIONS.APPROVE]: (
             <Button
                 success
                 onPress={confirmApproval}
-                text="Approve"
+                text={translate('iou.approve')}
             />
         ),
         [CONST.REPORT.PRIMARY_ACTIONS.PAY]: (
@@ -405,7 +332,6 @@ function MoneyReportHeader({policy, report: moneyRequestReport, transactionThrea
                 shouldHidePaymentOptions={!shouldShowPayButton}
                 shouldShowApproveButton={shouldShowApproveButton}
                 shouldDisableApproveButton={shouldDisableApproveButton}
-                style={[styles.pv2]}
                 formattedAmount={!hasOnlyHeldExpenses ? displayedAmount : ''}
                 isDisabled={isOffline && !canAllowSettlement}
                 isLoading={!isOffline && !canAllowSettlement}
@@ -414,9 +340,12 @@ function MoneyReportHeader({policy, report: moneyRequestReport, transactionThrea
         [CONST.REPORT.PRIMARY_ACTIONS.EXPORT_TO_ACCOUNTING]: (
             <Button
                 success
-                text={translate('workspace.common.exportIntegrationSelected', {connectionName: connectedIntegration})}
-                style={styles.p0}
+                // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+                text={translate('workspace.common.exportIntegrationSelected', {connectionName: connectedIntegration!})}
                 onPress={() => {
+                    if (!connectedIntegration) {
+                        return;
+                    }
                     exportToIntegration(moneyRequestReport.reportID, connectedIntegration);
                 }}
             />
@@ -425,14 +354,22 @@ function MoneyReportHeader({policy, report: moneyRequestReport, transactionThrea
             <Button
                 success
                 text="Unhold"
-                onPress={unholdAction}
+                onPress={() => {
+                    const parentReportAction = getReportAction(moneyRequestReport?.parentReportID, moneyRequestReport?.parentReportActionID);
+
+                    const moneyRequestAction = transactionThreadReportID ? requestParentReportAction : parentReportAction;
+                    if (!moneyRequestAction) {
+                        return;
+                    }
+
+                    changeMoneyRequestHoldStatus(moneyRequestAction);
+                }}
             />
         ),
         [CONST.REPORT.PRIMARY_ACTIONS.REVIEW_DUPLICATES]: (
             <Button
                 success
                 text={translate('iou.reviewDuplicates')}
-                style={styles.p0}
                 onPress={() => {
                     Navigation.navigate(ROUTES.TRANSACTION_DUPLICATE_REVIEW_PAGE.getRoute(transactionThreadReportID, Navigation.getReportRHPActiveRoute()));
                 }}
@@ -442,7 +379,6 @@ function MoneyReportHeader({policy, report: moneyRequestReport, transactionThrea
             <Button
                 success
                 text={translate('iou.markAsCash')}
-                style={[styles.pv2, styles.pr0]}
                 onPress={markAsCash}
             />
         ),
@@ -469,7 +405,7 @@ function MoneyReportHeader({policy, report: moneyRequestReport, transactionThrea
                 }
 
                 exportReportToCSV({reportID: moneyRequestReport.reportID, transactionIDList: transactionIDs}, () => {
-                    console.log('Ups');
+                    setDownloadErrorModalVisible(true);
                 });
             },
         },
@@ -499,20 +435,21 @@ function MoneyReportHeader({policy, report: moneyRequestReport, transactionThrea
         },
         [CONST.REPORT.SECONDARY_ACTIONS.CANCEL_PAYMENT]: {
             text: translate('iou.cancelPayment'),
-            icon: Expensicons.Trashcan, // Todo change icon
+            icon: Expensicons.Clear,
             value: CONST.REPORT.SECONDARY_ACTIONS.CANCEL_PAYMENT,
             onSelected: () => {
-                if (!chatReport) {
-                    return;
-                }
-                cancelPayment(moneyRequestReport, chatReport);
+                setIsCancelPaymentModalVisible(true);
             },
         },
         [CONST.REPORT.SECONDARY_ACTIONS.EXPORT_TO_ACCOUNTING]: {
-            text: translate('workspace.common.exportIntegrationSelected', {connectionName: connectedIntegration}),
+            // 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) {
+                    return;
+                }
                 exportToIntegration(moneyRequestReport.reportID, connectedIntegration);
             },
         },
@@ -521,6 +458,9 @@ function MoneyReportHeader({policy, report: moneyRequestReport, transactionThrea
             icon: Expensicons.CheckCircle,
             value: CONST.REPORT.SECONDARY_ACTIONS.MARK_AS_EXPORTED,
             onSelected: () => {
+                if (!connectedIntegration) {
+                    return;
+                }
                 markAsManuallyExported(moneyRequestReport.reportID, connectedIntegration);
             },
         },
@@ -533,7 +473,7 @@ function MoneyReportHeader({policy, report: moneyRequestReport, transactionThrea
 
                 const moneyRequestAction = transactionThreadReportID ? requestParentReportAction : parentReportAction;
                 if (!moneyRequestAction) {
-                    throw new Error('boom');
+                    return;
                 }
 
                 changeMoneyRequestHoldStatus(moneyRequestAction);
@@ -544,7 +484,7 @@ function MoneyReportHeader({policy, report: moneyRequestReport, transactionThrea
             icon: Expensicons.Buildings,
             value: CONST.REPORT.SECONDARY_ACTIONS.CHANGE_WORKSPACE,
             onSelected: () => {
-                console.log('To be implemented');
+                // TODO waiting for https://github.com/Expensify/App/pull/57553
             },
         },
         [CONST.REPORT.SECONDARY_ACTIONS.DELETE]: {
@@ -552,12 +492,12 @@ function MoneyReportHeader({policy, report: moneyRequestReport, transactionThrea
             icon: Expensicons.Trashcan,
             value: CONST.REPORT.SECONDARY_ACTIONS.DELETE,
             onSelected: () => {
-                // deleteMoneyRequest();
+                // TODO waiting for https://github.com/Expensify/App/pull/58020/files
             },
         },
     };
 
-    const applicableSecondaryActions = secondaryActions.map((action) => secondaryActionsImpl[action]).filter((p) => !!p);
+    const applicableSecondaryActions = secondaryActions.map((action) => secondaryActionsImpl[action]);
 
     return (
         <View style={[styles.pt0, styles.borderBottom]}>
@@ -589,7 +529,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]}>
-                    <View style={[styles.flexGrow4]}>{!!primaryAction && primaryActions[primaryAction]}</View>
+                    {!!primaryAction && <View style={[styles.flexGrow4]}>{primaryActions[primaryAction]}</View>}
                     {!!secondaryActions.length && (
                         <ButtonWithDropdownMenu
                             success={false}
@@ -638,6 +578,31 @@ 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);
+                }}
+                onCancel={() => setIsCancelPaymentModalVisible(false)}
+                prompt={translate('iou.cancelPaymentConfirmation')}
+                confirmText={translate('iou.cancelPayment')}
+                cancelText={translate('common.dismiss')}
+                danger
+                shouldEnableNewFocusManagement
+            />
         </View>
     );
 }
diff --git a/src/languages/es.ts b/src/languages/es.ts
index b619057fb214..bd4ec2d8efee 100644
--- a/src/languages/es.ts
+++ b/src/languages/es.ts
@@ -2729,7 +2729,7 @@ const translations = {
             defaultDescription: 'Un solo lugar para todos tus recibos y gastos.',
             welcomeNote: `Por favor, utiliza Expensify para enviar tus recibos para reembolso, ¡gracias!`,
             subscription: 'Suscripción',
-            markAsExported: 'Marcar como introducido manualmente', // TODO chagne
+            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/pages/ReportDetailsPage.tsx b/src/pages/ReportDetailsPage.tsx
index 214553e47b11..2c2c27bf770b 100644
--- a/src/pages/ReportDetailsPage.tsx
+++ b/src/pages/ReportDetailsPage.tsx
@@ -8,7 +8,6 @@ import AvatarWithImagePicker from '@components/AvatarWithImagePicker';
 import FullPageNotFoundView from '@components/BlockingViews/FullPageNotFoundView';
 import ConfirmModal from '@components/ConfirmModal';
 import DecisionModal from '@components/DecisionModal';
-import DelegateNoAccessModal from '@components/DelegateNoAccessModal';
 import DisplayNames from '@components/DisplayNames';
 import HeaderWithBackButton from '@components/HeaderWithBackButton';
 import MentionReportContext from '@components/HTMLEngineProvider/HTMLRenderers/MentionReportRenderer/MentionReportContext';
@@ -24,9 +23,7 @@ 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 useDelegateUserDetails from '@hooks/useDelegateUserDetails';
 import useLocalize from '@hooks/useLocalize';
 import useNetwork from '@hooks/useNetwork';
 import usePaginatedReportActions from '@hooks/usePaginatedReportActions';
@@ -40,9 +37,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,
@@ -68,7 +63,6 @@ import {
     isConciergeChatReport,
     isDefaultRoom as isDefaultRoomUtil,
     isExpenseReport as isExpenseReportUtil,
-    isExported,
     isGroupChat as isGroupChatUtil,
     isHiddenForCurrentUser,
     isInvoiceReport as isInvoiceReportUtil,
@@ -88,26 +82,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,
     clearReportFieldKeyErrors,
-    exportReportToCSV,
     getReportPrivateNote,
     hasErrorInPrivateNotes,
     leaveGroupChat,
@@ -164,10 +147,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
@@ -180,17 +161,11 @@ 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 [isLastMemberLeavingGroupModalVisible, setIsLastMemberLeavingGroupModalVisible] = useState(false);
     const [isDeleteModalVisible, setIsDeleteModalVisible] = useState(false);
     const [isUnapproveModalVisible, setIsUnapproveModalVisible] = useState(false);
-    const [isConfirmModalVisible, setIsConfirmModalVisible] = 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]);
@@ -237,13 +212,6 @@ function ReportDetailsPage({policies, report, route, reportMetadata}: ReportDeta
     }, [report, personalDetails, shouldOpenRoomMembersPage]);
     const connectedIntegration = getConnectedIntegration(policy);
 
-    const transactionIDList = useMemo(() => {
-        if (!isMoneyRequestReport || !transactions) {
-            return [];
-        }
-        return transactions.map((transaction) => transaction.transactionID);
-    }, [isMoneyRequestReport, 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,12 +258,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);
@@ -329,22 +295,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;
 
@@ -367,17 +317,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 menuItems: ReportDetailsPageMenuItem[] = useMemo(() => {
         const items: ReportDetailsPageMenuItem[] = [];
@@ -508,57 +447,6 @@ function ReportDetailsPage({policies, report, route, reportMetadata}: ReportDeta
             }
         }
 
-        if (shouldShowCancelPaymentButton) {
-            items.push({
-                key: CONST.REPORT_DETAILS_MENU_ITEM.CANCEL_PAYMENT,
-                icon: Expensicons.Trashcan,
-                translationKey: 'iou.cancelPayment',
-                isAnonymousAction: false,
-                action: () => setIsConfirmModalVisible(true),
-            });
-        }
-
-        if (isMoneyRequestReport) {
-            items.push({
-                key: CONST.REPORT_DETAILS_MENU_ITEM.DOWNLOAD,
-                translationKey: 'common.download',
-                icon: Expensicons.Download,
-                isAnonymousAction: false,
-                action: () => {
-                    if (isOffline) {
-                        setOfflineModalVisible(true);
-                        return;
-                    }
-
-                    exportReportToCSV({reportID: report.reportID, transactionIDList}, () => {
-                        setDownloadErrorModalVisible(true);
-                    });
-                },
-            });
-        }
-
-        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,
@@ -623,13 +511,7 @@ function ReportDetailsPage({policies, report, route, reportMetadata}: ReportDeta
         isInvoiceReport,
         isTaskReport,
         isCanceledTaskReport,
-        shouldShowCancelPaymentButton,
         shouldShowLeaveButton,
-        policy,
-        connectedIntegration,
-        isPolicyAdmin,
-        isSingleTransactionView,
-        isExpenseReport,
         isDebugModeEnabled,
         shouldShowGoToWorkspace,
         activeChatMembers.length,
@@ -643,9 +525,6 @@ function ReportDetailsPage({policies, report, route, reportMetadata}: ReportDeta
         canActionTask,
         isRootGroupChat,
         leaveChat,
-        isOffline,
-        transactionIDList,
-        unapproveExpenseReportOrShowModal,
     ]);
 
     const displayNamesWithTooltips = useMemo(() => {
@@ -719,11 +598,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(() => {
@@ -733,19 +607,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));
         }
@@ -753,18 +614,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]}>
@@ -1032,17 +882,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}
@@ -1058,10 +897,6 @@ function ReportDetailsPage({policies, report, route, reportMetadata}: ReportDeta
                     shouldEnableNewFocusManagement
                     onModalHide={navigateToTargetUrl}
                 />
-                <DelegateNoAccessModal
-                    isNoDelegateAccessMenuVisible={isNoDelegateAccessMenuVisible}
-                    onClose={() => setIsNoDelegateAccessMenuVisible(false)}
-                />
                 <ConfirmModal
                     title={translate('iou.unapproveReport')}
                     isVisible={isUnapproveModalVisible}
@@ -1085,15 +920,6 @@ 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)}
-                />
             </FullPageNotFoundView>
         </ScreenWrapper>
     );

From 79a5efdee3fdf3062270ee69cb8dd276bbf2925f Mon Sep 17 00:00:00 2001
From: Jan Nowakowski <janeknowakowski9@gmail.com>
Date: Tue, 11 Mar 2025 16:54:40 +0100
Subject: [PATCH 04/54] Do not alter existing translation

---
 src/components/ReportActionItem/ExportWithDropdownMenu.tsx | 2 +-
 src/languages/en.ts                                        | 1 +
 src/languages/es.ts                                        | 1 +
 src/pages/home/report/ReportDetailsExportPage.tsx          | 2 +-
 4 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/components/ReportActionItem/ExportWithDropdownMenu.tsx b/src/components/ReportActionItem/ExportWithDropdownMenu.tsx
index b676c581da98..fcba3500a791 100644
--- a/src/components/ReportActionItem/ExportWithDropdownMenu.tsx
+++ b/src/components/ReportActionItem/ExportWithDropdownMenu.tsx
@@ -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,
             },
         ];
diff --git a/src/languages/en.ts b/src/languages/en.ts
index b8733f8f3555..408083d054fb 100755
--- a/src/languages/en.ts
+++ b/src/languages/en.ts
@@ -2706,6 +2706,7 @@ const translations = {
             defaultDescription: 'One place for all your receipts and expenses.',
             welcomeNote: 'Please use Expensify to submit your receipts for reimbursement, thanks!',
             subscription: 'Subscription',
+            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.",
diff --git a/src/languages/es.ts b/src/languages/es.ts
index bd4ec2d8efee..78b9e6f8feb9 100644
--- a/src/languages/es.ts
+++ b/src/languages/es.ts
@@ -2729,6 +2729,7 @@ const translations = {
             defaultDescription: 'Un solo lugar para todos tus recibos y gastos.',
             welcomeNote: `Por favor, utiliza Expensify para enviar tus recibos para reembolso, ¡gracias!`,
             subscription: 'Suscripción',
+            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',
diff --git a/src/pages/home/report/ReportDetailsExportPage.tsx b/src/pages/home/report/ReportDetailsExportPage.tsx
index 4332ba764ff9..f5efa1a5a9ef 100644
--- a/src/pages/home/report/ReportDetailsExportPage.tsx
+++ b/src/pages/home/report/ReportDetailsExportPage.tsx
@@ -68,7 +68,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 ?? '',

From 7256b28b04a1aee085dc39596fdf963f9755d3bb Mon Sep 17 00:00:00 2001
From: Jan Nowakowski <janeknowakowski9@gmail.com>
Date: Wed, 12 Mar 2025 08:08:01 +0100
Subject: [PATCH 05/54] Fix linter

---
 .../ExportWithDropdownMenu.tsx                | 26 +++++++++----------
 .../home/report/ReportDetailsExportPage.tsx   | 14 +++++-----
 2 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/src/components/ReportActionItem/ExportWithDropdownMenu.tsx b/src/components/ReportActionItem/ExportWithDropdownMenu.tsx
index fcba3500a791..6f91d5d1463d 100644
--- a/src/components/ReportActionItem/ExportWithDropdownMenu.tsx
+++ b/src/components/ReportActionItem/ExportWithDropdownMenu.tsx
@@ -9,10 +9,9 @@ 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 {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';
@@ -20,6 +19,7 @@ import ONYXKEYS from '@src/ONYXKEYS';
 import type {Policy, Report} from '@src/types/onyx';
 import type {ConnectionName} from '@src/types/onyx/Policy';
 import type AnchorAlignment from '@src/types/utils/AnchorAlignment';
+import { savePreferredExportMethod as savePreferredExportMethodUtils } from '@libs/actions/Policy/Policy';
 
 type ExportWithDropdownMenuProps = {
     policy: OnyxEntry<Policy>;
@@ -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(() => {
@@ -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/pages/home/report/ReportDetailsExportPage.tsx b/src/pages/home/report/ReportDetailsExportPage.tsx
index f5efa1a5a9ef..e040244cbe74 100644
--- a/src/pages/home/report/ReportDetailsExportPage.tsx
+++ b/src/pages/home/report/ReportDetailsExportPage.tsx
@@ -10,11 +10,11 @@ import UserListItem from '@components/SelectionList/UserListItem';
 import type {SelectorType} from '@components/SelectionScreen';
 import SelectionScreen from '@components/SelectionScreen';
 import useLocalize from '@hooks/useLocalize';
-import * as ReportActions from '@libs/actions/Report';
+import {exportToIntegration, markAsManuallyExported} from '@libs/actions/Report';
 import Navigation from '@libs/Navigation/Navigation';
 import type {PlatformStackScreenProps} from '@libs/Navigation/PlatformStackNavigation/types';
 import type {ReportDetailsNavigatorParamList} from '@libs/Navigation/types';
-import * as ReportUtils from '@libs/ReportUtils';
+import {canBeExported as canBeExportedUtils, getIntegrationIcon, isExported as isExportedUtils} from '@libs/ReportUtils';
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
 import ROUTES from '@src/ROUTES';
@@ -37,16 +37,16 @@ function ReportDetailsExportPage({route}: ReportDetailsExportPageProps) {
     const {translate} = useLocalize();
     const [modalStatus, setModalStatus] = useState<ExportType | null>(null);
 
-    const iconToDisplay = ReportUtils.getIntegrationIcon(connectionName);
-    const canBeExported = ReportUtils.canBeExported(report);
-    const isExported = ReportUtils.isExported(reportActions);
+    const iconToDisplay = getIntegrationIcon(connectionName);
+    const canBeExported = canBeExportedUtils(report);
+    const isExported = isExportedUtils(reportActions);
 
     const confirmExport = useCallback(
         (type = modalStatus) => {
             if (type === CONST.REPORT.EXPORT_OPTIONS.EXPORT_TO_INTEGRATION) {
-                ReportActions.exportToIntegration(reportID, connectionName);
+                exportToIntegration(reportID, connectionName);
             } else if (type === CONST.REPORT.EXPORT_OPTIONS.MARK_AS_EXPORTED) {
-                ReportActions.markAsManuallyExported(reportID, connectionName);
+                markAsManuallyExported(reportID, connectionName);
             }
             setModalStatus(null);
             Navigation.dismissModal();

From 9810fd26ceb9116ec993c1d3d5d755a010ff1d9f Mon Sep 17 00:00:00 2001
From: Jan Nowakowski <janeknowakowski9@gmail.com>
Date: Wed, 12 Mar 2025 09:21:18 +0100
Subject: [PATCH 06/54] Translation

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

diff --git a/src/components/MoneyReportHeader.tsx b/src/components/MoneyReportHeader.tsx
index 8cc84ffdf519..f909227a5f1c 100644
--- a/src/components/MoneyReportHeader.tsx
+++ b/src/components/MoneyReportHeader.tsx
@@ -366,7 +366,7 @@ function MoneyReportHeader({policy, report: moneyRequestReport, transactionThrea
         [CONST.REPORT.PRIMARY_ACTIONS.REMOVE_HOLD]: (
             <Button
                 success
-                text="Unhold"
+                text={translate('iou.unhold')}
                 onPress={() => {
                     const parentReportAction = getReportAction(moneyRequestReport?.parentReportID, moneyRequestReport?.parentReportActionID);
 

From e452ae5749b58094ce8ddff5bce436c452106177 Mon Sep 17 00:00:00 2001
From: Jan Nowakowski <janeknowakowski9@gmail.com>
Date: Wed, 12 Mar 2025 09:26:13 +0100
Subject: [PATCH 07/54] Fix linter and prettier

---
 src/components/ReportActionItem/ExportWithDropdownMenu.tsx | 2 +-
 src/pages/home/report/ReportDetailsExportPage.tsx          | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/ReportActionItem/ExportWithDropdownMenu.tsx b/src/components/ReportActionItem/ExportWithDropdownMenu.tsx
index 6f91d5d1463d..6b18c1c0b6bb 100644
--- a/src/components/ReportActionItem/ExportWithDropdownMenu.tsx
+++ b/src/components/ReportActionItem/ExportWithDropdownMenu.tsx
@@ -9,6 +9,7 @@ import ConfirmModal from '@components/ConfirmModal';
 import useLocalize from '@hooks/useLocalize';
 import useResponsiveLayout from '@hooks/useResponsiveLayout';
 import useThemeStyles from '@hooks/useThemeStyles';
+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';
@@ -19,7 +20,6 @@ import ONYXKEYS from '@src/ONYXKEYS';
 import type {Policy, Report} from '@src/types/onyx';
 import type {ConnectionName} from '@src/types/onyx/Policy';
 import type AnchorAlignment from '@src/types/utils/AnchorAlignment';
-import { savePreferredExportMethod as savePreferredExportMethodUtils } from '@libs/actions/Policy/Policy';
 
 type ExportWithDropdownMenuProps = {
     policy: OnyxEntry<Policy>;
diff --git a/src/pages/home/report/ReportDetailsExportPage.tsx b/src/pages/home/report/ReportDetailsExportPage.tsx
index e040244cbe74..756d98d8d508 100644
--- a/src/pages/home/report/ReportDetailsExportPage.tsx
+++ b/src/pages/home/report/ReportDetailsExportPage.tsx
@@ -102,7 +102,7 @@ function ReportDetailsExportPage({route}: ReportDetailsExportPageProps) {
     return (
         <>
             <SelectionScreen<ExportType>
-                policyID={policyID ?? ''}
+                policyID={policyID}
                 accessVariants={[CONST.POLICY.ACCESS_VARIANTS.ADMIN, CONST.POLICY.ACCESS_VARIANTS.PAID]}
                 featureName={CONST.POLICY.MORE_FEATURES.ARE_CONNECTIONS_ENABLED}
                 displayName={ReportDetailsExportPage.displayName}

From 96315d0abe2ba7513c66141a917b941788360735 Mon Sep 17 00:00:00 2001
From: Jan Nowakowski <janeknowakowski9@gmail.com>
Date: Wed, 12 Mar 2025 11:06:45 +0100
Subject: [PATCH 08/54] Add delegate gaurd to unapprove action

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

diff --git a/src/components/MoneyReportHeader.tsx b/src/components/MoneyReportHeader.tsx
index f909227a5f1c..e1d62ac171f8 100644
--- a/src/components/MoneyReportHeader.tsx
+++ b/src/components/MoneyReportHeader.tsx
@@ -443,6 +443,10 @@ function MoneyReportHeader({policy, report: moneyRequestReport, transactionThrea
             icon: Expensicons.CircularArrowBackwards,
             value: CONST.REPORT.SECONDARY_ACTIONS.UNAPPROVE,
             onSelected: () => {
+                if (isDelegateAccessRestricted) {
+                    setIsNoDelegateAccessMenuVisible(true);
+                }
+
                 unapproveExpenseReport(moneyRequestReport);
             },
         },

From b8e932b2341954d1fa879b361de73c89349f3669 Mon Sep 17 00:00:00 2001
From: Jan Nowakowski <janeknowakowski9@gmail.com>
Date: Mon, 17 Mar 2025 18:19:14 +0100
Subject: [PATCH 09/54] Improve logic

---
 src/libs/ReportPrimaryActionUtils.ts | 90 ++++++++++++++++++++++------
 1 file changed, 72 insertions(+), 18 deletions(-)

diff --git a/src/libs/ReportPrimaryActionUtils.ts b/src/libs/ReportPrimaryActionUtils.ts
index 91e220bd029c..ce1e6982f960 100644
--- a/src/libs/ReportPrimaryActionUtils.ts
+++ b/src/libs/ReportPrimaryActionUtils.ts
@@ -12,6 +12,7 @@ import {
     hasIntegrationAutoSync,
     isPrefferedExporter,
 } from './PolicyUtils';
+import {getAllReportActions, getOneTransactionThreadReportID} from './ReportActionsUtils';
 import {
     isClosedReport as isClosedReportUtils,
     isCurrentUserSubmitter,
@@ -28,7 +29,7 @@ import {
 import {getSession} from './SessionUtils';
 import {allHavePendingRTERViolation, isDuplicate, isOnHold as isOnHoldTransactionUtils, shouldShowBrokenConnectionViolationForMultipleTransactions} from './TransactionUtils';
 
-function isSubmitAction(report: Report, policy: Policy) {
+function isSubmitAction(report: Report, policy?: Policy) {
     const isExpenseReport = isExpenseReportUtils(report);
     const isReportSubmitter = isCurrentUserSubmitter(report.reportID);
     const isOpenReport = isOpenReportUtils(report);
@@ -37,10 +38,10 @@ function isSubmitAction(report: Report, policy: Policy) {
     return isExpenseReport && isReportSubmitter && isOpenReport && isManualSubmitEnabled;
 }
 
-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;
@@ -58,7 +59,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);
@@ -71,17 +72,30 @@ function isPayAction(report: Report, policy: Policy) {
     }
 
     const isProcessingReport = isProcessingReportUtils(report);
+
+    if (!isProcessingReport) {
+        return false;
+    }
+
     const isInvoiceReport = isInvoiceReportUtils(report);
+
+    if (isInvoiceReport) {
+        return true;
+    }
     const isIOUReport = isIOUReportUtils(report);
 
-    if ((isInvoiceReport || isIOUReport) && isProcessingReport) {
+    if (isIOUReport && isReportPayer) {
         return true;
     }
 
     return false;
 }
 
-function isExportAction(report: Report, policy: Policy) {
+function isExportAction(report: Report, policy?: Policy) {
+    if (!policy) {
+        return false;
+    }
+
     const hasAccountingConnection = hasAccountingConnections(policy);
     if (!hasAccountingConnection) {
         return false;
@@ -110,13 +124,27 @@ function isExportAction(report: Report, policy: Policy) {
 }
 
 function isRemoveHoldAction(report: Report, reportTransactions: Transaction[]) {
+    // TODO it should be availabe also in report header but only when it's one expense report
     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) {
@@ -138,10 +166,16 @@ 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 transactionIDs = reportTransactions.map((t) => t.transactionID);
     const hasAllPendingRTERViolations = allHavePendingRTERViolation(transactionIDs, violations);
 
+    const isOneExpenseReport = isExpenseReportUtils(report) && reportTransactions.length === 1;
+
+    if (!isOneExpenseReport) {
+        return false;
+    }
+
     if (hasAllPendingRTERViolations) {
         return true;
     }
@@ -156,17 +190,17 @@ 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)) {
         return CONST.REPORT.PRIMARY_ACTIONS.SUBMIT;
     }
 
-    if (isApproveAction(report, policy, reportTransactions)) {
+    if (isApproveAction(report, reportTransactions, policy)) {
         return CONST.REPORT.PRIMARY_ACTIONS.APPROVE;
     }
 
@@ -182,15 +216,35 @@ function getPrimaryAction(
         return CONST.REPORT.PRIMARY_ACTIONS.REMOVE_HOLD;
     }
 
-    if (isReviewDuplicatesAction(report, policy, reportTransactions)) {
-        return CONST.REPORT.PRIMARY_ACTIONS.REVIEW_DUPLICATES;
+    if (isMarkAsCashAction(report, reportTransactions, violations, policy)) {
+        return CONST.REPORT.PRIMARY_ACTIONS.MARK_AS_CASH;
     }
 
-    if (isMarkAsCashAction(report, policy, reportTransactions, violations)) {
-        return CONST.REPORT.PRIMARY_ACTIONS.MARK_AS_CASH;
+    return '';
+}
+
+function getTransactionThreadReportPrimaryAction(
+    transactionThreadReport: Report,
+    parentReport: Report,
+    reportTransaction: Transaction,
+    violations: TransactionViolation[],
+    policy?: Policy,
+): ValueOf<typeof CONST.REPORT.PRIMARY_ACTIONS> | '' {
+    if (isHoldCreator(reportTransaction, transactionThreadReport.reportID)) {
+        return CONST.REPORT.PRIMARY_ACTIONS.REMOVE_HOLD;
     }
 
+    if (isReviewDuplicatesAction(parentReport, [reportTransaction], policy)) {
+        return CONST.REPORT.PRIMARY_ACTIONS.REVIEW_DUPLICATES;
+    }
+
+
+
+    // if (isMarkAsCashAction(transactionThreadReport, reportTransactions, violations, policy)) {
+    //     return CONST.REPORT.PRIMARY_ACTIONS.MARK_AS_CASH;
+    // }
+
     return '';
 }
 
-export default getPrimaryAction;
+export {getReportPrimaryAction, getTransactionThreadReportPrimaryAction};

From 02c114b14e715e26047175b9f620b190902785eb Mon Sep 17 00:00:00 2001
From: Jan Nowakowski <janeknowakowski9@gmail.com>
Date: Tue, 18 Mar 2025 11:56:25 +0100
Subject: [PATCH 10/54] Invoice pay logic

---
 src/libs/ReportPrimaryActionUtils.ts | 21 +++++++++++++--------
 src/libs/ReportUtils.ts              |  1 +
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/src/libs/ReportPrimaryActionUtils.ts b/src/libs/ReportPrimaryActionUtils.ts
index ce1e6982f960..d586d44ac86d 100644
--- a/src/libs/ReportPrimaryActionUtils.ts
+++ b/src/libs/ReportPrimaryActionUtils.ts
@@ -14,6 +14,7 @@ import {
 } from './PolicyUtils';
 import {getAllReportActions, getOneTransactionThreadReportID} from './ReportActionsUtils';
 import {
+    getParentReport,
     isClosedReport as isClosedReportUtils,
     isCurrentUserSubmitter,
     isExpenseReport as isExpenseReportUtils,
@@ -77,18 +78,24 @@ function isPayAction(report: Report, policy?: Policy) {
         return false;
     }
 
-    const isInvoiceReport = isInvoiceReportUtils(report);
-
-    if (isInvoiceReport) {
-        return true;
-    }
     const isIOUReport = isIOUReportUtils(report);
 
     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) {
@@ -238,8 +245,6 @@ function getTransactionThreadReportPrimaryAction(
         return CONST.REPORT.PRIMARY_ACTIONS.REVIEW_DUPLICATES;
     }
 
-
-
     // if (isMarkAsCashAction(transactionThreadReport, reportTransactions, violations, policy)) {
     //     return CONST.REPORT.PRIMARY_ACTIONS.MARK_AS_CASH;
     // }
diff --git a/src/libs/ReportUtils.ts b/src/libs/ReportUtils.ts
index fc4c70ac538a..6c64d930ce10 100644
--- a/src/libs/ReportUtils.ts
+++ b/src/libs/ReportUtils.ts
@@ -9540,6 +9540,7 @@ export {
     getReportParticipantsTitle,
     getReportPreviewMessage,
     getReportRecipientAccountIDs,
+    getParentReport,
     getReportOrDraftReport,
     getRoom,
     getRootParentReport,

From 0583e47993fb44a18fd18169eb70ac7e55109372 Mon Sep 17 00:00:00 2001
From: Jan Nowakowski <janeknowakowski9@gmail.com>
Date: Wed, 19 Mar 2025 10:55:20 +0100
Subject: [PATCH 11/54] Primary actions tests

---
 src/CONST.ts                                  |  6 +-
 src/libs/ReportPrimaryActionUtils.ts          | 56 ++++++++++----
 src/libs/TransactionUtils/index.ts            | 10 ---
 tests/actions/ReportPrimaryActionUtilsTest.ts | 75 +++++++++----------
 4 files changed, 82 insertions(+), 65 deletions(-)

diff --git a/src/CONST.ts b/src/CONST.ts
index 745236dc52ec..21788ea8e2e9 100755
--- a/src/CONST.ts
+++ b/src/CONST.ts
@@ -1165,7 +1165,6 @@ const CONST = {
             PAY: 'pay',
             EXPORT_TO_ACCOUNTING: 'exportToAccounting',
             REMOVE_HOLD: 'removeHold',
-            REVIEW_DUPLICATES: 'reviewDuplicates',
             MARK_AS_CASH: 'markAsCash',
         },
         ACTIONS: {
@@ -1547,6 +1546,11 @@ const CONST = {
     // we set this height threshold to 30dpi, since gesture bars will never be taller than that. (Samsung & Huawei: ~14-15dpi)
     NAVIGATION_BAR_ANDROID_SOFT_KEYS_MINIMUM_HEIGHT_THRESHOLD: 30,
     TRANSACTION: {
+        TRANSACTION_PRIMARY_ACTIONS: {
+            REMOVE_HOLD: 'removeHold',
+            REVIEW_DUPLICATES: 'reviewDuplicates',
+            MARK_AS_CASH: 'markAsCash',
+        },
         DEFAULT_MERCHANT: 'Expense',
         UNKNOWN_MERCHANT: 'Unknown Merchant',
         PARTIAL_TRANSACTION_MERCHANT: '(none)',
diff --git a/src/libs/ReportPrimaryActionUtils.ts b/src/libs/ReportPrimaryActionUtils.ts
index d586d44ac86d..2589373f9bc8 100644
--- a/src/libs/ReportPrimaryActionUtils.ts
+++ b/src/libs/ReportPrimaryActionUtils.ts
@@ -28,7 +28,14 @@ import {
     isSettled,
 } from './ReportUtils';
 import {getSession} from './SessionUtils';
-import {allHavePendingRTERViolation, isDuplicate, isOnHold as isOnHoldTransactionUtils, shouldShowBrokenConnectionViolationForMultipleTransactions} from './TransactionUtils';
+import {
+    allHavePendingRTERViolation,
+    hasPendingRTERViolation as hasPendingRTERViolationTransactionUtils,
+    isDuplicate,
+    isOnHold as isOnHoldTransactionUtils,
+    shouldShowBrokenConnectionViolationForMultipleTransactions,
+    shouldShowBrokenConnectionViolation as shouldShowBrokenConnectionViolationTransactionUtils,
+} from './TransactionUtils';
 
 function isSubmitAction(report: Report, policy?: Policy) {
     const isExpenseReport = isExpenseReportUtils(report);
@@ -131,7 +138,6 @@ function isExportAction(report: Report, policy?: Policy) {
 }
 
 function isRemoveHoldAction(report: Report, reportTransactions: Transaction[]) {
-    // TODO it should be availabe also in report header but only when it's one expense report
     const isReportOnHold = reportTransactions.some(isOnHoldTransactionUtils);
 
     if (!isReportOnHold) {
@@ -174,15 +180,15 @@ function isReviewDuplicatesAction(report: Report, reportTransactions: Transactio
 }
 
 function isMarkAsCashAction(report: Report, reportTransactions: Transaction[], violations: OnyxCollection<TransactionViolation[]>, policy?: Policy) {
-    const transactionIDs = reportTransactions.map((t) => t.transactionID);
-    const hasAllPendingRTERViolations = allHavePendingRTERViolation(transactionIDs, violations);
-
     const isOneExpenseReport = isExpenseReportUtils(report) && reportTransactions.length === 1;
 
     if (!isOneExpenseReport) {
         return false;
     }
 
+    const transactionIDs = reportTransactions.map((t) => t.transactionID);
+    const hasAllPendingRTERViolations = allHavePendingRTERViolation(transactionIDs, violations);
+
     if (hasAllPendingRTERViolations) {
         return true;
     }
@@ -203,6 +209,10 @@ function getReportPrimaryAction(
     violations: OnyxCollection<TransactionViolation[]>,
     policy?: Policy,
 ): ValueOf<typeof CONST.REPORT.PRIMARY_ACTIONS> | '' {
+    if (isRemoveHoldAction(report, reportTransactions)) {
+        return CONST.REPORT.PRIMARY_ACTIONS.REMOVE_HOLD;
+    }
+
     if (isSubmitAction(report, policy)) {
         return CONST.REPORT.PRIMARY_ACTIONS.SUBMIT;
     }
@@ -219,10 +229,6 @@ function getReportPrimaryAction(
         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;
     }
@@ -230,24 +236,44 @@ function getReportPrimaryAction(
     return '';
 }
 
+function isMarkAsCashActionForTransaction(parentReport: Report, violations: TransactionViolation[], policy?: Policy): boolean {
+    const hasPendingRTERViolation = hasPendingRTERViolationTransactionUtils(violations);
+
+    if (hasPendingRTERViolation) {
+        return true;
+    }
+
+    const shouldShowBrokenConnectionViolation = shouldShowBrokenConnectionViolationTransactionUtils(parentReport, policy, violations);
+
+    if (!shouldShowBrokenConnectionViolation) {
+        return false;
+    }
+
+    const isReportSubmitter = isCurrentUserSubmitter(parentReport.reportID);
+    const isReportApprover = isApproverUtils(policy, getCurrentUserAccountID());
+    const isAdmin = policy?.role === CONST.POLICY.ROLE.ADMIN;
+
+    return isReportSubmitter || isReportApprover || isAdmin;
+}
+
 function getTransactionThreadReportPrimaryAction(
     transactionThreadReport: Report,
     parentReport: Report,
     reportTransaction: Transaction,
     violations: TransactionViolation[],
     policy?: Policy,
-): ValueOf<typeof CONST.REPORT.PRIMARY_ACTIONS> | '' {
+): ValueOf<typeof CONST.TRANSACTION.TRANSACTION_PRIMARY_ACTIONS> | '' {
     if (isHoldCreator(reportTransaction, transactionThreadReport.reportID)) {
-        return CONST.REPORT.PRIMARY_ACTIONS.REMOVE_HOLD;
+        return CONST.TRANSACTION.TRANSACTION_PRIMARY_ACTIONS.REMOVE_HOLD;
     }
 
     if (isReviewDuplicatesAction(parentReport, [reportTransaction], policy)) {
-        return CONST.REPORT.PRIMARY_ACTIONS.REVIEW_DUPLICATES;
+        return CONST.TRANSACTION.TRANSACTION_PRIMARY_ACTIONS.REVIEW_DUPLICATES;
     }
 
-    // if (isMarkAsCashAction(transactionThreadReport, reportTransactions, violations, policy)) {
-    //     return CONST.REPORT.PRIMARY_ACTIONS.MARK_AS_CASH;
-    // }
+    if (isMarkAsCashActionForTransaction(parentReport, violations, policy)) {
+        return CONST.TRANSACTION.TRANSACTION_PRIMARY_ACTIONS.MARK_AS_CASH;
+    }
 
     return '';
 }
diff --git a/src/libs/TransactionUtils/index.ts b/src/libs/TransactionUtils/index.ts
index 82987ce754bd..d89c858b64e7 100644
--- a/src/libs/TransactionUtils/index.ts
+++ b/src/libs/TransactionUtils/index.ts
@@ -859,15 +859,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.
  */
@@ -1554,7 +1545,6 @@ export {
     isPerDiemRequest,
     isViolationDismissed,
     isBrokenConnectionViolation,
-    checkIfShouldShowMarkAsCashButton,
     shouldShowRTERViolationMessage,
 };
 
diff --git a/tests/actions/ReportPrimaryActionUtilsTest.ts b/tests/actions/ReportPrimaryActionUtilsTest.ts
index 12c3733d5f9d..96ec4f452b8f 100644
--- a/tests/actions/ReportPrimaryActionUtilsTest.ts
+++ b/tests/actions/ReportPrimaryActionUtilsTest.ts
@@ -1,5 +1,5 @@
 import Onyx from 'react-native-onyx';
-import getPrimaryAction from '@libs/ReportPrimaryActionUtils';
+import {getReportPrimaryAction} 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, [], {}, 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,64 +123,60 @@ 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,
-        } as unknown as ReportAction;
-
-        await Onyx.set(`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${REPORT_ID}`, {REPORT_ACTION_ID: reportAction});
-
-        expect(getPrimaryAction(report, policy as Policy, [transaction], {})).toBe(CONST.REPORT.PRIMARY_ACTIONS.REMOVE_HOLD);
-    });
-
-    it('should return REVIEW DUPLICATES when there are duplicated transactions', async () => {
-        const report = {
-            reportID: REPORT_ID,
-            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 REPORT_ACTION_ID = 'REPORT_ACTION_ID';
-        const TRANSACTION_ID = 'TRANSACTION_ID';
-        const transaction = {
-            transactionID: TRANSACTION_ID,
-            comment: {
-                hold: REPORT_ACTION_ID,
+            childReportID: CHILD_REPORT_ID,
+            message: [
+                {
+                    html: 'html',
+                },
+            ],
+            originalMessage: {
+                type: CONST.IOU.REPORT_ACTION_TYPE.PAY,
+                IOUTransactionID: TRANSACTION_ID,
             },
-        } as unknown as Transaction;
+        } as unknown as ReportAction;
 
-        await Onyx.merge(`${ONYXKEYS.COLLECTION.TRANSACTION}${TRANSACTION_ID}`, transaction);
+        const holdAction = {
+            reportActionID: HOLD_ACTION_ID,
+            reportID: CHILD_REPORT_ID,
+            actorAccountID: CURRENT_USER_ACCOUNT_ID,
+        };
 
-        await Onyx.set(`${ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS}${TRANSACTION_ID}`, [
-            {
-                name: CONST.VIOLATIONS.DUPLICATED_TRANSACTION,
-            } as TransactionViolation,
-        ]);
+        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(getPrimaryAction(report, policy as Policy, [transaction], {})).toBe(CONST.REPORT.PRIMARY_ACTIONS.REVIEW_DUPLICATES);
+        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,
@@ -201,7 +197,8 @@ describe('getPrimaryAction', () => {
             },
         } as unknown as TransactionViolation;
 
-        expect(getPrimaryAction(report, policy as Policy, [transaction], {[`${ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS}${TRANSACTION_ID}`]: [violation]})).toBe(
+        getReportPrimaryAction(report, [transaction], {[`${ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS}${TRANSACTION_ID}`]: [violation]}, policy as Policy);
+        expect(getReportPrimaryAction(report, [transaction], {[`${ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS}${TRANSACTION_ID}`]: [violation]}, policy as Policy)).toBe(
             CONST.REPORT.PRIMARY_ACTIONS.MARK_AS_CASH,
         );
     });
@@ -229,7 +226,7 @@ describe('getPrimaryAction', () => {
             },
         } as unknown as TransactionViolation;
 
-        expect(getPrimaryAction(report, policy as Policy, [transaction], {[`${ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS}${TRANSACTION_ID}`]: [violation]})).toBe(
+        expect(getReportPrimaryAction(report, [transaction], {[`${ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS}${TRANSACTION_ID}`]: [violation]}, policy as Policy)).toBe(
             CONST.REPORT.PRIMARY_ACTIONS.MARK_AS_CASH,
         );
     });

From c10b1245f31393a78497c30217e539fcdeb6306a Mon Sep 17 00:00:00 2001
From: Jan Nowakowski <janeknowakowski9@gmail.com>
Date: Wed, 19 Mar 2025 16:23:50 +0100
Subject: [PATCH 12/54] UI hopefully ready

---
 src/CONST.ts                             |  16 +-
 src/components/AvatarWithDisplayName.tsx |   2 +-
 src/components/MoneyReportHeader.tsx     |  52 +++----
 src/components/MoneyRequestHeader.tsx    | 185 +++++++++++++++++------
 src/libs/ReportPrimaryActionUtils.ts     |   8 +-
 src/libs/ReportSecondaryActionUtils.ts   | 103 +++++++++----
 6 files changed, 251 insertions(+), 115 deletions(-)

diff --git a/src/CONST.ts b/src/CONST.ts
index 21788ea8e2e9..5c2b82bad51c 100755
--- a/src/CONST.ts
+++ b/src/CONST.ts
@@ -1167,6 +1167,17 @@ const CONST = {
             REMOVE_HOLD: 'removeHold',
             MARK_AS_CASH: 'markAsCash',
         },
+        TRANSACTION_PRIMARY_ACTIONS: {
+            REMOVE_HOLD: 'removeHold',
+            REVIEW_DUPLICATES: 'reviewDuplicates',
+            MARK_AS_CASH: 'markAsCash',
+        },
+        TRANSACTION_SECONDARY_ACTIONS: {
+            HOLD: 'hold',
+            DOWNLOAD: 'download',
+            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
@@ -1546,11 +1557,6 @@ const CONST = {
     // we set this height threshold to 30dpi, since gesture bars will never be taller than that. (Samsung & Huawei: ~14-15dpi)
     NAVIGATION_BAR_ANDROID_SOFT_KEYS_MINIMUM_HEIGHT_THRESHOLD: 30,
     TRANSACTION: {
-        TRANSACTION_PRIMARY_ACTIONS: {
-            REMOVE_HOLD: 'removeHold',
-            REVIEW_DUPLICATES: 'reviewDuplicates',
-            MARK_AS_CASH: 'markAsCash',
-        },
         DEFAULT_MERCHANT: 'Expense',
         UNKNOWN_MERCHANT: 'Unknown Merchant',
         PARTIAL_TRANSACTION_MERCHANT: '(none)',
diff --git a/src/components/AvatarWithDisplayName.tsx b/src/components/AvatarWithDisplayName.tsx
index 6d4fd8cfdd4c..c69c369ebe9b 100644
--- a/src/components/AvatarWithDisplayName.tsx
+++ b/src/components/AvatarWithDisplayName.tsx
@@ -78,7 +78,7 @@ function AvatarWithDisplayName({policy, report, isAnonymous = false, size = CONS
     const subtitle = getChatRoomSubtitle(report, {isCreateExpenseFlow: true});
     const parentNavigationSubtitleData = getParentNavigationSubtitle(report);
     const isMoneyRequestOrReport = isMoneyRequestReport(report) || isMoneyRequest(report) || isTrackExpenseReport(report) || isInvoiceReport(report);
-    const isSingleTransactionView = isMoneyRequest(report) || isTrackExpenseReport(report);
+    const isSingleTransactionView = isTrackExpenseReport(report);
     const icons = getIcons(report, personalDetails, null, '', -1, policy, invoiceReceiverPolicy);
     const ownerPersonalDetails = getPersonalDetailsForAccountIDs(report?.ownerAccountID ? [report.ownerAccountID] : [], personalDetails);
     const displayNamesWithTooltips = getDisplayNamesWithTooltips(Object.values(ownerPersonalDetails), false);
diff --git a/src/components/MoneyReportHeader.tsx b/src/components/MoneyReportHeader.tsx
index f9771770a6b9..a5ffc3a79b0c 100644
--- a/src/components/MoneyReportHeader.tsx
+++ b/src/components/MoneyReportHeader.tsx
@@ -16,8 +16,8 @@ import Navigation from '@libs/Navigation/Navigation';
 import {buildOptimisticNextStepForPreventSelfApprovalsEnabled} from '@libs/NextStepUtils';
 import {getConnectedIntegration} from '@libs/PolicyUtils';
 import {getOriginalMessage, getReportAction, isMoneyRequestAction} from '@libs/ReportActionsUtils';
-import getPrimaryAction from '@libs/ReportPrimaryActionUtils';
-import getSecondaryActions from '@libs/ReportSecondaryActionUtils';
+import {getReportPrimaryAction} from '@libs/ReportPrimaryActionUtils';
+import getSecondaryReportActions from '@libs/ReportSecondaryActionUtils';
 import {
     changeMoneyRequestHoldStatus,
     getArchiveReason,
@@ -51,6 +51,7 @@ import {
     canApproveIOU,
     cancelPayment,
     canIOUBePaid as canIOUBePaidAction,
+    deleteMoneyRequest,
     getNextApproverAccountID,
     payInvoice,
     payMoneyRequest,
@@ -312,11 +313,8 @@ function MoneyReportHeader({policy, report: moneyRequestReport, transactionThrea
     if (!moneyRequestReport) {
         return null;
     }
-    if (!policy) {
-        return null;
-    }
 
-    const primaryAction = getPrimaryAction(moneyRequestReport, policy, transactions, violations);
+    const primaryAction = getReportPrimaryAction(moneyRequestReport, transactions, violations, policy); // useMemo
 
     const primaryActions = {
         [CONST.REPORT.PRIMARY_ACTIONS.SUBMIT]: (
@@ -337,7 +335,6 @@ function MoneyReportHeader({policy, report: moneyRequestReport, transactionThrea
             <SettlementButton
                 onlyShowPayElsewhere={onlyShowPayElsewhere}
                 currency={moneyRequestReport?.currency}
-                confirmApproval={confirmApproval}
                 policyID={moneyRequestReport?.policyID}
                 chatReportID={chatReport?.reportID}
                 iouReport={moneyRequestReport}
@@ -345,7 +342,6 @@ function MoneyReportHeader({policy, report: moneyRequestReport, transactionThrea
                 enablePaymentsRoute={ROUTES.ENABLE_PAYMENTS}
                 addBankAccountRoute={bankAccountRoute}
                 shouldHidePaymentOptions={!shouldShowPayButton}
-                shouldShowApproveButton={shouldShowApproveButton}
                 shouldDisableApproveButton={shouldDisableApproveButton}
                 formattedAmount={!hasOnlyHeldExpenses ? displayedAmount : ''}
                 isDisabled={isOffline && !canAllowSettlement}
@@ -381,15 +377,6 @@ function MoneyReportHeader({policy, report: moneyRequestReport, transactionThrea
                 }}
             />
         ),
-        [CONST.REPORT.PRIMARY_ACTIONS.REVIEW_DUPLICATES]: (
-            <Button
-                success
-                text={translate('iou.reviewDuplicates')}
-                onPress={() => {
-                    Navigation.navigate(ROUTES.TRANSACTION_DUPLICATE_REVIEW_PAGE.getRoute(transactionThreadReportID, Navigation.getReportRHPActiveRoute()));
-                }}
-            />
-        ),
         [CONST.REPORT.PRIMARY_ACTIONS.MARK_AS_CASH]: (
             <Button
                 success
@@ -399,7 +386,7 @@ function MoneyReportHeader({policy, report: moneyRequestReport, transactionThrea
         ),
     };
 
-    const secondaryActions = getSecondaryActions(moneyRequestReport, policy, transactions, violations);
+    const secondaryActions = getSecondaryReportActions(moneyRequestReport, transactions, violations, policy); // useMemo
 
     const secondaryActionsImpl: Record<ValueOf<typeof CONST.REPORT.SECONDARY_ACTIONS>, DropdownOption<ValueOf<typeof CONST.REPORT.SECONDARY_ACTIONS>>> = {
         [CONST.REPORT.SECONDARY_ACTIONS.VIEW_DETAILS]: {
@@ -415,10 +402,6 @@ function MoneyReportHeader({policy, report: moneyRequestReport, transactionThrea
             text: translate('common.download'),
             icon: Expensicons.Download,
             onSelected: () => {
-                if (isOffline) {
-                    return;
-                }
-
                 exportReportToCSV({reportID: moneyRequestReport.reportID, transactionIDList: transactionIDs}, () => {
                     setDownloadErrorModalVisible(true);
                 });
@@ -447,6 +430,7 @@ function MoneyReportHeader({policy, report: moneyRequestReport, transactionThrea
             onSelected: () => {
                 if (isDelegateAccessRestricted) {
                     setIsNoDelegateAccessMenuVisible(true);
+                    return;
                 }
 
                 unapproveExpenseReport(moneyRequestReport);
@@ -467,7 +451,7 @@ function MoneyReportHeader({policy, report: moneyRequestReport, transactionThrea
             value: CONST.REPORT.SECONDARY_ACTIONS.EXPORT_TO_ACCOUNTING,
             onSelected: () => {
                 if (!connectedIntegration) {
-                    return;
+                    throw new Error('No connected integration');
                 }
                 exportToIntegration(moneyRequestReport.reportID, connectedIntegration);
             },
@@ -478,7 +462,7 @@ function MoneyReportHeader({policy, report: moneyRequestReport, transactionThrea
             value: CONST.REPORT.SECONDARY_ACTIONS.MARK_AS_EXPORTED,
             onSelected: () => {
                 if (!connectedIntegration) {
-                    return;
+                    throw new Error('No connected integration');
                 }
                 markAsManuallyExported(moneyRequestReport.reportID, connectedIntegration);
             },
@@ -488,14 +472,11 @@ function MoneyReportHeader({policy, report: moneyRequestReport, transactionThrea
             icon: Expensicons.Stopwatch,
             value: CONST.REPORT.SECONDARY_ACTIONS.HOLD,
             onSelected: () => {
-                const parentReportAction = getReportAction(moneyRequestReport?.parentReportID, moneyRequestReport?.parentReportActionID);
-
-                const moneyRequestAction = transactionThreadReportID ? requestParentReportAction : parentReportAction;
-                if (!moneyRequestAction) {
-                    return;
+                if (!requestParentReportAction) {
+                    throw new Error('Parent action does not exist');
                 }
 
-                changeMoneyRequestHoldStatus(moneyRequestAction);
+                changeMoneyRequestHoldStatus(requestParentReportAction);
             },
         },
         [CONST.REPORT.SECONDARY_ACTIONS.CHANGE_WORKSPACE]: {
@@ -503,7 +484,7 @@ function MoneyReportHeader({policy, report: moneyRequestReport, transactionThrea
             icon: Expensicons.Buildings,
             value: CONST.REPORT.SECONDARY_ACTIONS.CHANGE_WORKSPACE,
             onSelected: () => {
-                // TODO waiting for https://github.com/Expensify/App/pull/57553
+                Navigation.navigate(ROUTES.REPORT_WITH_ID_CHANGE_WORKSPACE.getRoute(moneyRequestReport.reportID));
             },
         },
         [CONST.REPORT.SECONDARY_ACTIONS.DELETE]: {
@@ -511,7 +492,14 @@ function MoneyReportHeader({policy, report: moneyRequestReport, transactionThrea
             icon: Expensicons.Trashcan,
             value: CONST.REPORT.SECONDARY_ACTIONS.DELETE,
             onSelected: () => {
-                // TODO waiting for https://github.com/Expensify/App/pull/58020/files
+                if (transactionThreadReportID) {
+                    if (!requestParentReportAction) {
+                        throw new Error('requestParentReportAction is not defined');
+                    }
+                    deleteMoneyRequest(transaction?.transactionID, requestParentReportAction);
+                } else {
+                    // TODO waiting for https://github.com/Expensify/App/pull/58020/files
+                }
             },
         },
     };
diff --git a/src/components/MoneyRequestHeader.tsx b/src/components/MoneyRequestHeader.tsx
index 6d7ca116a782..537822eb72a8 100644
--- a/src/components/MoneyRequestHeader.tsx
+++ b/src/components/MoneyRequestHeader.tsx
@@ -1,18 +1,23 @@
 import {useRoute} from '@react-navigation/native';
 import type {ReactNode} from 'react';
-import React, {useCallback, useEffect} from 'react';
+import React, {useCallback, useEffect, 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} from '@libs/actions/IOU';
+import {exportReportToCSV} from '@libs/actions/Report';
 import Navigation from '@libs/Navigation/Navigation';
 import {getOriginalMessage, isMoneyRequestAction} from '@libs/ReportActionsUtils';
+import {getTransactionThreadReportPrimaryAction} 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 +38,9 @@ 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 DecisionModal from './DecisionModal';
 import HeaderWithBackButton from './HeaderWithBackButton';
 import Icon from './Icon';
 import * as Expensicons from './Icon/Expensicons';
@@ -67,6 +75,7 @@ function MoneyRequestHeader({report, parentReportAction, policy, onBackButtonPre
     );
     const transactionViolations = useTransactionViolations(transaction?.transactionID);
 
+    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);
@@ -83,7 +92,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);
@@ -138,12 +146,101 @@ function MoneyRequestHeader({report, parentReportAction, policy, onBackButtonPre
         Navigation.navigate(ROUTES.PROCESS_MONEY_REQUEST_HOLD.getRoute(Navigation.getReportRHPActiveRoute()));
     }, [dismissedHoldUseExplanation, isLoadingHoldUseExplained, isOnHold]);
 
+    if (!report || !parentReport || !transaction) {
+        return null;
+    }
+
+    const primaryAction = getTransactionThreadReportPrimaryAction(report, parentReport, transaction, transactionViolations, policy);
+
+    const primaryActionOptions = {
+        [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 = getSecondaryTransactionThreadActions(parentReport, transaction);
+
+    const secondaryActionsImpl: 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);
+            },
+        },
+        // todo should it download parent repot?
+        [CONST.REPORT.TRANSACTION_SECONDARY_ACTIONS.DOWNLOAD]: {
+            value: CONST.REPORT.TRANSACTION_SECONDARY_ACTIONS.DOWNLOAD,
+            text: translate('common.download'),
+            icon: Expensicons.Download,
+            onSelected: () => {
+                if (!reportID) {
+                    return;
+                }
+                exportReportToCSV({reportID, transactionIDList: [transaction.transactionID]}, () => {
+                    setDownloadErrorModalVisible(true);
+                });
+            },
+        },
+        [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: () => {
+                if (!parentReportAction) {
+                    throw new Error('Parent action does not exist');
+                }
+
+                deleteMoneyRequest(transaction?.transactionID, parentReportAction);
+            },
+        },
+    };
+
+    const applicableSecondaryActions = secondaryActions.map((action) => secondaryActionsImpl[action]);
+
     return (
         <View style={[styles.pl0, styles.borderBottom]}>
             <HeaderWithBackButton
                 shouldShowBorderBottom={false}
                 shouldShowReportAvatarWithDisplay
-                shouldEnableDetailPageNavigation
                 shouldShowPinButton={false}
                 report={
                     reportID
@@ -159,51 +256,36 @@ function MoneyRequestHeader({report, parentReportAction, policy, onBackButtonPre
                 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()));
-                        }}
-                    />
+                {!shouldUseNarrowLayout && (
+                    <View style={[styles.flexRow, styles.gap2]}>
+                        {!!primaryAction && primaryActionOptions[primaryAction]}
+                        {!!secondaryActions.length && (
+                            <ButtonWithDropdownMenu
+                                success={false}
+                                onPress={() => {}}
+                                shouldAlwaysShowDropdownMenu
+                                customText="More"
+                                options={applicableSecondaryActions}
+                                isSplitButton={false}
+                            />
+                        )}
+                    </View>
                 )}
             </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]}>{primaryActionOptions[primaryAction]}</View>}
+                    {!!secondaryActions.length && (
+                        <ButtonWithDropdownMenu
+                            success={false}
+                            onPress={() => {}}
+                            shouldAlwaysShowDropdownMenu
+                            customText="More"
+                            options={applicableSecondaryActions}
+                            isSplitButton={false}
+                            wrapperStyle={[!primaryAction && styles.flexGrow4]}
+                        />
+                    )}
                 </View>
             )}
             {!!statusBarProps && (
@@ -215,6 +297,15 @@ 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)}
+            />
         </View>
     );
 }
diff --git a/src/libs/ReportPrimaryActionUtils.ts b/src/libs/ReportPrimaryActionUtils.ts
index 2589373f9bc8..b4c6c843a4c7 100644
--- a/src/libs/ReportPrimaryActionUtils.ts
+++ b/src/libs/ReportPrimaryActionUtils.ts
@@ -262,17 +262,17 @@ function getTransactionThreadReportPrimaryAction(
     reportTransaction: Transaction,
     violations: TransactionViolation[],
     policy?: Policy,
-): ValueOf<typeof CONST.TRANSACTION.TRANSACTION_PRIMARY_ACTIONS> | '' {
+): ValueOf<typeof CONST.REPORT.TRANSACTION_PRIMARY_ACTIONS> | '' {
     if (isHoldCreator(reportTransaction, transactionThreadReport.reportID)) {
-        return CONST.TRANSACTION.TRANSACTION_PRIMARY_ACTIONS.REMOVE_HOLD;
+        return CONST.REPORT.TRANSACTION_PRIMARY_ACTIONS.REMOVE_HOLD;
     }
 
     if (isReviewDuplicatesAction(parentReport, [reportTransaction], policy)) {
-        return CONST.TRANSACTION.TRANSACTION_PRIMARY_ACTIONS.REVIEW_DUPLICATES;
+        return CONST.REPORT.TRANSACTION_PRIMARY_ACTIONS.REVIEW_DUPLICATES;
     }
 
     if (isMarkAsCashActionForTransaction(parentReport, violations, policy)) {
-        return CONST.TRANSACTION.TRANSACTION_PRIMARY_ACTIONS.MARK_AS_CASH;
+        return CONST.REPORT.TRANSACTION_PRIMARY_ACTIONS.MARK_AS_CASH;
     }
 
     return '';
diff --git a/src/libs/ReportSecondaryActionUtils.ts b/src/libs/ReportSecondaryActionUtils.ts
index e30748122799..004328782e41 100644
--- a/src/libs/ReportSecondaryActionUtils.ts
+++ b/src/libs/ReportSecondaryActionUtils.ts
@@ -31,7 +31,7 @@ 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) {
@@ -58,7 +58,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);
@@ -84,7 +84,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});
@@ -93,6 +93,8 @@ function isUnapproveAction(report: Report, policy: Policy): boolean {
 }
 
 function isCancelPaymentAction(report: Report, reportTransactions: Transaction[]): boolean {
+    // TODO Can user that is not admin/approver cancel the payment?
+
     const isExpenseReport = isExpenseReportUtils(report);
 
     if (!isExpenseReport) {
@@ -125,7 +127,17 @@ 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;
+    }
+
+    // TODO this check should be here otherwise there will be option to export invoice to the nowhere
+    const hasAccountingConnection = hasAccountingConnections(policy);
+    if (!hasAccountingConnection) {
+        return false;
+    }
+
     const isInvoiceReport = isInvoiceReportUtils(report);
     const isReportSender = isCurrentUserSubmitter(report.reportID);
 
@@ -135,9 +147,7 @@ function isExportAction(report: Report, policy: Policy): boolean {
 
     const isExpenseReport = isExpenseReportUtils(report);
 
-    const hasAccountingConnection = hasAccountingConnections(policy);
-
-    if (!isExpenseReport || !hasAccountingConnection) {
+    if (!isExpenseReport) {
         return false;
     }
 
@@ -160,7 +170,17 @@ function isExportAction(report: Report, policy: Policy): boolean {
     return isAdmin && isReportFinished && syncEnabled && !isReportExported;
 }
 
-function isMarkAsExportedAction(report: Report, policy: Policy): boolean {
+function isMarkAsExportedAction(report: Report, policy?: Policy): boolean {
+    if (!policy) {
+        return false;
+    }
+
+    // TODO check for accounting connection should be done here otherwise export button will show for any approved report
+    const hasAccountingConnection = hasAccountingConnections(policy);
+    if (!hasAccountingConnection) {
+        return false;
+    }
+
     const isInvoiceReport = isInvoiceReportUtils(report);
     const isReportSender = isCurrentUserSubmitter(report.reportID);
 
@@ -184,50 +204,63 @@ 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 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);
 
     if (isExpenseReport && isReportSubmitter && !areWorkflowsEnabled && isClosedReport) {
@@ -301,11 +334,11 @@ function isDeleteAction(report: Report): boolean {
     return isReportOpen || isProcessingReport || isReportApproved;
 }
 
-function getSecondaryActions(
+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>> = [];
 
@@ -313,7 +346,7 @@ function getSecondaryActions(
         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);
     }
 
@@ -339,7 +372,7 @@ function getSecondaryActions(
 
     options.push(CONST.REPORT.SECONDARY_ACTIONS.DOWNLOAD);
 
-    if (isChangeWorkspaceAction(report, policy, reportTransactions, violations)) {
+    if (isChangeWorkspaceAction(report, reportTransactions, violations, policy)) {
         options.push(CONST.REPORT.SECONDARY_ACTIONS.CHANGE_WORKSPACE);
     }
 
@@ -352,4 +385,22 @@ function getSecondaryActions(
     return options;
 }
 
-export default getSecondaryActions;
+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.DOWNLOAD);
+
+    options.push(CONST.REPORT.TRANSACTION_SECONDARY_ACTIONS.VIEW_DETAILS);
+
+    if (isDeleteAction(parentReport)) {
+        options.push(CONST.REPORT.TRANSACTION_SECONDARY_ACTIONS.DELETE);
+    }
+
+    return options;
+}
+export default getSecondaryReportActions;
+export {getSecondaryTransactionThreadActions};

From f2fcb83c68885745bd21fc41104225fc1067b8fc Mon Sep 17 00:00:00 2001
From: Jan Nowakowski <janeknowakowski9@gmail.com>
Date: Wed, 19 Mar 2025 16:52:42 +0100
Subject: [PATCH 13/54] fix tests

---
 tests/unit/ReportSecondaryActionUtilsTest.ts | 71 +++++++++++---------
 1 file changed, 41 insertions(+), 30 deletions(-)

diff --git a/tests/unit/ReportSecondaryActionUtilsTest.ts b/tests/unit/ReportSecondaryActionUtilsTest.ts
index 682109465b17..9c5987a110d8 100644
--- a/tests/unit/ReportSecondaryActionUtilsTest.ts
+++ b/tests/unit/ReportSecondaryActionUtilsTest.ts
@@ -1,5 +1,5 @@
 import Onyx from 'react-native-onyx';
-import getSecondaryActions from '@libs/ReportSecondaryActionUtils';
+import getSecondaryReportActions from '@libs/ReportSecondaryActionUtils';
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
 import type {Policy, Report, ReportAction, Transaction, TransactionViolation} from '@src/types/onyx';
@@ -38,7 +38,7 @@ describe('getSecondaryAction', () => {
         const policy = {} as unknown as Policy;
 
         const result = [CONST.REPORT.SECONDARY_ACTIONS.DOWNLOAD, CONST.REPORT.SECONDARY_ACTIONS.VIEW_DETAILS];
-        expect(getSecondaryActions(report, policy, [], {})).toEqual(result);
+        expect(getSecondaryReportActions(report, [], {}, policy)).toEqual(result);
     });
 
     it('includes SUBMIT option', async () => {
@@ -57,7 +57,7 @@ describe('getSecondaryAction', () => {
         } as unknown as Policy;
         await Onyx.merge(`${ONYXKEYS.COLLECTION.REPORT}${REPORT_ID}`, report);
 
-        const result = getSecondaryActions(report, policy, [], {});
+        const result = getSecondaryReportActions(report, [], {}, policy);
         expect(result.includes(CONST.REPORT.SECONDARY_ACTIONS.SUBMIT)).toBe(true);
     });
 
@@ -87,7 +87,7 @@ describe('getSecondaryAction', () => {
 
         await Onyx.merge(`${ONYXKEYS.COLLECTION.REPORT}${REPORT_ID}`, report);
 
-        const result = getSecondaryActions(report, policy, [transaction], {});
+        const result = getSecondaryReportActions(report, [transaction], {}, policy);
         expect(result.includes(CONST.REPORT.SECONDARY_ACTIONS.APPROVE)).toBe(true);
     });
 
@@ -112,7 +112,7 @@ describe('getSecondaryAction', () => {
             },
         } as unknown as TransactionViolation;
 
-        const result = getSecondaryActions(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);
     });
 
@@ -138,7 +138,7 @@ describe('getSecondaryAction', () => {
             },
         } as unknown as TransactionViolation;
 
-        const result = getSecondaryActions(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);
     });
 
@@ -152,7 +152,7 @@ describe('getSecondaryAction', () => {
         } as unknown as Report;
         const policy = {approver: CURRENT_USER_EMAIL} as unknown as Policy;
 
-        const result = getSecondaryActions(report, policy, [], {});
+        const result = getSecondaryReportActions(report, [], {}, policy);
         expect(result.includes(CONST.REPORT.SECONDARY_ACTIONS.UNAPPROVE)).toBe(true);
     });
 
@@ -166,7 +166,7 @@ describe('getSecondaryAction', () => {
         } as unknown as Report;
         const policy = {} as unknown as Policy;
 
-        const result = getSecondaryActions(report, policy, [], {});
+        const result = getSecondaryReportActions(report, [], {}, policy);
         expect(result.includes(CONST.REPORT.SECONDARY_ACTIONS.CANCEL_PAYMENT)).toBe(true);
     });
 
@@ -193,15 +193,15 @@ describe('getSecondaryAction', () => {
         } as unknown as ReportAction;
         await Onyx.merge(`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${REPORT_ID}`, {[ACTION_ID]: reportAction});
 
-        const result = getSecondaryActions(
+        const result = getSecondaryReportActions(
             report,
-            policy,
             [
                 {
                     transactionID: TRANSACTION_ID,
                 } as unknown as Transaction,
             ],
             {},
+            policy,
         );
         expect(result.includes(CONST.REPORT.SECONDARY_ACTIONS.CANCEL_PAYMENT)).toBe(true);
     });
@@ -212,10 +212,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 = getSecondaryActions(report, policy, [], {});
+        const result = getSecondaryReportActions(report, [], {}, policy);
         expect(result.includes(CONST.REPORT.SECONDARY_ACTIONS.EXPORT_TO_ACCOUNTING)).toBe(true);
     });
 
@@ -233,7 +237,7 @@ describe('getSecondaryAction', () => {
             connections: {[CONST.POLICY.CONNECTIONS.NAME.QBD]: {}},
         } as unknown as Policy;
 
-        const result = getSecondaryActions(report, policy, [], {});
+        const result = getSecondaryReportActions(report, [], {}, policy);
         expect(result.includes(CONST.REPORT.SECONDARY_ACTIONS.EXPORT_TO_ACCOUNTING)).toBe(true);
     });
 
@@ -250,7 +254,7 @@ describe('getSecondaryAction', () => {
             connections: {[CONST.POLICY.CONNECTIONS.NAME.QBD]: {config: {autosync: {enabled: true}}}},
         } as unknown as Policy;
 
-        const result = getSecondaryActions(report, policy, [], {});
+        const result = getSecondaryReportActions(report, [], {}, policy);
         expect(result.includes(CONST.REPORT.SECONDARY_ACTIONS.EXPORT_TO_ACCOUNTING)).toBe(true);
     });
 
@@ -260,10 +264,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 = getSecondaryActions(report, policy, [], {});
+        const result = getSecondaryReportActions(report, [], {}, policy);
         expect(result.includes(CONST.REPORT.SECONDARY_ACTIONS.MARK_AS_EXPORTED)).toBe(true);
     });
 
@@ -278,9 +284,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 = getSecondaryActions(report, policy, [], {});
+        const result = getSecondaryReportActions(report, [], {}, policy);
         expect(result.includes(CONST.REPORT.SECONDARY_ACTIONS.MARK_AS_EXPORTED)).toBe(true);
     });
 
@@ -297,7 +304,7 @@ describe('getSecondaryAction', () => {
             connections: {[CONST.POLICY.CONNECTIONS.NAME.QBD]: {config: {autosync: {enabled: true}}}},
         } as unknown as Policy;
 
-        const result = getSecondaryActions(report, policy, [], {});
+        const result = getSecondaryReportActions(report, [], {}, policy);
         expect(result.includes(CONST.REPORT.SECONDARY_ACTIONS.MARK_AS_EXPORTED)).toBe(true);
     });
 
@@ -310,10 +317,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 = getSecondaryActions(report, policy, [], {});
+        const result = getSecondaryReportActions(report, [], {}, policy);
         expect(result.includes(CONST.REPORT.SECONDARY_ACTIONS.MARK_AS_EXPORTED)).toBe(true);
     });
 
@@ -322,12 +329,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 = getSecondaryActions(report, policy, [], {});
+        const result = getSecondaryReportActions(report, [transaction], {}, policy);
         expect(result.includes(CONST.REPORT.SECONDARY_ACTIONS.HOLD)).toBe(true);
     });
 
@@ -343,7 +354,7 @@ describe('getSecondaryAction', () => {
         } as unknown as Policy;
         await Onyx.merge(`${ONYXKEYS.COLLECTION.REPORT}${REPORT_ID}`, report);
 
-        const result = getSecondaryActions(report, policy, [], {});
+        const result = getSecondaryReportActions(report, [], {}, policy);
         expect(result.includes(CONST.REPORT.SECONDARY_ACTIONS.CHANGE_WORKSPACE)).toBe(true);
     });
 
@@ -358,7 +369,7 @@ describe('getSecondaryAction', () => {
         const policy = {} as unknown as Policy;
         await Onyx.merge(`${ONYXKEYS.COLLECTION.REPORT}${REPORT_ID}`, report);
 
-        const result = getSecondaryActions(report, policy, [], {});
+        const result = getSecondaryReportActions(report, [], {}, policy);
         expect(result.includes(CONST.REPORT.SECONDARY_ACTIONS.CHANGE_WORKSPACE)).toBe(true);
     });
 
@@ -374,7 +385,7 @@ describe('getSecondaryAction', () => {
             approver: CURRENT_USER_EMAIL,
         } as unknown as Policy;
 
-        const result = getSecondaryActions(report, policy, [], {});
+        const result = getSecondaryReportActions(report, [], {}, policy);
         expect(result.includes(CONST.REPORT.SECONDARY_ACTIONS.CHANGE_WORKSPACE)).toBe(true);
     });
 
@@ -390,7 +401,7 @@ describe('getSecondaryAction', () => {
             role: CONST.POLICY.ROLE.ADMIN,
         } as unknown as Policy;
 
-        const result = getSecondaryActions(report, policy, [], {});
+        const result = getSecondaryReportActions(report, [], {}, policy);
         expect(result.includes(CONST.REPORT.SECONDARY_ACTIONS.CHANGE_WORKSPACE)).toBe(true);
     });
 
@@ -405,7 +416,7 @@ describe('getSecondaryAction', () => {
             role: CONST.POLICY.ROLE.ADMIN,
         } as unknown as Policy;
 
-        const result = getSecondaryActions(report, policy, [], {});
+        const result = getSecondaryReportActions(report, [], {}, policy);
         expect(result.includes(CONST.REPORT.SECONDARY_ACTIONS.CHANGE_WORKSPACE)).toBe(true);
     });
 
@@ -423,7 +434,7 @@ describe('getSecondaryAction', () => {
         } as unknown as Policy;
         await Onyx.merge(`${ONYXKEYS.COLLECTION.POLICY}${POLICY_ID}`, policy);
 
-        const result = getSecondaryActions(report, {} as Policy, [], {});
+        const result = getSecondaryReportActions(report, [], {}, policy);
         expect(result.includes(CONST.REPORT.SECONDARY_ACTIONS.CHANGE_WORKSPACE)).toBe(true);
     });
 
@@ -438,7 +449,7 @@ describe('getSecondaryAction', () => {
         const policy = {} as unknown as Policy;
         await Onyx.merge(`${ONYXKEYS.COLLECTION.REPORT}${REPORT_ID}`, report);
 
-        const result = getSecondaryActions(report, policy, [], {});
+        const result = getSecondaryReportActions(report, [], {}, policy);
         expect(result.includes(CONST.REPORT.SECONDARY_ACTIONS.DELETE)).toBe(true);
     });
 });

From a30537afd8bc127aa4404fbc382581ec1f9d22c5 Mon Sep 17 00:00:00 2001
From: Jan Nowakowski <janeknowakowski9@gmail.com>
Date: Wed, 19 Mar 2025 17:14:21 +0100
Subject: [PATCH 14/54] Fix linter

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

diff --git a/src/libs/TransactionUtils/index.ts b/src/libs/TransactionUtils/index.ts
index d89c858b64e7..f6811d985e9c 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 {
-    getReportTransactions,
-    isCurrentUserSubmitter,
-    isOpenExpenseReport,
-    isProcessingReport,
-    isReportApproved,
-    isReportIDApproved,
-    isReportManuallyReimbursed,
-    isSettled,
-    isTestTransactionReport,
-    isThread,
-} from '@libs/ReportUtils';
+import {getReportTransactions, isCurrentUserSubmitter, isOpenExpenseReport, isProcessingReport, isReportIDApproved, isSettled, isTestTransactionReport, isThread} from '@libs/ReportUtils';
 import type {IOURequestType} from '@userActions/IOU';
 import CONST from '@src/CONST';
 import type {IOUType} from '@src/CONST';

From f2b5417fbfbc9171a29303e2b94e5117b18f81ea Mon Sep 17 00:00:00 2001
From: Jan Nowakowski <janeknowakowski9@gmail.com>
Date: Thu, 20 Mar 2025 12:46:16 +0100
Subject: [PATCH 15/54] Further improvments

---
 src/CONST.ts                           |  1 -
 src/components/MoneyReportHeader.tsx   | 44 +++++++++++++++++-----
 src/components/MoneyRequestHeader.tsx  | 52 ++++++++++++++------------
 src/libs/PolicyUtils.ts                |  5 +++
 src/libs/ReportSecondaryActionUtils.ts | 26 +++++++++----
 5 files changed, 86 insertions(+), 42 deletions(-)

diff --git a/src/CONST.ts b/src/CONST.ts
index 36dd4560242a..0385fb920c1f 100755
--- a/src/CONST.ts
+++ b/src/CONST.ts
@@ -1177,7 +1177,6 @@ const CONST = {
         },
         TRANSACTION_SECONDARY_ACTIONS: {
             HOLD: 'hold',
-            DOWNLOAD: 'download',
             VIEW_DETAILS: 'viewDetails',
             DELETE: 'delete',
         },
diff --git a/src/components/MoneyReportHeader.tsx b/src/components/MoneyReportHeader.tsx
index 7b657f8fa49e..609dedefccac 100644
--- a/src/components/MoneyReportHeader.tsx
+++ b/src/components/MoneyReportHeader.tsx
@@ -52,6 +52,7 @@ import {
     cancelPayment,
     canIOUBePaid as canIOUBePaidAction,
     deleteMoneyRequest,
+    getNavigationUrlOnMoneyRequestDelete,
     getNextApproverAccountID,
     payInvoice,
     payMoneyRequest,
@@ -62,6 +63,7 @@ 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';
@@ -134,6 +136,7 @@ function MoneyReportHeader({policy, report: moneyRequestReport, transactionThrea
 
     const [downloadErrorModalVisible, setDownloadErrorModalVisible] = useState(false);
     const [isCancelPaymentModalVisible, setIsCancelPaymentModalVisible] = useState(false);
+    const [isDeleteModalVisible, setIsDeleteModalVisible] = useState(false);
 
     const {isPaidAnimationRunning, isApprovedAnimationRunning, startAnimation, startApprovedAnimation} = usePaymentAnimations();
     const styles = useThemeStyles();
@@ -496,14 +499,7 @@ function MoneyReportHeader({policy, report: moneyRequestReport, transactionThrea
             icon: Expensicons.Trashcan,
             value: CONST.REPORT.SECONDARY_ACTIONS.DELETE,
             onSelected: () => {
-                if (transactionThreadReportID) {
-                    if (!requestParentReportAction) {
-                        throw new Error('requestParentReportAction is not defined');
-                    }
-                    deleteMoneyRequest(transaction?.transactionID, requestParentReportAction);
-                } else {
-                    // TODO waiting for https://github.com/Expensify/App/pull/58020/files
-                }
+                setIsDeleteModalVisible(true);
             },
         },
     };
@@ -532,7 +528,7 @@ function MoneyReportHeader({policy, report: moneyRequestReport, transactionThrea
                                 success={false}
                                 onPress={() => {}}
                                 shouldAlwaysShowDropdownMenu
-                                customText="More"
+                                customText={translate('common.more')}
                                 options={applicableSecondaryActions}
                                 isSplitButton={false}
                             />
@@ -548,7 +544,7 @@ function MoneyReportHeader({policy, report: moneyRequestReport, transactionThrea
                             success={false}
                             onPress={() => {}}
                             shouldAlwaysShowDropdownMenu
-                            customText="More"
+                            customText={translate('common.more')}
                             options={applicableSecondaryActions}
                             isSplitButton={false}
                             wrapperStyle={[!primaryAction && styles.flexGrow4]}
@@ -617,6 +613,34 @@ function MoneyReportHeader({policy, report: moneyRequestReport, transactionThrea
                 danger
                 shouldEnableNewFocusManagement
             />
+            <ConfirmModal
+                title={translate('iou.deleteExpense', {count: 1})}
+                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);
+                    } else {
+                        // TODO waiting for https://github.com/Expensify/App/pull/58020/files
+                    }
+
+                    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/MoneyRequestHeader.tsx b/src/components/MoneyRequestHeader.tsx
index 537822eb72a8..10358166ae3d 100644
--- a/src/components/MoneyRequestHeader.tsx
+++ b/src/components/MoneyRequestHeader.tsx
@@ -10,8 +10,7 @@ import useResponsiveLayout from '@hooks/useResponsiveLayout';
 import useTheme from '@hooks/useTheme';
 import useThemeStyles from '@hooks/useThemeStyles';
 import useTransactionViolations from '@hooks/useTransactionViolations';
-import {deleteMoneyRequest} from '@libs/actions/IOU';
-import {exportReportToCSV} from '@libs/actions/Report';
+import {deleteMoneyRequest, getNavigationUrlOnMoneyRequestDelete} from '@libs/actions/IOU';
 import Navigation from '@libs/Navigation/Navigation';
 import {getOriginalMessage, isMoneyRequestAction} from '@libs/ReportActionsUtils';
 import {getTransactionThreadReportPrimaryAction} from '@libs/ReportPrimaryActionUtils';
@@ -40,6 +39,7 @@ 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';
@@ -75,6 +75,7 @@ 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);
@@ -198,20 +199,6 @@ function MoneyRequestHeader({report, parentReportAction, policy, onBackButtonPre
                 changeMoneyRequestHoldStatus(parentReportAction);
             },
         },
-        // todo should it download parent repot?
-        [CONST.REPORT.TRANSACTION_SECONDARY_ACTIONS.DOWNLOAD]: {
-            value: CONST.REPORT.TRANSACTION_SECONDARY_ACTIONS.DOWNLOAD,
-            text: translate('common.download'),
-            icon: Expensicons.Download,
-            onSelected: () => {
-                if (!reportID) {
-                    return;
-                }
-                exportReportToCSV({reportID, transactionIDList: [transaction.transactionID]}, () => {
-                    setDownloadErrorModalVisible(true);
-                });
-            },
-        },
         [CONST.REPORT.TRANSACTION_SECONDARY_ACTIONS.VIEW_DETAILS]: {
             value: CONST.REPORT.SECONDARY_ACTIONS.VIEW_DETAILS,
             text: translate('iou.viewDetails'),
@@ -225,11 +212,7 @@ function MoneyRequestHeader({report, parentReportAction, policy, onBackButtonPre
             icon: Expensicons.Trashcan,
             value: CONST.REPORT.SECONDARY_ACTIONS.DELETE,
             onSelected: () => {
-                if (!parentReportAction) {
-                    throw new Error('Parent action does not exist');
-                }
-
-                deleteMoneyRequest(transaction?.transactionID, parentReportAction);
+                setIsDeleteModalVisible(true);
             },
         },
     };
@@ -264,7 +247,7 @@ function MoneyRequestHeader({report, parentReportAction, policy, onBackButtonPre
                                 success={false}
                                 onPress={() => {}}
                                 shouldAlwaysShowDropdownMenu
-                                customText="More"
+                                customText={translate('common.more')}
                                 options={applicableSecondaryActions}
                                 isSplitButton={false}
                             />
@@ -280,7 +263,7 @@ function MoneyRequestHeader({report, parentReportAction, policy, onBackButtonPre
                             success={false}
                             onPress={() => {}}
                             shouldAlwaysShowDropdownMenu
-                            customText="More"
+                            customText={translate('common.more')}
                             options={applicableSecondaryActions}
                             isSplitButton={false}
                             wrapperStyle={[!primaryAction && styles.flexGrow4]}
@@ -306,6 +289,29 @@ function MoneyRequestHeader({report, parentReportAction, policy, onBackButtonPre
                 isVisible={downloadErrorModalVisible}
                 onClose={() => setDownloadErrorModalVisible(false)}
             />
+            <ConfirmModal
+                title={translate('iou.deleteExpense', {count: 1})}
+                isVisible={isDeleteModalVisible}
+                onConfirm={() => {
+                    setIsDeleteModalVisible(false);
+                    if (!parentReportAction) {
+                        throw new Error('Parent action does not exist');
+                    }
+
+                    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/libs/PolicyUtils.ts b/src/libs/PolicyUtils.ts
index 7ea2555259ff..361b73204982 100644
--- a/src/libs/PolicyUtils.ts
+++ b/src/libs/PolicyUtils.ts
@@ -1232,6 +1232,10 @@ function getAllPoliciesLength() {
     return Object.keys(allPolicies ?? {}).length;
 }
 
+function getAllPolicies(): Policy[] {
+    return Object.values(allPolicies ?? {}).filter((p) => !!p);
+}
+
 function getActivePolicy(): OnyxEntry<Policy> {
     return getPolicy(activePolicyId);
 }
@@ -1510,6 +1514,7 @@ export {
     getWorkflowApprovalsUnavailable,
     getNetSuiteImportCustomFieldLabel,
     getAllPoliciesLength,
+    getAllPolicies,
     getActivePolicy,
     getUserFriendlyWorkspaceType,
     isPolicyAccessible,
diff --git a/src/libs/ReportSecondaryActionUtils.ts b/src/libs/ReportSecondaryActionUtils.ts
index 004328782e41..3e72f7e6db67 100644
--- a/src/libs/ReportSecondaryActionUtils.ts
+++ b/src/libs/ReportSecondaryActionUtils.ts
@@ -3,15 +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,
     isPrefferedExporter,
+    isWorkspaceEligibleForReportChange,
 } from './PolicyUtils';
 import {getIOUActionForReportID, getReportActions, isPayAction} from './ReportActionsUtils';
 import {
@@ -92,15 +94,20 @@ function isUnapproveAction(report: Report, policy?: Policy): boolean {
     return isExpenseReport && isReportApprover && isReportApproved;
 }
 
-function isCancelPaymentAction(report: Report, reportTransactions: Transaction[]): boolean {
-    // TODO Can user that is not admin/approver cancel the payment?
-
+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) {
@@ -132,7 +139,6 @@ function isExportAction(report: Report, policy?: Policy): boolean {
         return false;
     }
 
-    // TODO this check should be here otherwise there will be option to export invoice to the nowhere
     const hasAccountingConnection = hasAccountingConnections(policy);
     if (!hasAccountingConnection) {
         return false;
@@ -175,7 +181,6 @@ function isMarkAsExportedAction(report: Report, policy?: Policy): boolean {
         return false;
     }
 
-    // TODO check for accounting connection should be done here otherwise export button will show for any approved report
     const hasAccountingConnection = hasAccountingConnections(policy);
     if (!hasAccountingConnection) {
         return false;
@@ -263,6 +268,13 @@ function isChangeWorkspaceAction(report: Report, reportTransactions: Transaction
     const areWorkflowsEnabled = !!(policy && policy.areWorkflowsEnabled);
     const isClosedReport = isClosedReportUtils(report);
 
+    const policies = getAllPolicies();
+    const policiesEligibleForChange = policies.filter((newPolicy) => isWorkspaceEligibleForReportChange(newPolicy, report, policy, getCurrentUserEmail()));
+
+    if (policiesEligibleForChange.length <= 1) {
+        return false;
+    }
+
     if (isExpenseReport && isReportSubmitter && !areWorkflowsEnabled && isClosedReport) {
         return true;
     }
@@ -392,8 +404,6 @@ function getSecondaryTransactionThreadActions(parentReport: Report, reportTransa
         options.push(CONST.REPORT.TRANSACTION_SECONDARY_ACTIONS.HOLD);
     }
 
-    options.push(CONST.REPORT.TRANSACTION_SECONDARY_ACTIONS.DOWNLOAD);
-
     options.push(CONST.REPORT.TRANSACTION_SECONDARY_ACTIONS.VIEW_DETAILS);
 
     if (isDeleteAction(parentReport)) {

From 4b7007a7268670d72fe65853e96aa933cd77a23c Mon Sep 17 00:00:00 2001
From: Jan Nowakowski <janeknowakowski9@gmail.com>
Date: Thu, 20 Mar 2025 13:18:15 +0100
Subject: [PATCH 16/54] Tests for transactions primary actions

---
 src/components/MoneyReportHeader.tsx          |   2 +-
 src/components/MoneyRequestHeader.tsx         |   4 +-
 src/libs/ReportPrimaryActionUtils.ts          |   4 +-
 tests/actions/ReportPrimaryActionUtilsTest.ts | 128 +++++++++++++++++-
 4 files changed, 131 insertions(+), 7 deletions(-)

diff --git a/src/components/MoneyReportHeader.tsx b/src/components/MoneyReportHeader.tsx
index 609dedefccac..cf4a639c5bdb 100644
--- a/src/components/MoneyReportHeader.tsx
+++ b/src/components/MoneyReportHeader.tsx
@@ -17,7 +17,7 @@ import {buildOptimisticNextStepForPreventSelfApprovalsEnabled} from '@libs/NextS
 import {getConnectedIntegration} from '@libs/PolicyUtils';
 import {getOriginalMessage, getReportAction, isMoneyRequestAction} from '@libs/ReportActionsUtils';
 import {getReportPrimaryAction} from '@libs/ReportPrimaryActionUtils';
-import getSecondaryReportActions from '@libs/ReportSecondaryActionUtils';
+import {getSecondaryReportActions} from '@libs/ReportSecondaryActionUtils';
 import {
     changeMoneyRequestHoldStatus,
     getArchiveReason,
diff --git a/src/components/MoneyRequestHeader.tsx b/src/components/MoneyRequestHeader.tsx
index 10358166ae3d..6c027ec2a22e 100644
--- a/src/components/MoneyRequestHeader.tsx
+++ b/src/components/MoneyRequestHeader.tsx
@@ -13,7 +13,7 @@ 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 {getTransactionThreadReportPrimaryAction} from '@libs/ReportPrimaryActionUtils';
+import {getTransactionThreadPrimaryAction} from '@libs/ReportPrimaryActionUtils';
 import {getSecondaryTransactionThreadActions} from '@libs/ReportSecondaryActionUtils';
 import {changeMoneyRequestHoldStatus, navigateToDetailsPage} from '@libs/ReportUtils';
 import {
@@ -151,7 +151,7 @@ function MoneyRequestHeader({report, parentReportAction, policy, onBackButtonPre
         return null;
     }
 
-    const primaryAction = getTransactionThreadReportPrimaryAction(report, parentReport, transaction, transactionViolations, policy);
+    const primaryAction = getTransactionThreadPrimaryAction(report, parentReport, transaction, transactionViolations, policy);
 
     const primaryActionOptions = {
         [CONST.REPORT.TRANSACTION_PRIMARY_ACTIONS.REMOVE_HOLD]: (
diff --git a/src/libs/ReportPrimaryActionUtils.ts b/src/libs/ReportPrimaryActionUtils.ts
index b4c6c843a4c7..39494097fd1e 100644
--- a/src/libs/ReportPrimaryActionUtils.ts
+++ b/src/libs/ReportPrimaryActionUtils.ts
@@ -256,7 +256,7 @@ function isMarkAsCashActionForTransaction(parentReport: Report, violations: Tran
     return isReportSubmitter || isReportApprover || isAdmin;
 }
 
-function getTransactionThreadReportPrimaryAction(
+function getTransactionThreadPrimaryAction(
     transactionThreadReport: Report,
     parentReport: Report,
     reportTransaction: Transaction,
@@ -278,4 +278,4 @@ function getTransactionThreadReportPrimaryAction(
     return '';
 }
 
-export {getReportPrimaryAction, getTransactionThreadReportPrimaryAction};
+export {getReportPrimaryAction, getTransactionThreadPrimaryAction};
diff --git a/tests/actions/ReportPrimaryActionUtilsTest.ts b/tests/actions/ReportPrimaryActionUtilsTest.ts
index 96ec4f452b8f..308e6619b878 100644
--- a/tests/actions/ReportPrimaryActionUtilsTest.ts
+++ b/tests/actions/ReportPrimaryActionUtilsTest.ts
@@ -1,5 +1,5 @@
 import Onyx from 'react-native-onyx';
-import {getReportPrimaryAction} 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';
@@ -197,7 +197,6 @@ describe('getPrimaryAction', () => {
             },
         } as unknown as TransactionViolation;
 
-        getReportPrimaryAction(report, [transaction], {[`${ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS}${TRANSACTION_ID}`]: [violation]}, policy as Policy);
         expect(getReportPrimaryAction(report, [transaction], {[`${ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS}${TRANSACTION_ID}`]: [violation]}, policy as Policy)).toBe(
             CONST.REPORT.PRIMARY_ACTIONS.MARK_AS_CASH,
         );
@@ -231,3 +230,128 @@ describe('getPrimaryAction', () => {
         );
     });
 });
+
+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 () => {
+        const report = {
+            reportID: REPORT_ID,
+            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 REPORT_ACTION_ID = 'REPORT_ACTION_ID';
+        const TRANSACTION_ID = 'TRANSACTION_ID';
+        const transaction = {
+            transactionID: TRANSACTION_ID,
+            comment: {
+                hold: REPORT_ACTION_ID,
+            },
+        } 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(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,
+        } 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;
+
+        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 () => {
+        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(getTransactionThreadPrimaryAction({} as Report, report, transaction, [violation], policy as Policy)).toBe(CONST.REPORT.TRANSACTION_PRIMARY_ACTIONS.MARK_AS_CASH);
+    });
+});

From 4d1277467f67f374fb6815e5bff6037ce16e0961 Mon Sep 17 00:00:00 2001
From: Jan Nowakowski <janeknowakowski9@gmail.com>
Date: Thu, 20 Mar 2025 14:09:03 +0100
Subject: [PATCH 17/54] fix tests

---
 src/libs/ReportSecondaryActionUtils.ts        |   8 +-
 .../EnforceActionExportRestrictions.ts        |   5 -
 .../ReportPrimaryActionUtilsTest.ts           |   0
 tests/unit/ReportSecondaryActionUtilsTest.ts  | 137 ++++++++++++++++--
 4 files changed, 131 insertions(+), 19 deletions(-)
 rename tests/{actions => unit}/ReportPrimaryActionUtilsTest.ts (100%)

diff --git a/src/libs/ReportSecondaryActionUtils.ts b/src/libs/ReportSecondaryActionUtils.ts
index 3e72f7e6db67..24d0aa613a1f 100644
--- a/src/libs/ReportSecondaryActionUtils.ts
+++ b/src/libs/ReportSecondaryActionUtils.ts
@@ -269,7 +269,8 @@ function isChangeWorkspaceAction(report: Report, reportTransactions: Transaction
     const isClosedReport = isClosedReportUtils(report);
 
     const policies = getAllPolicies();
-    const policiesEligibleForChange = policies.filter((newPolicy) => isWorkspaceEligibleForReportChange(newPolicy, report, policy, getCurrentUserEmail()));
+    const currentUserEmail = getCurrentUserEmail();
+    const policiesEligibleForChange = policies.filter((newPolicy) => isWorkspaceEligibleForReportChange(newPolicy, report, policy, currentUserEmail));
 
     if (policiesEligibleForChange.length <= 1) {
         return false;
@@ -366,7 +367,7 @@ function getSecondaryReportActions(
         options.push(CONST.REPORT.SECONDARY_ACTIONS.UNAPPROVE);
     }
 
-    if (isCancelPaymentAction(report, reportTransactions)) {
+    if (isCancelPaymentAction(report, reportTransactions, policy)) {
         options.push(CONST.REPORT.SECONDARY_ACTIONS.CANCEL_PAYMENT);
     }
 
@@ -412,5 +413,4 @@ function getSecondaryTransactionThreadActions(parentReport: Report, reportTransa
 
     return options;
 }
-export default getSecondaryReportActions;
-export {getSecondaryTransactionThreadActions};
+export {getSecondaryReportActions, getSecondaryTransactionThreadActions};
diff --git a/tests/actions/EnforceActionExportRestrictions.ts b/tests/actions/EnforceActionExportRestrictions.ts
index b8a64dd883d8..91d13b7fbe7c 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/ReportPrimaryActionUtilsTest.ts b/tests/unit/ReportPrimaryActionUtilsTest.ts
similarity index 100%
rename from tests/actions/ReportPrimaryActionUtilsTest.ts
rename to tests/unit/ReportPrimaryActionUtilsTest.ts
diff --git a/tests/unit/ReportSecondaryActionUtilsTest.ts b/tests/unit/ReportSecondaryActionUtilsTest.ts
index 9c5987a110d8..dd67c930b857 100644
--- a/tests/unit/ReportSecondaryActionUtilsTest.ts
+++ b/tests/unit/ReportSecondaryActionUtilsTest.ts
@@ -1,5 +1,5 @@
 import Onyx from 'react-native-onyx';
-import getSecondaryReportActions 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(() => {
@@ -164,7 +166,9 @@ 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 = getSecondaryReportActions(report, [], {}, policy);
         expect(result.includes(CONST.REPORT.SECONDARY_ACTIONS.CANCEL_PAYMENT)).toBe(true);
@@ -177,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);
 
@@ -349,10 +353,20 @@ 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 = getSecondaryReportActions(report, [], {}, policy);
         expect(result.includes(CONST.REPORT.SECONDARY_ACTIONS.CHANGE_WORKSPACE)).toBe(true);
@@ -366,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 = 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,
@@ -382,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 = 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,
@@ -398,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 = 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,
@@ -413,8 +459,18 @@ 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 = getSecondaryReportActions(report, [], {}, policy);
         expect(result.includes(CONST.REPORT.SECONDARY_ACTIONS.CHANGE_WORKSPACE)).toBe(true);
@@ -427,13 +483,20 @@ 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 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);
     });
@@ -453,3 +516,57 @@ describe('getSecondaryAction', () => {
         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 9c4a9f8c7d2f08264b1ba85ab84219cc57ad6f23 Mon Sep 17 00:00:00 2001
From: Jan Nowakowski <janeknowakowski9@gmail.com>
Date: Thu, 20 Mar 2025 14:52:52 +0100
Subject: [PATCH 18/54] Fix TS

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

diff --git a/src/libs/PolicyUtils.ts b/src/libs/PolicyUtils.ts
index 361b73204982..e70ce9234451 100644
--- a/src/libs/PolicyUtils.ts
+++ b/src/libs/PolicyUtils.ts
@@ -1232,7 +1232,7 @@ function getAllPoliciesLength() {
     return Object.keys(allPolicies ?? {}).length;
 }
 
-function getAllPolicies(): Policy[] {
+function getAllPolicies() {
     return Object.values(allPolicies ?? {}).filter((p) => !!p);
 }
 

From 0290a744be49a14ad18e6a5dac77c05f8cba6333 Mon Sep 17 00:00:00 2001
From: Jan Nowakowski <janeknowakowski9@gmail.com>
Date: Fri, 21 Mar 2025 08:31:26 +0100
Subject: [PATCH 19/54] add use memo

---
 src/components/MoneyReportHeader.tsx  | 49 ++++++++++++++++++++-------
 src/components/MoneyRequestHeader.tsx | 24 ++++++++-----
 2 files changed, 52 insertions(+), 21 deletions(-)

diff --git a/src/components/MoneyReportHeader.tsx b/src/components/MoneyReportHeader.tsx
index cf4a639c5bdb..afdb7324674c 100644
--- a/src/components/MoneyReportHeader.tsx
+++ b/src/components/MoneyReportHeader.tsx
@@ -317,18 +317,24 @@ function MoneyReportHeader({policy, report: moneyRequestReport, transactionThrea
         Navigation.navigate(ROUTES.PROCESS_MONEY_REQUEST_HOLD.getRoute(Navigation.getReportRHPActiveRoute()));
     }, [dismissedHoldUseExplanation, isLoadingHoldUseExplained, isOnHold]);
 
-    if (!moneyRequestReport) {
-        return null;
-    }
-
-    const primaryAction = getReportPrimaryAction(moneyRequestReport, transactions, violations, policy); // useMemo
+    const primaryAction = useMemo(() => {
+        if (!moneyRequestReport) {
+            return '';
+        }
+        return getReportPrimaryAction(moneyRequestReport, transactions, violations, policy);
+    }, [moneyRequestReport, policy, transactions, violations]);
 
     const primaryActions = {
         [CONST.REPORT.PRIMARY_ACTIONS.SUBMIT]: (
             <Button
                 success
                 text={translate('common.submit')}
-                onPress={() => submitReport(moneyRequestReport)}
+                onPress={() => {
+                    if (!moneyRequestReport) {
+                        return;
+                    }
+                    submitReport(moneyRequestReport);
+                }}
             />
         ),
         [CONST.REPORT.PRIMARY_ACTIONS.APPROVE]: (
@@ -361,7 +367,7 @@ function MoneyReportHeader({policy, report: moneyRequestReport, transactionThrea
                 // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
                 text={translate('workspace.common.exportIntegrationSelected', {connectionName: connectedIntegration!})}
                 onPress={() => {
-                    if (!connectedIntegration) {
+                    if (!connectedIntegration || !moneyRequestReport) {
                         return;
                     }
                     exportToIntegration(moneyRequestReport.reportID, connectedIntegration);
@@ -393,7 +399,12 @@ function MoneyReportHeader({policy, report: moneyRequestReport, transactionThrea
         ),
     };
 
-    const secondaryActions = getSecondaryReportActions(moneyRequestReport, transactions, violations, policy); // useMemo
+    const secondaryActions = useMemo(() => {
+        if (!moneyRequestReport) {
+            return [];
+        }
+        return getSecondaryReportActions(moneyRequestReport, transactions, violations, policy);
+    }, [moneyRequestReport, policy, transactions, violations]);
 
     const secondaryActionsImpl: Record<ValueOf<typeof CONST.REPORT.SECONDARY_ACTIONS>, DropdownOption<ValueOf<typeof CONST.REPORT.SECONDARY_ACTIONS>>> = {
         [CONST.REPORT.SECONDARY_ACTIONS.VIEW_DETAILS]: {
@@ -409,6 +420,9 @@ function MoneyReportHeader({policy, report: moneyRequestReport, transactionThrea
             text: translate('common.download'),
             icon: Expensicons.Download,
             onSelected: () => {
+                if (!moneyRequestReport) {
+                    return;
+                }
                 exportReportToCSV({reportID: moneyRequestReport.reportID, transactionIDList: transactionIDs}, () => {
                     setDownloadErrorModalVisible(true);
                 });
@@ -419,6 +433,9 @@ function MoneyReportHeader({policy, report: moneyRequestReport, transactionThrea
             text: translate('common.submit'),
             icon: Expensicons.Send,
             onSelected: () => {
+                if (!moneyRequestReport) {
+                    return;
+                }
                 submitReport(moneyRequestReport);
             },
         },
@@ -427,6 +444,9 @@ function MoneyReportHeader({policy, report: moneyRequestReport, transactionThrea
             icon: Expensicons.ThumbsUp,
             value: CONST.REPORT.SECONDARY_ACTIONS.APPROVE,
             onSelected: () => {
+                if (!moneyRequestReport) {
+                    return;
+                }
                 approveMoneyRequest(moneyRequestReport);
             },
         },
@@ -457,9 +477,10 @@ function MoneyReportHeader({policy, report: moneyRequestReport, transactionThrea
             icon: getIntegrationIcon(connectedIntegration),
             value: CONST.REPORT.SECONDARY_ACTIONS.EXPORT_TO_ACCOUNTING,
             onSelected: () => {
-                if (!connectedIntegration) {
-                    throw new Error('No connected integration');
+                if (!connectedIntegration || !moneyRequestReport) {
+                    throw new Error('Missing data');
                 }
+
                 exportToIntegration(moneyRequestReport.reportID, connectedIntegration);
             },
         },
@@ -468,9 +489,10 @@ function MoneyReportHeader({policy, report: moneyRequestReport, transactionThrea
             icon: Expensicons.CheckCircle,
             value: CONST.REPORT.SECONDARY_ACTIONS.MARK_AS_EXPORTED,
             onSelected: () => {
-                if (!connectedIntegration) {
-                    throw new Error('No connected integration');
+                if (!connectedIntegration || !moneyRequestReport) {
+                    throw new Error('Missing data');
                 }
+
                 markAsManuallyExported(moneyRequestReport.reportID, connectedIntegration);
             },
         },
@@ -491,6 +513,9 @@ function MoneyReportHeader({policy, report: moneyRequestReport, transactionThrea
             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));
             },
         },
diff --git a/src/components/MoneyRequestHeader.tsx b/src/components/MoneyRequestHeader.tsx
index 6c027ec2a22e..a7a9e19694e2 100644
--- a/src/components/MoneyRequestHeader.tsx
+++ b/src/components/MoneyRequestHeader.tsx
@@ -1,6 +1,6 @@
 import {useRoute} from '@react-navigation/native';
 import type {ReactNode} from 'react';
-import React, {useCallback, useEffect, 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';
@@ -147,11 +147,12 @@ function MoneyRequestHeader({report, parentReportAction, policy, onBackButtonPre
         Navigation.navigate(ROUTES.PROCESS_MONEY_REQUEST_HOLD.getRoute(Navigation.getReportRHPActiveRoute()));
     }, [dismissedHoldUseExplanation, isLoadingHoldUseExplained, isOnHold]);
 
-    if (!report || !parentReport || !transaction) {
-        return null;
-    }
-
-    const primaryAction = getTransactionThreadPrimaryAction(report, parentReport, transaction, transactionViolations, policy);
+    const primaryAction = useMemo(() => {
+        if (!report || !parentReport || !transaction) {
+            return '';
+        }
+        return getTransactionThreadPrimaryAction(report, parentReport, transaction, transactionViolations, policy);
+    }, [parentReport, policy, report, transaction, transactionViolations]);
 
     const primaryActionOptions = {
         [CONST.REPORT.TRANSACTION_PRIMARY_ACTIONS.REMOVE_HOLD]: (
@@ -184,7 +185,12 @@ function MoneyRequestHeader({report, parentReportAction, policy, onBackButtonPre
         ),
     };
 
-    const secondaryActions = getSecondaryTransactionThreadActions(parentReport, transaction);
+    const secondaryActions = useMemo(() => {
+        if (!parentReport || !transaction) {
+            return [];
+        }
+        return getSecondaryTransactionThreadActions(parentReport, transaction);
+    }, [parentReport, transaction]);
 
     const secondaryActionsImpl: Record<ValueOf<typeof CONST.REPORT.TRANSACTION_SECONDARY_ACTIONS>, DropdownOption<ValueOf<typeof CONST.REPORT.TRANSACTION_SECONDARY_ACTIONS>>> = {
         [CONST.REPORT.TRANSACTION_SECONDARY_ACTIONS.HOLD]: {
@@ -294,8 +300,8 @@ function MoneyRequestHeader({report, parentReportAction, policy, onBackButtonPre
                 isVisible={isDeleteModalVisible}
                 onConfirm={() => {
                     setIsDeleteModalVisible(false);
-                    if (!parentReportAction) {
-                        throw new Error('Parent action does not exist');
+                    if (!parentReportAction || !transaction) {
+                        throw new Error('Data missing');
                     }
 
                     deleteMoneyRequest(transaction?.transactionID, parentReportAction);

From 191524e4f7f2a52bbdaf0a9ceea0300c77553182 Mon Sep 17 00:00:00 2001
From: borys3kk <szymon.banys01@wp.pl>
Date: Tue, 18 Mar 2025 11:03:41 +0100
Subject: [PATCH 20/54] fixed unverified commits

---
 src/CONST.ts                                  |   8 +
 .../ReportActionItem/ReportPreview.tsx        | 164 +++++++++++-------
 src/libs/OptionsListUtils.ts                  |   2 +-
 src/libs/ReportPreviewActionUtils.ts          | 103 +++++++++++
 src/libs/ReportUtils.ts                       |   4 +-
 src/libs/actions/Policy/Policy.ts             |   4 +-
 .../home/report/PureReportActionItem.tsx      |   2 +-
 tests/actions/ReportPreviewActionUtilsTest.ts | 154 ++++++++++++++++
 8 files changed, 368 insertions(+), 73 deletions(-)
 create mode 100644 src/libs/ReportPreviewActionUtils.ts
 create mode 100644 tests/actions/ReportPreviewActionUtilsTest.ts

diff --git a/src/CONST.ts b/src/CONST.ts
index 0b23b8d4b956..f59702bca3f1 100755
--- a/src/CONST.ts
+++ b/src/CONST.ts
@@ -1171,6 +1171,14 @@ const CONST = {
             REVIEW_DUPLICATES: 'reviewDuplicates',
             MARK_AS_CASH: 'markAsCash',
         },
+        REPORT_PREVIEW_ACTIONS: {
+            VIEW: 'view',
+            REVIEW: 'review',
+            SUBMIT: 'submit',
+            APPROVE: 'approve',
+            PAY: 'pay',
+            EXPORT_TO_ACCOUNTING: 'exportToAccounting',
+        },
         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/ReportActionItem/ReportPreview.tsx b/src/components/ReportActionItem/ReportPreview.tsx
index 1135a7469d5a..24e9eb73d8d8 100644
--- a/src/components/ReportActionItem/ReportPreview.tsx
+++ b/src/components/ReportActionItem/ReportPreview.tsx
@@ -4,6 +4,7 @@ import type {StyleProp, ViewStyle} from 'react-native';
 import {View} from 'react-native';
 import {useOnyx} from 'react-native-onyx';
 import Animated, {useAnimatedStyle, useSharedValue, withDelay, withSpring, withTiming} from 'react-native-reanimated';
+import type {ValueOf} from 'type-fest';
 import Button from '@components/Button';
 import {getButtonRole} from '@components/Button/utils';
 import DelegateNoAccessModal from '@components/DelegateNoAccessModal';
@@ -35,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,
@@ -70,6 +71,7 @@ import {
     isReportOwner,
     isSettled,
     isTripRoom as isTripRoomReportUtils,
+    navigateToDetailsPage,
 } from '@libs/ReportUtils';
 import StringUtils from '@libs/StringUtils';
 import {
@@ -248,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);
@@ -403,8 +404,6 @@ function ReportPreview({
 
     const bankAccountRoute = getBankAccountRoute(chatReport);
 
-    const shouldShowSettlementButton = !shouldShowSubmitButton && (shouldShowPayButton || shouldShowApproveButton) && !showRTERViolationMessage && !shouldShowBrokenConnectionViolation;
-
     const shouldPromptUserToAddBankAccount = (hasMissingPaymentMethod(userWallet, iouReportID) || hasMissingInvoiceBankAccount(iouReportID)) && !isSettled(iouReportID);
     const shouldShowRBR = hasErrors && !iouSettled;
 
@@ -471,8 +470,6 @@ function ReportPreview({
      */
     const connectedIntegration = getConnectedIntegration(policy);
 
-    const shouldShowExportIntegrationButton = !shouldShowPayButton && !shouldShowSubmitButton && connectedIntegration && isAdmin && canBeExported(iouReport);
-
     useEffect(() => {
         if (!isPaidAnimationRunning || isApprovedAnimationRunning) {
             return;
@@ -512,6 +509,98 @@ function ReportPreview({
         Navigation.navigate(ROUTES.REPORT_WITH_ID.getRoute(iouReportID));
     }, [iouReportID]);
 
+    const [reportPreviewAction, setReportPreviewAction] = useState<ValueOf<typeof CONST.REPORT.REPORT_PREVIEW_ACTIONS>>(CONST.REPORT.REPORT_PREVIEW_ACTIONS.VIEW);
+    useEffect(() => {
+        if (!iouReport || !policy || !transactions) {
+            return;
+        }
+
+        const newReportPreviewAction = getReportPreviewAction(iouReport, policy, transactions, violations);
+        setReportPreviewAction(newReportPreviewAction);
+    }, [iouReport, policy, transactions, violations, reportPreviewAction]);
+
+    const reportPreviewActions = {
+        [CONST.REPORT.REPORT_PREVIEW_ACTIONS.SUBMIT]: (
+            <Button
+                success={isWaitingForSubmissionFromCurrentUser}
+                text={translate('common.submit')}
+                onPress={() => iouReport && submitReport(iouReport)}
+                isDisabled={shouldDisableSubmitButton}
+            />
+        ),
+        [CONST.REPORT.REPORT_PREVIEW_ACTIONS.APPROVE]: (
+            <Button
+                text={translate('iou.approve')}
+                onPress={() => confirmApproval()}
+                isDisabled={shouldDisableSubmitButton}
+            />
+        ),
+        [CONST.REPORT.REPORT_PREVIEW_ACTIONS.PAY]: (
+            <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}
+                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}
+            />
+        ),
+        [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={() => {
+                    navigateToDetailsPage(iouReport);
+                }}
+                isDisabled={shouldDisableSubmitButton}
+            />
+        ),
+    };
+
     return (
         <OfflineWithFeedback
             pendingAction={iouReport?.pendingFields?.preview}
@@ -540,7 +629,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]}>
@@ -551,12 +640,6 @@ function ReportPreview({
                                                 {previewMessage}
                                             </Text>
                                         </Animated.View>
-                                        {shouldShowRBR && (
-                                            <Icon
-                                                src={Expensicons.DotIndicator}
-                                                fill={theme.danger}
-                                            />
-                                        )}
                                         {!shouldShowRBR && shouldPromptUserToAddBankAccount && (
                                             <Icon
                                                 src={Expensicons.DotIndicator}
@@ -606,60 +689,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={{paddingTop: 16}}>{reportPreviewActions[reportPreviewAction]}</View>
                             </View>
                         </View>
                     </View>
diff --git a/src/libs/OptionsListUtils.ts b/src/libs/OptionsListUtils.ts
index 659554908ea6..3d4a026c9bd1 100644
--- a/src/libs/OptionsListUtils.ts
+++ b/src/libs/OptionsListUtils.ts
@@ -32,6 +32,7 @@ import type DeepValueOf from '@src/types/utils/DeepValueOf';
 import {isEmptyObject} from '@src/types/utils/EmptyObject';
 import Timing from './actions/Timing';
 import filterArrayByMatch from './filterArrayByMatch';
+import isReportMessageAttachment from './isReportMessageAttachment';
 import {formatPhoneNumber} from './LocalePhoneNumber';
 import {translate, translateLocal} from './Localize';
 import {appendCountryCode, getPhoneNumberWithoutSpecialChars} from './LoginUtils';
@@ -113,7 +114,6 @@ import {
     isIOUOwnedByCurrentUser,
     isMoneyRequest,
     isPolicyAdmin,
-    isReportMessageAttachment,
     isUnread,
     isAdminRoom as reportUtilsIsAdminRoom,
     isAnnounceRoom as reportUtilsIsAnnounceRoom,
diff --git a/src/libs/ReportPreviewActionUtils.ts b/src/libs/ReportPreviewActionUtils.ts
new file mode 100644
index 000000000000..b3373bcb9607
--- /dev/null
+++ b/src/libs/ReportPreviewActionUtils.ts
@@ -0,0 +1,103 @@
+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 isApprovedMember} from './actions/Policy/Member';
+import {getCurrentUserAccountID} from './actions/Report';
+import {arePaymentsEnabled, getCorrectedAutoReportingFrequency, hasAccountingConnections, isAutoSyncEnabled, isPrefferedExporter} from './PolicyUtils';
+import {
+    hasViolations as hasAnyViolations,
+    isClosedReport,
+    isCurrentUserSubmitter,
+    isExpenseReport,
+    isInvoiceReport,
+    isIOUReport,
+    isOpenReport,
+    isPayer,
+    isProcessingReport,
+    isReportApproved,
+    isSettled,
+} from './ReportUtils';
+import {getSession} from './SessionUtils';
+
+function canSubmit(report: Report, policy: Policy, violations: OnyxCollection<TransactionViolation[]>) {
+    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, policy: Policy, violations: OnyxCollection<TransactionViolation[]>) {
+    const isExpense = isExpenseReport(report);
+    const isApprover = isApprovedMember(policy, getCurrentUserAccountID());
+    const isProcessing = isProcessingReport(report);
+    const isApprovalEnabled = policy.approvalMode && policy.approvalMode !== CONST.POLICY.APPROVAL_MODE.OPTIONAL;
+    const hasViolations = hasAnyViolations(report.reportID, violations);
+
+    return isExpense && isApprover && isProcessing && isApprovalEnabled && !hasViolations;
+}
+
+function canPay(report: Report, policy: Policy, violations: OnyxCollection<TransactionViolation[]>) {
+    const isReportPayer = isPayer(getSession(), report, false, policy);
+    const isExpense = isExpenseReport(report);
+    const isPaymentsEnabled = arePaymentsEnabled(policy);
+    const isApproved = isReportApproved({report});
+    const isClosed = isClosedReport(report);
+    const hasViolations = hasAnyViolations(report.reportID, violations);
+    const isInvoice = isInvoiceReport(report);
+    const isIOU = isIOUReport(report);
+    const isProcessing = isProcessingReport(report);
+
+    return isReportPayer && ((isExpense && isPaymentsEnabled && (isApproved || isClosed) && !hasViolations) || ((isInvoice || isIOU) && isProcessing));
+}
+
+function canExport(report: Report, policy: Policy, violations: OnyxCollection<TransactionViolation[]>) {
+    const isExpense = isExpenseReport(report);
+    const isExporter = isPrefferedExporter(policy);
+    const isApproved = isReportApproved({report});
+    const isReimbursed = isSettled(report);
+    const isClosed = isClosedReport(report);
+    const hasAccountingConnection = hasAccountingConnections(policy);
+    const syncEnabled = isAutoSyncEnabled(policy);
+    const hasViolations = hasAnyViolations(report.reportID, violations);
+
+    return isExpense && isExporter && (isApproved || isReimbursed || isClosed) && hasAccountingConnection && !syncEnabled && !hasViolations;
+}
+
+function canReview(report: Report, policy: Policy, violations: OnyxCollection<TransactionViolation[]>) {
+    const hasViolations = hasAnyViolations(report.reportID, violations);
+    const isSubmitter = isCurrentUserSubmitter(report.reportID);
+    const isApprover = isApprovedMember(policy, getCurrentUserAccountID());
+    const areWorkflowsEnabled = policy.areWorkflowsEnabled;
+    return hasViolations && (isSubmitter || isApprover) && areWorkflowsEnabled;
+}
+
+function getReportPreviewAction(
+    report: Report,
+    policy: Policy,
+    reportTransactions: Transaction[],
+    violations: OnyxCollection<TransactionViolation[]>,
+): ValueOf<typeof CONST.REPORT.REPORT_PREVIEW_ACTIONS> {
+    if (canSubmit(report, policy, violations)) {
+        return CONST.REPORT.REPORT_PREVIEW_ACTIONS.SUBMIT;
+    }
+    if (canApprove(report, policy, violations)) {
+        return CONST.REPORT.REPORT_PREVIEW_ACTIONS.APPROVE;
+    }
+    if (canPay(report, policy, violations)) {
+        return CONST.REPORT.REPORT_PREVIEW_ACTIONS.PAY;
+    }
+    if (canExport(report, policy, violations)) {
+        return CONST.REPORT.REPORT_PREVIEW_ACTIONS.EXPORT_TO_ACCOUNTING;
+    }
+    if (canReview(report, policy, violations)) {
+        return CONST.REPORT.REPORT_PREVIEW_ACTIONS.REVIEW;
+    }
+
+    return CONST.REPORT.REPORT_PREVIEW_ACTIONS.VIEW;
+}
+
+export {getReportPreviewAction, canSubmit, canApprove, canPay, canExport, canReview, hasAnyViolations};
diff --git a/src/libs/ReportUtils.ts b/src/libs/ReportUtils.ts
index 571b5ec68f4a..fd1e5090e177 100644
--- a/src/libs/ReportUtils.ts
+++ b/src/libs/ReportUtils.ts
@@ -62,7 +62,7 @@ import {createDraftTransaction, getIOUReportActionToApproveOrPay, setMoneyReques
 import {createDraftWorkspace} from './actions/Policy/Policy';
 import {autoSwitchToFocusMode} from './actions/PriorityMode';
 import {hasCreditBankAccount} from './actions/ReimbursementAccount/store';
-import {handleReportChanged, prepareOnboardingOnyxData} from './actions/Report';
+import {handleReportChanged} from './actions/Report';
 import {isAnonymousUser as isAnonymousUserSession} from './actions/Session';
 import {convertToDisplayString} from './CurrencyUtils';
 import DateUtils from './DateUtils';
@@ -9655,7 +9655,6 @@ export {
     isReportFieldDisabled,
     isReportFieldOfTypeTitle,
     isReportManager,
-    isReportMessageAttachment,
     isReportOwner,
     isReportParticipant,
     isSelfDM,
@@ -9742,7 +9741,6 @@ export {
     getReportMetadata,
     buildOptimisticSelfDMReport,
     isHiddenForCurrentUser,
-    prepareOnboardingOnyxData,
     isSelectedManagerMcTest,
     isTestTransactionReport,
     getReportSubtitlePrefix,
diff --git a/src/libs/actions/Policy/Policy.ts b/src/libs/actions/Policy/Policy.ts
index c3b85ad54e4d..7e5ee565ba2a 100644
--- a/src/libs/actions/Policy/Policy.ts
+++ b/src/libs/actions/Policy/Policy.ts
@@ -5,6 +5,7 @@ import type {NullishDeep, OnyxCollection, OnyxEntry, OnyxUpdate} from 'react-nat
 import Onyx from 'react-native-onyx';
 import type {ValueOf} from 'type-fest';
 import type {ReportExportType} from '@components/ButtonWithDropdownMenu/types';
+import {prepareOnboardingOnyxData} from '@libs/actions/Report';
 import * as API from '@libs/API';
 import type {
     AddBillingCardAndRequestWorkspaceOwnerChangeParams,
@@ -2072,7 +2073,7 @@ function buildPolicyData(
     };
 
     if (!introSelected?.createWorkspace && engagementChoice && shouldAddOnboardingTasks) {
-        const onboardingData = ReportUtils.prepareOnboardingOnyxData(engagementChoice, CONST.ONBOARDING_MESSAGES[engagementChoice], adminsChatReportID, policyID);
+        const onboardingData = prepareOnboardingOnyxData(engagementChoice, CONST.ONBOARDING_MESSAGES[engagementChoice], adminsChatReportID, policyID);
         if (!onboardingData) {
             return {successData, optimisticData, failureData, params};
         }
@@ -2430,6 +2431,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/home/report/PureReportActionItem.tsx b/src/pages/home/report/PureReportActionItem.tsx
index 8af36856e452..c0ecc44ff805 100644
--- a/src/pages/home/report/PureReportActionItem.tsx
+++ b/src/pages/home/report/PureReportActionItem.tsx
@@ -42,6 +42,7 @@ import {canUseTouchScreen} from '@libs/DeviceCapabilities';
 import type {OnyxDataWithErrors} from '@libs/ErrorUtils';
 import {getLatestErrorMessageField} from '@libs/ErrorUtils';
 import focusComposerWithDelay from '@libs/focusComposerWithDelay';
+import isReportMessageAttachment from '@libs/isReportMessageAttachment';
 import {formatPhoneNumber} from '@libs/LocalePhoneNumber';
 import Navigation from '@libs/Navigation/Navigation';
 import Permissions from '@libs/Permissions';
@@ -118,7 +119,6 @@ import {
     isArchivedNonExpenseReport,
     isChatThread,
     isCompletedTaskReport,
-    isReportMessageAttachment,
     isTaskReport,
     shouldDisplayThreadReplies as shouldDisplayThreadRepliesUtils,
 } from '@libs/ReportUtils';
diff --git a/tests/actions/ReportPreviewActionUtilsTest.ts b/tests/actions/ReportPreviewActionUtilsTest.ts
new file mode 100644
index 000000000000..0c3e2dae904a
--- /dev/null
+++ b/tests/actions/ReportPreviewActionUtilsTest.ts
@@ -0,0 +1,154 @@
+import type {OnyxCollection} from 'react-native-onyx';
+import Onyx from 'react-native-onyx';
+import {canApprove, canExport, canPay, canReview, canSubmit} 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 {Policy, Report, ReportViolations, TransactionViolation} from '@src/types/onyx';
+
+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 = 'TRANSACTION_ID';
+const VIOLATIONS = {} as OnyxCollection<TransactionViolation[]>;
+
+jest.mock('@libs/ReportUtils', () => ({
+    ...jest.requireActual<typeof ReportUtils>('@libs/ReportUtils'),
+    hasViolations: jest.fn().mockReturnValue(false),
+}));
+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 = {
+            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;
+        const policy = {
+            autoReportingFrequency: CONST.POLICY.AUTO_REPORTING_FREQUENCIES.IMMEDIATE,
+        };
+        await Onyx.merge(`${ONYXKEYS.COLLECTION.REPORT}${REPORT_ID}`, report);
+
+        expect(canSubmit(report, policy as Policy, VIOLATIONS)).toBe(true);
+    });
+
+    it('canApprove should return true for report being processed', async () => {
+        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 policy = {
+            approver: CURRENT_USER_EMAIL,
+            approvalMode: CONST.POLICY.APPROVAL_MODE.BASIC,
+        };
+        await Onyx.merge(`${ONYXKEYS.COLLECTION.REPORT}${REPORT_ID}`, report);
+
+        expect(canApprove(report, policy as Policy, VIOLATIONS)).toBe(true);
+    });
+
+    it('canPay should return true for expense report with payments enabled', async () => {
+        const report = {
+            reportID: REPORT_ID,
+            type: CONST.REPORT.TYPE.EXPENSE,
+            ownerAccountID: CURRENT_USER_ACCOUNT_ID,
+            statusNum: CONST.REPORT.STATUS_NUM.CLOSED,
+        } as unknown as Report;
+        const policy = {
+            role: CONST.POLICY.ROLE.ADMIN,
+        };
+        await Onyx.merge(`${ONYXKEYS.COLLECTION.REPORT}${REPORT_ID}`, report);
+
+        expect(canPay(report, policy as Policy, VIOLATIONS)).toBe(true);
+    });
+
+    it('canPay should return true for submitted invoice', async () => {
+        const report = {
+            reportID: REPORT_ID,
+            type: CONST.REPORT.TYPE.INVOICE,
+            ownerAccountID: CURRENT_USER_ACCOUNT_ID,
+            statusNum: CONST.REPORT.STATUS_NUM.SUBMITTED,
+            stateNum: CONST.REPORT.STATE_NUM.SUBMITTED,
+        } as unknown as Report;
+        const policy = {
+            role: CONST.POLICY.ROLE.ADMIN,
+        };
+        await Onyx.merge(`${ONYXKEYS.COLLECTION.REPORT}${REPORT_ID}`, report);
+
+        expect(canPay(report, policy as Policy, VIOLATIONS)).toBe(true);
+    });
+
+    it('canExport should return true for finished reports', async () => {
+        const report = {
+            reportID: REPORT_ID,
+            type: CONST.REPORT.TYPE.EXPENSE,
+            ownerAccountID: CURRENT_USER_ACCOUNT_ID,
+            statusNum: CONST.REPORT.STATUS_NUM.CLOSED,
+        } as unknown as Report;
+        const policy = {
+            connections: {
+                intacct: {
+                    config: {
+                        export: {
+                            exporter: CURRENT_USER_EMAIL,
+                        },
+                    },
+                },
+            },
+        };
+        await Onyx.merge(`${ONYXKEYS.COLLECTION.REPORT}${REPORT_ID}`, report);
+
+        expect(canExport(report, policy as Policy, VIOLATIONS)).toBe(true);
+    });
+
+    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 = {
+            reportID: REPORT_ID,
+            ownerAccountID: CURRENT_USER_ACCOUNT_ID,
+        } as unknown as Report;
+        const policy = {
+            areWorkflowsEnabled: true,
+        };
+        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(canReview(report, policy as Policy, VIOLATIONS)).toBe(true);
+    });
+});

From ea087ea702554490cdf96655ab05c6de6b0918f9 Mon Sep 17 00:00:00 2001
From: borys3kk <szymon.banys01@wp.pl>
Date: Tue, 18 Mar 2025 14:17:39 +0100
Subject: [PATCH 21/54] pr review fixes

---
 src/components/ReportActionItem/ReportPreview.tsx | 11 ++++-------
 src/libs/ReportPreviewActionUtils.ts              |  5 ++++-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/components/ReportActionItem/ReportPreview.tsx b/src/components/ReportActionItem/ReportPreview.tsx
index 24e9eb73d8d8..39d6f85fdd3c 100644
--- a/src/components/ReportActionItem/ReportPreview.tsx
+++ b/src/components/ReportActionItem/ReportPreview.tsx
@@ -509,15 +509,12 @@ function ReportPreview({
         Navigation.navigate(ROUTES.REPORT_WITH_ID.getRoute(iouReportID));
     }, [iouReportID]);
 
-    const [reportPreviewAction, setReportPreviewAction] = useState<ValueOf<typeof CONST.REPORT.REPORT_PREVIEW_ACTIONS>>(CONST.REPORT.REPORT_PREVIEW_ACTIONS.VIEW);
-    useEffect(() => {
+    const reportPreviewAction = useMemo(() => {
         if (!iouReport || !policy || !transactions) {
-            return;
+            return CONST.REPORT.REPORT_PREVIEW_ACTIONS.VIEW;
         }
-
-        const newReportPreviewAction = getReportPreviewAction(iouReport, policy, transactions, violations);
-        setReportPreviewAction(newReportPreviewAction);
-    }, [iouReport, policy, transactions, violations, reportPreviewAction]);
+        return getReportPreviewAction(iouReport, policy, transactions, violations);
+    }, [iouReport, policy, transactions, violations]);
 
     const reportPreviewActions = {
         [CONST.REPORT.REPORT_PREVIEW_ACTIONS.SUBMIT]: (
diff --git a/src/libs/ReportPreviewActionUtils.ts b/src/libs/ReportPreviewActionUtils.ts
index b3373bcb9607..0ef224445ea1 100644
--- a/src/libs/ReportPreviewActionUtils.ts
+++ b/src/libs/ReportPreviewActionUtils.ts
@@ -51,7 +51,10 @@ function canPay(report: Report, policy: Policy, violations: OnyxCollection<Trans
     const isIOU = isIOUReport(report);
     const isProcessing = isProcessingReport(report);
 
-    return isReportPayer && ((isExpense && isPaymentsEnabled && (isApproved || isClosed) && !hasViolations) || ((isInvoice || isIOU) && isProcessing));
+    if (!isReportPayer){
+        return false;
+    }
+    return (isExpense && isPaymentsEnabled && (isApproved || isClosed) && !hasViolations) || ((isInvoice || isIOU) && isProcessing);
 }
 
 function canExport(report: Report, policy: Policy, violations: OnyxCollection<TransactionViolation[]>) {

From f77c9c77fff21278426c790a30f900d8f51eeb04 Mon Sep 17 00:00:00 2001
From: borys3kk <szymon.banys01@wp.pl>
Date: Tue, 18 Mar 2025 15:27:16 +0100
Subject: [PATCH 22/54] more updates

---
 .../ReportActionItem/ReportPreview.tsx          |  3 +--
 src/libs/ReportPreviewActionUtils.ts            |  7 +++++--
 tests/actions/ReportPreviewActionUtilsTest.ts   | 17 +++++++++--------
 3 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/src/components/ReportActionItem/ReportPreview.tsx b/src/components/ReportActionItem/ReportPreview.tsx
index 39d6f85fdd3c..f39905129c8a 100644
--- a/src/components/ReportActionItem/ReportPreview.tsx
+++ b/src/components/ReportActionItem/ReportPreview.tsx
@@ -4,7 +4,6 @@ import type {StyleProp, ViewStyle} from 'react-native';
 import {View} from 'react-native';
 import {useOnyx} from 'react-native-onyx';
 import Animated, {useAnimatedStyle, useSharedValue, withDelay, withSpring, withTiming} from 'react-native-reanimated';
-import type {ValueOf} from 'type-fest';
 import Button from '@components/Button';
 import {getButtonRole} from '@components/Button/utils';
 import DelegateNoAccessModal from '@components/DelegateNoAccessModal';
@@ -36,7 +35,7 @@ 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 getReportPreviewAction from '@libs/ReportPreviewActionUtils';
 import {
     areAllRequestsBeingSmartScanned as areAllRequestsBeingSmartScannedReportUtils,
     getArchiveReason,
diff --git a/src/libs/ReportPreviewActionUtils.ts b/src/libs/ReportPreviewActionUtils.ts
index 0ef224445ea1..71547d479c3f 100644
--- a/src/libs/ReportPreviewActionUtils.ts
+++ b/src/libs/ReportPreviewActionUtils.ts
@@ -67,7 +67,10 @@ function canExport(report: Report, policy: Policy, violations: OnyxCollection<Tr
     const syncEnabled = isAutoSyncEnabled(policy);
     const hasViolations = hasAnyViolations(report.reportID, violations);
 
-    return isExpense && isExporter && (isApproved || isReimbursed || isClosed) && hasAccountingConnection && !syncEnabled && !hasViolations;
+    if (isExpense && isExporter && hasAccountingConnection && !syncEnabled && !hasViolations){
+        return (isApproved || isReimbursed || isClosed)
+    }
+    return false;
 }
 
 function canReview(report: Report, policy: Policy, violations: OnyxCollection<TransactionViolation[]>) {
@@ -103,4 +106,4 @@ function getReportPreviewAction(
     return CONST.REPORT.REPORT_PREVIEW_ACTIONS.VIEW;
 }
 
-export {getReportPreviewAction, canSubmit, canApprove, canPay, canExport, canReview, hasAnyViolations};
+export default getReportPreviewAction;
diff --git a/tests/actions/ReportPreviewActionUtilsTest.ts b/tests/actions/ReportPreviewActionUtilsTest.ts
index 0c3e2dae904a..5998f71ed8ae 100644
--- a/tests/actions/ReportPreviewActionUtilsTest.ts
+++ b/tests/actions/ReportPreviewActionUtilsTest.ts
@@ -1,11 +1,11 @@
 import type {OnyxCollection} from 'react-native-onyx';
 import Onyx from 'react-native-onyx';
-import {canApprove, canExport, canPay, canReview, canSubmit} from '@libs/ReportPreviewActionUtils';
+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 {Policy, Report, ReportViolations, TransactionViolation} from '@src/types/onyx';
+import type {Policy, Report, ReportViolations, Transaction, TransactionViolation} from '@src/types/onyx';
 
 const CURRENT_USER_ACCOUNT_ID = 1;
 const CURRENT_USER_EMAIL = 'tester@mail.com';
@@ -22,6 +22,7 @@ const PERSONAL_DETAILS = {
 
 const REPORT_ID = 1;
 const TRANSACTION_ID = 'TRANSACTION_ID';
+const REPORT_TRANSACTIONS = {} as Transaction[];
 const VIOLATIONS = {} as OnyxCollection<TransactionViolation[]>;
 
 jest.mock('@libs/ReportUtils', () => ({
@@ -54,7 +55,7 @@ describe('getReportPreviewAction', () => {
         };
         await Onyx.merge(`${ONYXKEYS.COLLECTION.REPORT}${REPORT_ID}`, report);
 
-        expect(canSubmit(report, policy as Policy, VIOLATIONS)).toBe(true);
+        expect(getReportPreviewAction(report, policy as Policy, REPORT_TRANSACTIONS, VIOLATIONS)).toBe(CONST.REPORT.REPORT_PREVIEW_ACTIONS.SUBMIT);
     });
 
     it('canApprove should return true for report being processed', async () => {
@@ -71,7 +72,7 @@ describe('getReportPreviewAction', () => {
         };
         await Onyx.merge(`${ONYXKEYS.COLLECTION.REPORT}${REPORT_ID}`, report);
 
-        expect(canApprove(report, policy as Policy, VIOLATIONS)).toBe(true);
+        expect(getReportPreviewAction(report, policy as Policy, REPORT_TRANSACTIONS, VIOLATIONS)).toBe(CONST.REPORT.REPORT_PREVIEW_ACTIONS.APPROVE);
     });
 
     it('canPay should return true for expense report with payments enabled', async () => {
@@ -86,7 +87,7 @@ describe('getReportPreviewAction', () => {
         };
         await Onyx.merge(`${ONYXKEYS.COLLECTION.REPORT}${REPORT_ID}`, report);
 
-        expect(canPay(report, policy as Policy, VIOLATIONS)).toBe(true);
+        expect(getReportPreviewAction(report, policy as Policy, REPORT_TRANSACTIONS, VIOLATIONS)).toBe(CONST.REPORT.REPORT_PREVIEW_ACTIONS.PAY);
     });
 
     it('canPay should return true for submitted invoice', async () => {
@@ -102,7 +103,7 @@ describe('getReportPreviewAction', () => {
         };
         await Onyx.merge(`${ONYXKEYS.COLLECTION.REPORT}${REPORT_ID}`, report);
 
-        expect(canPay(report, policy as Policy, VIOLATIONS)).toBe(true);
+        expect(getReportPreviewAction(report, policy as Policy, REPORT_TRANSACTIONS, VIOLATIONS)).toBe(CONST.REPORT.REPORT_PREVIEW_ACTIONS.PAY);
     });
 
     it('canExport should return true for finished reports', async () => {
@@ -125,7 +126,7 @@ describe('getReportPreviewAction', () => {
         };
         await Onyx.merge(`${ONYXKEYS.COLLECTION.REPORT}${REPORT_ID}`, report);
 
-        expect(canExport(report, policy as Policy, VIOLATIONS)).toBe(true);
+        expect(getReportPreviewAction(report, policy as Policy, REPORT_TRANSACTIONS, VIOLATIONS)).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 () => {
@@ -149,6 +150,6 @@ describe('getReportPreviewAction', () => {
             } as TransactionViolation,
         ]);
 
-        expect(canReview(report, policy as Policy, VIOLATIONS)).toBe(true);
+        expect(getReportPreviewAction(report, policy as Policy, REPORT_TRANSACTIONS, VIOLATIONS)).toBe(CONST.REPORT.REPORT_PREVIEW_ACTIONS.REVIEW);
     });
 });

From 0ab0fa9efe6e7d93cd77a0cc4417df31783ce06c Mon Sep 17 00:00:00 2001
From: borys3kk <szymon.banys01@wp.pl>
Date: Tue, 18 Mar 2025 16:30:48 +0100
Subject: [PATCH 23/54] refactor by jnow

---
 .../ReportActionItem/ReportPreview.tsx        |  2 +-
 src/libs/ReportPreviewActionUtils.ts          | 33 ++++++++++---------
 tests/actions/ReportPreviewActionUtilsTest.ts | 12 +++----
 3 files changed, 24 insertions(+), 23 deletions(-)

diff --git a/src/components/ReportActionItem/ReportPreview.tsx b/src/components/ReportActionItem/ReportPreview.tsx
index f39905129c8a..9a8fd1f99287 100644
--- a/src/components/ReportActionItem/ReportPreview.tsx
+++ b/src/components/ReportActionItem/ReportPreview.tsx
@@ -509,7 +509,7 @@ function ReportPreview({
     }, [iouReportID]);
 
     const reportPreviewAction = useMemo(() => {
-        if (!iouReport || !policy || !transactions) {
+        if (!iouReport) {
             return CONST.REPORT.REPORT_PREVIEW_ACTIONS.VIEW;
         }
         return getReportPreviewAction(iouReport, policy, transactions, violations);
diff --git a/src/libs/ReportPreviewActionUtils.ts b/src/libs/ReportPreviewActionUtils.ts
index 71547d479c3f..d1998a2708d9 100644
--- a/src/libs/ReportPreviewActionUtils.ts
+++ b/src/libs/ReportPreviewActionUtils.ts
@@ -20,7 +20,7 @@ import {
 } from './ReportUtils';
 import {getSession} from './SessionUtils';
 
-function canSubmit(report: Report, policy: Policy, violations: OnyxCollection<TransactionViolation[]>) {
+function canSubmit(report: Report, violations: OnyxCollection<TransactionViolation[]>,policy?: Policy) {
     const isExpense = isExpenseReport(report);
     const isSubmitter = isCurrentUserSubmitter(report.reportID);
     const isOpen = isOpenReport(report);
@@ -30,17 +30,17 @@ function canSubmit(report: Report, policy: Policy, violations: OnyxCollection<Tr
     return isExpense && isSubmitter && isOpen && isManualSubmitEnabled && !hasViolations;
 }
 
-function canApprove(report: Report, policy: Policy, violations: OnyxCollection<TransactionViolation[]>) {
+function canApprove(report: Report, violations: OnyxCollection<TransactionViolation[]>,policy?: Policy) {
     const isExpense = isExpenseReport(report);
     const isApprover = isApprovedMember(policy, getCurrentUserAccountID());
     const isProcessing = isProcessingReport(report);
-    const isApprovalEnabled = policy.approvalMode && policy.approvalMode !== CONST.POLICY.APPROVAL_MODE.OPTIONAL;
+    const isApprovalEnabled = policy ? policy.approvalMode && policy.approvalMode !== CONST.POLICY.APPROVAL_MODE.OPTIONAL : false;
     const hasViolations = hasAnyViolations(report.reportID, violations);
 
     return isExpense && isApprover && isProcessing && isApprovalEnabled && !hasViolations;
 }
 
-function canPay(report: Report, policy: Policy, violations: OnyxCollection<TransactionViolation[]>) {
+function canPay(report: Report,  violations: OnyxCollection<TransactionViolation[]>,policy?: Policy) {
     const isReportPayer = isPayer(getSession(), report, false, policy);
     const isExpense = isExpenseReport(report);
     const isPaymentsEnabled = arePaymentsEnabled(policy);
@@ -57,14 +57,14 @@ function canPay(report: Report, policy: Policy, violations: OnyxCollection<Trans
     return (isExpense && isPaymentsEnabled && (isApproved || isClosed) && !hasViolations) || ((isInvoice || isIOU) && isProcessing);
 }
 
-function canExport(report: Report, policy: Policy, violations: OnyxCollection<TransactionViolation[]>) {
+function canExport(report: Report, violations: OnyxCollection<TransactionViolation[]>,policy?: Policy) {
     const isExpense = isExpenseReport(report);
-    const isExporter = isPrefferedExporter(policy);
+    const isExporter = policy ? isPrefferedExporter(policy) : false;
     const isApproved = isReportApproved({report});
     const isReimbursed = isSettled(report);
     const isClosed = isClosedReport(report);
     const hasAccountingConnection = hasAccountingConnections(policy);
-    const syncEnabled = isAutoSyncEnabled(policy);
+    const syncEnabled = policy ? isAutoSyncEnabled(policy) : false;
     const hasViolations = hasAnyViolations(report.reportID, violations);
 
     if (isExpense && isExporter && hasAccountingConnection && !syncEnabled && !hasViolations){
@@ -73,35 +73,36 @@ function canExport(report: Report, policy: Policy, violations: OnyxCollection<Tr
     return false;
 }
 
-function canReview(report: Report, policy: Policy, violations: OnyxCollection<TransactionViolation[]>) {
+function canReview(report: Report, violations: OnyxCollection<TransactionViolation[]>,policy?: Policy) {
     const hasViolations = hasAnyViolations(report.reportID, violations);
     const isSubmitter = isCurrentUserSubmitter(report.reportID);
     const isApprover = isApprovedMember(policy, getCurrentUserAccountID());
-    const areWorkflowsEnabled = policy.areWorkflowsEnabled;
+    const areWorkflowsEnabled = policy ? policy.areWorkflowsEnabled : false;
     return hasViolations && (isSubmitter || isApprover) && areWorkflowsEnabled;
 }
 
 function getReportPreviewAction(
     report: Report,
-    policy: Policy,
     reportTransactions: Transaction[],
     violations: OnyxCollection<TransactionViolation[]>,
+    policy?: Policy,
 ): ValueOf<typeof CONST.REPORT.REPORT_PREVIEW_ACTIONS> {
-    if (canSubmit(report, policy, violations)) {
+    if (policy) 
+    {if (canSubmit(report, violations, policy)) {
         return CONST.REPORT.REPORT_PREVIEW_ACTIONS.SUBMIT;
     }
-    if (canApprove(report, policy, violations)) {
+    if (canApprove(report, violations, policy)) {
         return CONST.REPORT.REPORT_PREVIEW_ACTIONS.APPROVE;
     }
-    if (canPay(report, policy, violations)) {
+    if (canPay(report, violations, policy)) {
         return CONST.REPORT.REPORT_PREVIEW_ACTIONS.PAY;
     }
-    if (canExport(report, policy, violations)) {
+    if (canExport(report, violations, policy)) {
         return CONST.REPORT.REPORT_PREVIEW_ACTIONS.EXPORT_TO_ACCOUNTING;
     }
-    if (canReview(report, policy, violations)) {
+    if (canReview(report,  violations, policy)) {
         return CONST.REPORT.REPORT_PREVIEW_ACTIONS.REVIEW;
-    }
+    }}
 
     return CONST.REPORT.REPORT_PREVIEW_ACTIONS.VIEW;
 }
diff --git a/tests/actions/ReportPreviewActionUtilsTest.ts b/tests/actions/ReportPreviewActionUtilsTest.ts
index 5998f71ed8ae..0c9925ffc8a0 100644
--- a/tests/actions/ReportPreviewActionUtilsTest.ts
+++ b/tests/actions/ReportPreviewActionUtilsTest.ts
@@ -55,7 +55,7 @@ describe('getReportPreviewAction', () => {
         };
         await Onyx.merge(`${ONYXKEYS.COLLECTION.REPORT}${REPORT_ID}`, report);
 
-        expect(getReportPreviewAction(report, policy as Policy, REPORT_TRANSACTIONS, VIOLATIONS)).toBe(CONST.REPORT.REPORT_PREVIEW_ACTIONS.SUBMIT);
+        expect(getReportPreviewAction(report, REPORT_TRANSACTIONS, VIOLATIONS, policy as Policy, )).toBe(CONST.REPORT.REPORT_PREVIEW_ACTIONS.SUBMIT);
     });
 
     it('canApprove should return true for report being processed', async () => {
@@ -72,7 +72,7 @@ describe('getReportPreviewAction', () => {
         };
         await Onyx.merge(`${ONYXKEYS.COLLECTION.REPORT}${REPORT_ID}`, report);
 
-        expect(getReportPreviewAction(report, policy as Policy, REPORT_TRANSACTIONS, VIOLATIONS)).toBe(CONST.REPORT.REPORT_PREVIEW_ACTIONS.APPROVE);
+        expect(getReportPreviewAction(report, REPORT_TRANSACTIONS, VIOLATIONS, policy as Policy, )).toBe(CONST.REPORT.REPORT_PREVIEW_ACTIONS.APPROVE);
     });
 
     it('canPay should return true for expense report with payments enabled', async () => {
@@ -87,7 +87,7 @@ describe('getReportPreviewAction', () => {
         };
         await Onyx.merge(`${ONYXKEYS.COLLECTION.REPORT}${REPORT_ID}`, report);
 
-        expect(getReportPreviewAction(report, policy as Policy, REPORT_TRANSACTIONS, VIOLATIONS)).toBe(CONST.REPORT.REPORT_PREVIEW_ACTIONS.PAY);
+        expect(getReportPreviewAction(report, REPORT_TRANSACTIONS, VIOLATIONS, policy as Policy, )).toBe(CONST.REPORT.REPORT_PREVIEW_ACTIONS.PAY);
     });
 
     it('canPay should return true for submitted invoice', async () => {
@@ -103,7 +103,7 @@ describe('getReportPreviewAction', () => {
         };
         await Onyx.merge(`${ONYXKEYS.COLLECTION.REPORT}${REPORT_ID}`, report);
 
-        expect(getReportPreviewAction(report, policy as Policy, REPORT_TRANSACTIONS, VIOLATIONS)).toBe(CONST.REPORT.REPORT_PREVIEW_ACTIONS.PAY);
+        expect(getReportPreviewAction(report, REPORT_TRANSACTIONS, VIOLATIONS, policy as Policy, )).toBe(CONST.REPORT.REPORT_PREVIEW_ACTIONS.PAY);
     });
 
     it('canExport should return true for finished reports', async () => {
@@ -126,7 +126,7 @@ describe('getReportPreviewAction', () => {
         };
         await Onyx.merge(`${ONYXKEYS.COLLECTION.REPORT}${REPORT_ID}`, report);
 
-        expect(getReportPreviewAction(report, policy as Policy, REPORT_TRANSACTIONS, VIOLATIONS)).toBe(CONST.REPORT.REPORT_PREVIEW_ACTIONS.EXPORT_TO_ACCOUNTING);
+        expect(getReportPreviewAction(report, REPORT_TRANSACTIONS, VIOLATIONS, policy as 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 () => {
@@ -150,6 +150,6 @@ describe('getReportPreviewAction', () => {
             } as TransactionViolation,
         ]);
 
-        expect(getReportPreviewAction(report, policy as Policy, REPORT_TRANSACTIONS, VIOLATIONS)).toBe(CONST.REPORT.REPORT_PREVIEW_ACTIONS.REVIEW);
+        expect(getReportPreviewAction(report, REPORT_TRANSACTIONS, VIOLATIONS, policy as Policy, )).toBe(CONST.REPORT.REPORT_PREVIEW_ACTIONS.REVIEW);
     });
 });

From 64658eecc8beeb2c9c7b30df2f7a5cb769f14a86 Mon Sep 17 00:00:00 2001
From: borys3kk <szymon.banys01@wp.pl>
Date: Tue, 18 Mar 2025 16:41:19 +0100
Subject: [PATCH 24/54] final fix

---
 src/components/ReportActionItem/ReportPreview.tsx | 2 +-
 src/libs/ReportPreviewActionUtils.ts              | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/components/ReportActionItem/ReportPreview.tsx b/src/components/ReportActionItem/ReportPreview.tsx
index 9a8fd1f99287..8e3bf1908e8b 100644
--- a/src/components/ReportActionItem/ReportPreview.tsx
+++ b/src/components/ReportActionItem/ReportPreview.tsx
@@ -512,7 +512,7 @@ function ReportPreview({
         if (!iouReport) {
             return CONST.REPORT.REPORT_PREVIEW_ACTIONS.VIEW;
         }
-        return getReportPreviewAction(iouReport, policy, transactions, violations);
+        return getReportPreviewAction(iouReport, transactions, violations, policy);
     }, [iouReport, policy, transactions, violations]);
 
     const reportPreviewActions = {
diff --git a/src/libs/ReportPreviewActionUtils.ts b/src/libs/ReportPreviewActionUtils.ts
index d1998a2708d9..bb3d4a600c13 100644
--- a/src/libs/ReportPreviewActionUtils.ts
+++ b/src/libs/ReportPreviewActionUtils.ts
@@ -87,8 +87,8 @@ function getReportPreviewAction(
     violations: OnyxCollection<TransactionViolation[]>,
     policy?: Policy,
 ): ValueOf<typeof CONST.REPORT.REPORT_PREVIEW_ACTIONS> {
-    if (policy) 
-    {if (canSubmit(report, violations, policy)) {
+
+    if (canSubmit(report, violations, policy)) {
         return CONST.REPORT.REPORT_PREVIEW_ACTIONS.SUBMIT;
     }
     if (canApprove(report, violations, policy)) {
@@ -102,7 +102,7 @@ function getReportPreviewAction(
     }
     if (canReview(report,  violations, policy)) {
         return CONST.REPORT.REPORT_PREVIEW_ACTIONS.REVIEW;
-    }}
+    }
 
     return CONST.REPORT.REPORT_PREVIEW_ACTIONS.VIEW;
 }

From 0f943a66f4113816b561ec1caa09b702624b9e22 Mon Sep 17 00:00:00 2001
From: borys3kk <szymon.banys01@wp.pl>
Date: Tue, 18 Mar 2025 16:47:20 +0100
Subject: [PATCH 25/54] npm run prettier

---
 src/libs/ReportPreviewActionUtils.ts          | 19 +++++++++----------
 tests/actions/ReportPreviewActionUtilsTest.ts | 12 ++++++------
 2 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/src/libs/ReportPreviewActionUtils.ts b/src/libs/ReportPreviewActionUtils.ts
index bb3d4a600c13..fb2fc3913a3d 100644
--- a/src/libs/ReportPreviewActionUtils.ts
+++ b/src/libs/ReportPreviewActionUtils.ts
@@ -20,7 +20,7 @@ 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) {
     const isExpense = isExpenseReport(report);
     const isSubmitter = isCurrentUserSubmitter(report.reportID);
     const isOpen = isOpenReport(report);
@@ -30,7 +30,7 @@ function canSubmit(report: Report, violations: OnyxCollection<TransactionViolati
     return isExpense && isSubmitter && isOpen && isManualSubmitEnabled && !hasViolations;
 }
 
-function canApprove(report: Report, violations: OnyxCollection<TransactionViolation[]>,policy?: Policy) {
+function canApprove(report: Report, violations: OnyxCollection<TransactionViolation[]>, policy?: Policy) {
     const isExpense = isExpenseReport(report);
     const isApprover = isApprovedMember(policy, getCurrentUserAccountID());
     const isProcessing = isProcessingReport(report);
@@ -40,7 +40,7 @@ function canApprove(report: Report, violations: OnyxCollection<TransactionViolat
     return isExpense && isApprover && isProcessing && isApprovalEnabled && !hasViolations;
 }
 
-function canPay(report: Report,  violations: OnyxCollection<TransactionViolation[]>,policy?: Policy) {
+function canPay(report: Report, violations: OnyxCollection<TransactionViolation[]>, policy?: Policy) {
     const isReportPayer = isPayer(getSession(), report, false, policy);
     const isExpense = isExpenseReport(report);
     const isPaymentsEnabled = arePaymentsEnabled(policy);
@@ -51,13 +51,13 @@ function canPay(report: Report,  violations: OnyxCollection<TransactionViolation
     const isIOU = isIOUReport(report);
     const isProcessing = isProcessingReport(report);
 
-    if (!isReportPayer){
+    if (!isReportPayer) {
         return false;
     }
     return (isExpense && isPaymentsEnabled && (isApproved || isClosed) && !hasViolations) || ((isInvoice || isIOU) && isProcessing);
 }
 
-function canExport(report: Report, violations: OnyxCollection<TransactionViolation[]>,policy?: Policy) {
+function canExport(report: Report, violations: OnyxCollection<TransactionViolation[]>, policy?: Policy) {
     const isExpense = isExpenseReport(report);
     const isExporter = policy ? isPrefferedExporter(policy) : false;
     const isApproved = isReportApproved({report});
@@ -67,13 +67,13 @@ function canExport(report: Report, violations: OnyxCollection<TransactionViolati
     const syncEnabled = policy ? isAutoSyncEnabled(policy) : false;
     const hasViolations = hasAnyViolations(report.reportID, violations);
 
-    if (isExpense && isExporter && hasAccountingConnection && !syncEnabled && !hasViolations){
-        return (isApproved || isReimbursed || isClosed)
+    if (isExpense && isExporter && hasAccountingConnection && !syncEnabled && !hasViolations) {
+        return isApproved || isReimbursed || isClosed;
     }
     return false;
 }
 
-function canReview(report: Report, violations: OnyxCollection<TransactionViolation[]>,policy?: Policy) {
+function canReview(report: Report, violations: OnyxCollection<TransactionViolation[]>, policy?: Policy) {
     const hasViolations = hasAnyViolations(report.reportID, violations);
     const isSubmitter = isCurrentUserSubmitter(report.reportID);
     const isApprover = isApprovedMember(policy, getCurrentUserAccountID());
@@ -87,7 +87,6 @@ function getReportPreviewAction(
     violations: OnyxCollection<TransactionViolation[]>,
     policy?: Policy,
 ): ValueOf<typeof CONST.REPORT.REPORT_PREVIEW_ACTIONS> {
-
     if (canSubmit(report, violations, policy)) {
         return CONST.REPORT.REPORT_PREVIEW_ACTIONS.SUBMIT;
     }
@@ -100,7 +99,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)) {
         return CONST.REPORT.REPORT_PREVIEW_ACTIONS.REVIEW;
     }
 
diff --git a/tests/actions/ReportPreviewActionUtilsTest.ts b/tests/actions/ReportPreviewActionUtilsTest.ts
index 0c9925ffc8a0..0a83d55ef163 100644
--- a/tests/actions/ReportPreviewActionUtilsTest.ts
+++ b/tests/actions/ReportPreviewActionUtilsTest.ts
@@ -55,7 +55,7 @@ describe('getReportPreviewAction', () => {
         };
         await Onyx.merge(`${ONYXKEYS.COLLECTION.REPORT}${REPORT_ID}`, report);
 
-        expect(getReportPreviewAction(report, REPORT_TRANSACTIONS, VIOLATIONS, policy as Policy, )).toBe(CONST.REPORT.REPORT_PREVIEW_ACTIONS.SUBMIT);
+        expect(getReportPreviewAction(report, REPORT_TRANSACTIONS, VIOLATIONS, policy as Policy)).toBe(CONST.REPORT.REPORT_PREVIEW_ACTIONS.SUBMIT);
     });
 
     it('canApprove should return true for report being processed', async () => {
@@ -72,7 +72,7 @@ describe('getReportPreviewAction', () => {
         };
         await Onyx.merge(`${ONYXKEYS.COLLECTION.REPORT}${REPORT_ID}`, report);
 
-        expect(getReportPreviewAction(report, REPORT_TRANSACTIONS, VIOLATIONS, policy as Policy, )).toBe(CONST.REPORT.REPORT_PREVIEW_ACTIONS.APPROVE);
+        expect(getReportPreviewAction(report, REPORT_TRANSACTIONS, VIOLATIONS, policy as Policy)).toBe(CONST.REPORT.REPORT_PREVIEW_ACTIONS.APPROVE);
     });
 
     it('canPay should return true for expense report with payments enabled', async () => {
@@ -87,7 +87,7 @@ describe('getReportPreviewAction', () => {
         };
         await Onyx.merge(`${ONYXKEYS.COLLECTION.REPORT}${REPORT_ID}`, report);
 
-        expect(getReportPreviewAction(report, REPORT_TRANSACTIONS, VIOLATIONS, policy as Policy, )).toBe(CONST.REPORT.REPORT_PREVIEW_ACTIONS.PAY);
+        expect(getReportPreviewAction(report, REPORT_TRANSACTIONS, VIOLATIONS, policy as Policy)).toBe(CONST.REPORT.REPORT_PREVIEW_ACTIONS.PAY);
     });
 
     it('canPay should return true for submitted invoice', async () => {
@@ -103,7 +103,7 @@ describe('getReportPreviewAction', () => {
         };
         await Onyx.merge(`${ONYXKEYS.COLLECTION.REPORT}${REPORT_ID}`, report);
 
-        expect(getReportPreviewAction(report, REPORT_TRANSACTIONS, VIOLATIONS, policy as Policy, )).toBe(CONST.REPORT.REPORT_PREVIEW_ACTIONS.PAY);
+        expect(getReportPreviewAction(report, REPORT_TRANSACTIONS, VIOLATIONS, policy as Policy)).toBe(CONST.REPORT.REPORT_PREVIEW_ACTIONS.PAY);
     });
 
     it('canExport should return true for finished reports', async () => {
@@ -126,7 +126,7 @@ describe('getReportPreviewAction', () => {
         };
         await Onyx.merge(`${ONYXKEYS.COLLECTION.REPORT}${REPORT_ID}`, report);
 
-        expect(getReportPreviewAction(report, REPORT_TRANSACTIONS, VIOLATIONS, policy as Policy, )).toBe(CONST.REPORT.REPORT_PREVIEW_ACTIONS.EXPORT_TO_ACCOUNTING);
+        expect(getReportPreviewAction(report, REPORT_TRANSACTIONS, VIOLATIONS, policy as 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 () => {
@@ -150,6 +150,6 @@ describe('getReportPreviewAction', () => {
             } as TransactionViolation,
         ]);
 
-        expect(getReportPreviewAction(report, REPORT_TRANSACTIONS, VIOLATIONS, policy as Policy, )).toBe(CONST.REPORT.REPORT_PREVIEW_ACTIONS.REVIEW);
+        expect(getReportPreviewAction(report, REPORT_TRANSACTIONS, VIOLATIONS, policy as Policy)).toBe(CONST.REPORT.REPORT_PREVIEW_ACTIONS.REVIEW);
     });
 });

From 260dda32d2d29937561f5336c359adcd716f3e0a Mon Sep 17 00:00:00 2001
From: borys3kk <szymon.banys01@wp.pl>
Date: Wed, 19 Mar 2025 10:30:44 +0100
Subject: [PATCH 26/54] review changes

---
 src/components/ReportActionItem/ReportPreview.tsx |  9 +++------
 src/libs/ReportPreviewActionUtils.ts              |  5 ++++-
 tests/actions/ReportPreviewActionUtilsTest.ts     | 12 ++++++------
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/components/ReportActionItem/ReportPreview.tsx b/src/components/ReportActionItem/ReportPreview.tsx
index 8e3bf1908e8b..c99ea210b5b2 100644
--- a/src/components/ReportActionItem/ReportPreview.tsx
+++ b/src/components/ReportActionItem/ReportPreview.tsx
@@ -509,10 +509,7 @@ function ReportPreview({
     }, [iouReportID]);
 
     const reportPreviewAction = useMemo(() => {
-        if (!iouReport) {
-            return CONST.REPORT.REPORT_PREVIEW_ACTIONS.VIEW;
-        }
-        return getReportPreviewAction(iouReport, transactions, violations, policy);
+        return getReportPreviewAction(transactions, violations, iouReport, policy);
     }, [iouReport, policy, transactions, violations]);
 
     const reportPreviewActions = {
@@ -590,7 +587,7 @@ function ReportPreview({
             <Button
                 text={translate('common.view')}
                 onPress={() => {
-                    navigateToDetailsPage(iouReport);
+                    openReportFromPreview();
                 }}
                 isDisabled={shouldDisableSubmitButton}
             />
@@ -685,7 +682,7 @@ function ReportPreview({
                                         )}
                                     </View>
                                 </View>
-                                <View style={{paddingTop: 16}}>{reportPreviewActions[reportPreviewAction]}</View>
+                                <View style={styles.pt4}>{reportPreviewActions[reportPreviewAction]}</View>
                             </View>
                         </View>
                     </View>
diff --git a/src/libs/ReportPreviewActionUtils.ts b/src/libs/ReportPreviewActionUtils.ts
index fb2fc3913a3d..225a5763e7cf 100644
--- a/src/libs/ReportPreviewActionUtils.ts
+++ b/src/libs/ReportPreviewActionUtils.ts
@@ -82,11 +82,14 @@ function canReview(report: Report, violations: OnyxCollection<TransactionViolati
 }
 
 function getReportPreviewAction(
-    report: Report,
     reportTransactions: Transaction[],
     violations: OnyxCollection<TransactionViolation[]>,
+    report?: Report,
     policy?: Policy,
 ): 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;
     }
diff --git a/tests/actions/ReportPreviewActionUtilsTest.ts b/tests/actions/ReportPreviewActionUtilsTest.ts
index 0a83d55ef163..d90e6c81e613 100644
--- a/tests/actions/ReportPreviewActionUtilsTest.ts
+++ b/tests/actions/ReportPreviewActionUtilsTest.ts
@@ -55,7 +55,7 @@ describe('getReportPreviewAction', () => {
         };
         await Onyx.merge(`${ONYXKEYS.COLLECTION.REPORT}${REPORT_ID}`, report);
 
-        expect(getReportPreviewAction(report, REPORT_TRANSACTIONS, VIOLATIONS, policy as Policy)).toBe(CONST.REPORT.REPORT_PREVIEW_ACTIONS.SUBMIT);
+        expect(getReportPreviewAction(REPORT_TRANSACTIONS, VIOLATIONS,report,  policy as Policy)).toBe(CONST.REPORT.REPORT_PREVIEW_ACTIONS.SUBMIT);
     });
 
     it('canApprove should return true for report being processed', async () => {
@@ -72,7 +72,7 @@ describe('getReportPreviewAction', () => {
         };
         await Onyx.merge(`${ONYXKEYS.COLLECTION.REPORT}${REPORT_ID}`, report);
 
-        expect(getReportPreviewAction(report, REPORT_TRANSACTIONS, VIOLATIONS, policy as Policy)).toBe(CONST.REPORT.REPORT_PREVIEW_ACTIONS.APPROVE);
+        expect(getReportPreviewAction(REPORT_TRANSACTIONS, VIOLATIONS, report, policy as Policy)).toBe(CONST.REPORT.REPORT_PREVIEW_ACTIONS.APPROVE);
     });
 
     it('canPay should return true for expense report with payments enabled', async () => {
@@ -87,7 +87,7 @@ describe('getReportPreviewAction', () => {
         };
         await Onyx.merge(`${ONYXKEYS.COLLECTION.REPORT}${REPORT_ID}`, report);
 
-        expect(getReportPreviewAction(report, REPORT_TRANSACTIONS, VIOLATIONS, policy as Policy)).toBe(CONST.REPORT.REPORT_PREVIEW_ACTIONS.PAY);
+        expect(getReportPreviewAction( REPORT_TRANSACTIONS, VIOLATIONS,report,  policy as Policy)).toBe(CONST.REPORT.REPORT_PREVIEW_ACTIONS.PAY);
     });
 
     it('canPay should return true for submitted invoice', async () => {
@@ -103,7 +103,7 @@ describe('getReportPreviewAction', () => {
         };
         await Onyx.merge(`${ONYXKEYS.COLLECTION.REPORT}${REPORT_ID}`, report);
 
-        expect(getReportPreviewAction(report, REPORT_TRANSACTIONS, VIOLATIONS, policy as Policy)).toBe(CONST.REPORT.REPORT_PREVIEW_ACTIONS.PAY);
+        expect(getReportPreviewAction(REPORT_TRANSACTIONS, VIOLATIONS, report, policy as Policy)).toBe(CONST.REPORT.REPORT_PREVIEW_ACTIONS.PAY);
     });
 
     it('canExport should return true for finished reports', async () => {
@@ -126,7 +126,7 @@ describe('getReportPreviewAction', () => {
         };
         await Onyx.merge(`${ONYXKEYS.COLLECTION.REPORT}${REPORT_ID}`, report);
 
-        expect(getReportPreviewAction(report, REPORT_TRANSACTIONS, VIOLATIONS, policy as Policy)).toBe(CONST.REPORT.REPORT_PREVIEW_ACTIONS.EXPORT_TO_ACCOUNTING);
+        expect(getReportPreviewAction(REPORT_TRANSACTIONS, VIOLATIONS, report, policy as 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 () => {
@@ -150,6 +150,6 @@ describe('getReportPreviewAction', () => {
             } as TransactionViolation,
         ]);
 
-        expect(getReportPreviewAction(report, REPORT_TRANSACTIONS, VIOLATIONS, policy as Policy)).toBe(CONST.REPORT.REPORT_PREVIEW_ACTIONS.REVIEW);
+        expect(getReportPreviewAction(REPORT_TRANSACTIONS, VIOLATIONS,report,  policy as Policy)).toBe(CONST.REPORT.REPORT_PREVIEW_ACTIONS.REVIEW);
     });
 });

From 1075c5731a5238ebbb20b17a8aeb49698154232b Mon Sep 17 00:00:00 2001
From: borys3kk <szymon.banys01@wp.pl>
Date: Wed, 19 Mar 2025 10:32:51 +0100
Subject: [PATCH 27/54] submitReport change

---
 src/components/ReportActionItem/ReportPreview.tsx | 2 +-
 src/libs/actions/IOU.ts                           | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/components/ReportActionItem/ReportPreview.tsx b/src/components/ReportActionItem/ReportPreview.tsx
index c99ea210b5b2..e0e2c915cab8 100644
--- a/src/components/ReportActionItem/ReportPreview.tsx
+++ b/src/components/ReportActionItem/ReportPreview.tsx
@@ -517,7 +517,7 @@ function ReportPreview({
             <Button
                 success={isWaitingForSubmissionFromCurrentUser}
                 text={translate('common.submit')}
-                onPress={() => iouReport && submitReport(iouReport)}
+                onPress={() => submitReport(iouReport)}
                 isDisabled={shouldDisableSubmitButton}
             />
         ),
diff --git a/src/libs/actions/IOU.ts b/src/libs/actions/IOU.ts
index f4f09c84b733..7385bbd4f18f 100644
--- a/src/libs/actions/IOU.ts
+++ b/src/libs/actions/IOU.ts
@@ -8767,7 +8767,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;

From 00ba9c939c444dacfffb887171bd03c6421bcc2b Mon Sep 17 00:00:00 2001
From: borys3kk <szymon.banys01@wp.pl>
Date: Wed, 19 Mar 2025 11:25:22 +0100
Subject: [PATCH 28/54] gh checks

---
 src/components/ReportActionItem/ReportPreview.tsx | 1 -
 tests/actions/ReportPreviewActionUtilsTest.ts     | 6 +++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/components/ReportActionItem/ReportPreview.tsx b/src/components/ReportActionItem/ReportPreview.tsx
index e0e2c915cab8..56669a2e46d1 100644
--- a/src/components/ReportActionItem/ReportPreview.tsx
+++ b/src/components/ReportActionItem/ReportPreview.tsx
@@ -70,7 +70,6 @@ import {
     isReportOwner,
     isSettled,
     isTripRoom as isTripRoomReportUtils,
-    navigateToDetailsPage,
 } from '@libs/ReportUtils';
 import StringUtils from '@libs/StringUtils';
 import {
diff --git a/tests/actions/ReportPreviewActionUtilsTest.ts b/tests/actions/ReportPreviewActionUtilsTest.ts
index d90e6c81e613..159a50db13eb 100644
--- a/tests/actions/ReportPreviewActionUtilsTest.ts
+++ b/tests/actions/ReportPreviewActionUtilsTest.ts
@@ -55,7 +55,7 @@ describe('getReportPreviewAction', () => {
         };
         await Onyx.merge(`${ONYXKEYS.COLLECTION.REPORT}${REPORT_ID}`, report);
 
-        expect(getReportPreviewAction(REPORT_TRANSACTIONS, VIOLATIONS,report,  policy as Policy)).toBe(CONST.REPORT.REPORT_PREVIEW_ACTIONS.SUBMIT);
+        expect(getReportPreviewAction(REPORT_TRANSACTIONS, VIOLATIONS, report, policy as Policy)).toBe(CONST.REPORT.REPORT_PREVIEW_ACTIONS.SUBMIT);
     });
 
     it('canApprove should return true for report being processed', async () => {
@@ -87,7 +87,7 @@ describe('getReportPreviewAction', () => {
         };
         await Onyx.merge(`${ONYXKEYS.COLLECTION.REPORT}${REPORT_ID}`, report);
 
-        expect(getReportPreviewAction( REPORT_TRANSACTIONS, VIOLATIONS,report,  policy as Policy)).toBe(CONST.REPORT.REPORT_PREVIEW_ACTIONS.PAY);
+        expect(getReportPreviewAction(REPORT_TRANSACTIONS, VIOLATIONS, report, policy as Policy)).toBe(CONST.REPORT.REPORT_PREVIEW_ACTIONS.PAY);
     });
 
     it('canPay should return true for submitted invoice', async () => {
@@ -150,6 +150,6 @@ describe('getReportPreviewAction', () => {
             } as TransactionViolation,
         ]);
 
-        expect(getReportPreviewAction(REPORT_TRANSACTIONS, VIOLATIONS,report,  policy as Policy)).toBe(CONST.REPORT.REPORT_PREVIEW_ACTIONS.REVIEW);
+        expect(getReportPreviewAction(REPORT_TRANSACTIONS, VIOLATIONS, report, policy as Policy)).toBe(CONST.REPORT.REPORT_PREVIEW_ACTIONS.REVIEW);
     });
 });

From 1c6ee8961aa3690d17be65741229a06a011cf8e2 Mon Sep 17 00:00:00 2001
From: borys3kk <szymon.banys01@wp.pl>
Date: Thu, 20 Mar 2025 13:30:53 +0100
Subject: [PATCH 29/54] fixes in tests / removed unused vars

---
 .../ReportActionItem/ReportPreview.tsx        |  4 +-
 src/libs/ReportPreviewActionUtils.ts          |  1 -
 tests/actions/ReportPreviewActionUtilsTest.ts | 75 ++++++++-----------
 3 files changed, 34 insertions(+), 46 deletions(-)

diff --git a/src/components/ReportActionItem/ReportPreview.tsx b/src/components/ReportActionItem/ReportPreview.tsx
index 56669a2e46d1..92c37335bdd2 100644
--- a/src/components/ReportActionItem/ReportPreview.tsx
+++ b/src/components/ReportActionItem/ReportPreview.tsx
@@ -508,8 +508,8 @@ function ReportPreview({
     }, [iouReportID]);
 
     const reportPreviewAction = useMemo(() => {
-        return getReportPreviewAction(transactions, violations, iouReport, policy);
-    }, [iouReport, policy, transactions, violations]);
+        return getReportPreviewAction(violations, iouReport, policy);
+    }, [iouReport, policy, violations]);
 
     const reportPreviewActions = {
         [CONST.REPORT.REPORT_PREVIEW_ACTIONS.SUBMIT]: (
diff --git a/src/libs/ReportPreviewActionUtils.ts b/src/libs/ReportPreviewActionUtils.ts
index 225a5763e7cf..617170ef07aa 100644
--- a/src/libs/ReportPreviewActionUtils.ts
+++ b/src/libs/ReportPreviewActionUtils.ts
@@ -82,7 +82,6 @@ function canReview(report: Report, violations: OnyxCollection<TransactionViolati
 }
 
 function getReportPreviewAction(
-    reportTransactions: Transaction[],
     violations: OnyxCollection<TransactionViolation[]>,
     report?: Report,
     policy?: Policy,
diff --git a/tests/actions/ReportPreviewActionUtilsTest.ts b/tests/actions/ReportPreviewActionUtilsTest.ts
index 159a50db13eb..358627fd829f 100644
--- a/tests/actions/ReportPreviewActionUtilsTest.ts
+++ b/tests/actions/ReportPreviewActionUtilsTest.ts
@@ -5,7 +5,9 @@ import getReportPreviewAction from '@libs/ReportPreviewActionUtils';
 import * as ReportUtils from '@libs/ReportUtils';
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
-import type {Policy, Report, ReportViolations, Transaction, TransactionViolation} from '@src/types/onyx';
+import type {Report, ReportViolations, TransactionViolation} from '@src/types/onyx';
+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';
@@ -22,8 +24,7 @@ const PERSONAL_DETAILS = {
 
 const REPORT_ID = 1;
 const TRANSACTION_ID = 'TRANSACTION_ID';
-const REPORT_TRANSACTIONS = {} as Transaction[];
-const VIOLATIONS = {} as OnyxCollection<TransactionViolation[]>;
+const VIOLATIONS: OnyxCollection<TransactionViolation[]> = {};
 
 jest.mock('@libs/ReportUtils', () => ({
     ...jest.requireActual<typeof ReportUtils>('@libs/ReportUtils'),
@@ -43,101 +44,89 @@ describe('getReportPreviewAction', () => {
     });
 
     it('canSubmit should return true for expense preview report with manual submit', async () => {
-        const report = {
-            reportID: REPORT_ID,
+        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,
         } as unknown as Report;
-        const policy = {
-            autoReportingFrequency: CONST.POLICY.AUTO_REPORTING_FREQUENCIES.IMMEDIATE,
-        };
+        const policy = createRandomPolicy(0);
+        policy.autoReportingFrequency = CONST.POLICY.AUTO_REPORTING_FREQUENCIES.IMMEDIATE;
         await Onyx.merge(`${ONYXKEYS.COLLECTION.REPORT}${REPORT_ID}`, report);
 
-        expect(getReportPreviewAction(REPORT_TRANSACTIONS, VIOLATIONS, report, policy as Policy)).toBe(CONST.REPORT.REPORT_PREVIEW_ACTIONS.SUBMIT);
+        expect(getReportPreviewAction(VIOLATIONS, report, policy)).toBe(CONST.REPORT.REPORT_PREVIEW_ACTIONS.SUBMIT);
     });
 
     it('canApprove should return true for report being processed', async () => {
         const report = {
-            reportID: REPORT_ID,
+            ...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,
         } as unknown as Report;
-        const policy = {
-            approver: CURRENT_USER_EMAIL,
-            approvalMode: CONST.POLICY.APPROVAL_MODE.BASIC,
-        };
+        const policy = createRandomPolicy(0);
+        policy.approver = CURRENT_USER_EMAIL;
+        policy.approvalMode = CONST.POLICY.APPROVAL_MODE.BASIC;
         await Onyx.merge(`${ONYXKEYS.COLLECTION.REPORT}${REPORT_ID}`, report);
 
-        expect(getReportPreviewAction(REPORT_TRANSACTIONS, VIOLATIONS, report, policy as Policy)).toBe(CONST.REPORT.REPORT_PREVIEW_ACTIONS.APPROVE);
+        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 = {
-            reportID: REPORT_ID,
+            ...createRandomReport(REPORT_ID),
             type: CONST.REPORT.TYPE.EXPENSE,
             ownerAccountID: CURRENT_USER_ACCOUNT_ID,
             statusNum: CONST.REPORT.STATUS_NUM.CLOSED,
         } as unknown as Report;
-        const policy = {
-            role: CONST.POLICY.ROLE.ADMIN,
-        };
+        const policy = createRandomPolicy(0);
+        policy.role= CONST.POLICY.ROLE.ADMIN;
         await Onyx.merge(`${ONYXKEYS.COLLECTION.REPORT}${REPORT_ID}`, report);
 
-        expect(getReportPreviewAction(REPORT_TRANSACTIONS, VIOLATIONS, report, policy as Policy)).toBe(CONST.REPORT.REPORT_PREVIEW_ACTIONS.PAY);
+        expect(getReportPreviewAction(VIOLATIONS, report, policy)).toBe(CONST.REPORT.REPORT_PREVIEW_ACTIONS.PAY);
     });
 
     it('canPay should return true for submitted invoice', async () => {
         const report = {
-            reportID: REPORT_ID,
+            ...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,
         } as unknown as Report;
-        const policy = {
-            role: CONST.POLICY.ROLE.ADMIN,
-        };
+        const policy = createRandomPolicy(0);
+        policy.role= CONST.POLICY.ROLE.ADMIN;
         await Onyx.merge(`${ONYXKEYS.COLLECTION.REPORT}${REPORT_ID}`, report);
 
-        expect(getReportPreviewAction(REPORT_TRANSACTIONS, VIOLATIONS, report, policy as Policy)).toBe(CONST.REPORT.REPORT_PREVIEW_ACTIONS.PAY);
+        expect(getReportPreviewAction(VIOLATIONS, report, policy)).toBe(CONST.REPORT.REPORT_PREVIEW_ACTIONS.PAY);
     });
 
     it('canExport should return true for finished reports', async () => {
         const report = {
-            reportID: REPORT_ID,
+            ...createRandomReport(REPORT_ID),
             type: CONST.REPORT.TYPE.EXPENSE,
             ownerAccountID: CURRENT_USER_ACCOUNT_ID,
             statusNum: CONST.REPORT.STATUS_NUM.CLOSED,
         } as unknown as Report;
-        const policy = {
-            connections: {
-                intacct: {
-                    config: {
-                        export: {
-                            exporter: CURRENT_USER_EMAIL,
-                        },
-                    },
-                },
-            },
-        };
+
+        const policy = createRandomPolicy(0);
+        // policy.connections?.intacct.config.export.exporter = CURRENT_USER_EMAIL; //todo refactor
+      
         await Onyx.merge(`${ONYXKEYS.COLLECTION.REPORT}${REPORT_ID}`, report);
 
-        expect(getReportPreviewAction(REPORT_TRANSACTIONS, VIOLATIONS, report, policy as Policy)).toBe(CONST.REPORT.REPORT_PREVIEW_ACTIONS.EXPORT_TO_ACCOUNTING);
+        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 = {
-            reportID: REPORT_ID,
+            ...createRandomReport(REPORT_ID),
             ownerAccountID: CURRENT_USER_ACCOUNT_ID,
         } as unknown as Report;
-        const policy = {
-            areWorkflowsEnabled: true,
-        };
+        const policy = createRandomPolicy(0);
+        policy.areWorkflowsEnabled = true;
         await Onyx.merge(`${ONYXKEYS.COLLECTION.REPORT}${REPORT_ID}`, report);
         const REPORT_VIOLATION = {
             FIELD_REQUIRED: 'fieldRequired',
@@ -150,6 +139,6 @@ describe('getReportPreviewAction', () => {
             } as TransactionViolation,
         ]);
 
-        expect(getReportPreviewAction(REPORT_TRANSACTIONS, VIOLATIONS, report, policy as Policy)).toBe(CONST.REPORT.REPORT_PREVIEW_ACTIONS.REVIEW);
+        expect(getReportPreviewAction(VIOLATIONS, report, policy)).toBe(CONST.REPORT.REPORT_PREVIEW_ACTIONS.REVIEW);
     });
 });

From 132d09f2f196dbfe1371e14461f666e76859141f Mon Sep 17 00:00:00 2001
From: borys3kk <szymon.banys01@wp.pl>
Date: Fri, 21 Mar 2025 13:03:09 +0100
Subject: [PATCH 30/54] tests updated/ prettier check

---
 src/libs/ReportPreviewActionUtils.ts          | 10 +---
 tests/actions/ReportPreviewActionUtilsTest.ts | 53 ++++++++++++++-----
 2 files changed, 42 insertions(+), 21 deletions(-)

diff --git a/src/libs/ReportPreviewActionUtils.ts b/src/libs/ReportPreviewActionUtils.ts
index 617170ef07aa..37e4f907ae91 100644
--- a/src/libs/ReportPreviewActionUtils.ts
+++ b/src/libs/ReportPreviewActionUtils.ts
@@ -1,7 +1,7 @@
 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 type {Policy, Report, TransactionViolation} from '@src/types/onyx';
 import {isApprover as isApprovedMember} from './actions/Policy/Member';
 import {getCurrentUserAccountID} from './actions/Report';
 import {arePaymentsEnabled, getCorrectedAutoReportingFrequency, hasAccountingConnections, isAutoSyncEnabled, isPrefferedExporter} from './PolicyUtils';
@@ -26,7 +26,6 @@ function canSubmit(report: Report, violations: OnyxCollection<TransactionViolati
     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;
 }
 
@@ -36,7 +35,6 @@ 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 hasViolations = hasAnyViolations(report.reportID, violations);
-
     return isExpense && isApprover && isProcessing && isApprovalEnabled && !hasViolations;
 }
 
@@ -81,11 +79,7 @@ function canReview(report: Report, violations: OnyxCollection<TransactionViolati
     return hasViolations && (isSubmitter || isApprover) && areWorkflowsEnabled;
 }
 
-function getReportPreviewAction(
-    violations: OnyxCollection<TransactionViolation[]>,
-    report?: Report,
-    policy?: Policy,
-): ValueOf<typeof CONST.REPORT.REPORT_PREVIEW_ACTIONS> {
+function getReportPreviewAction(violations: OnyxCollection<TransactionViolation[]>, report?: Report, policy?: Policy): ValueOf<typeof CONST.REPORT.REPORT_PREVIEW_ACTIONS> {
     if (!report) {
         return CONST.REPORT.REPORT_PREVIEW_ACTIONS.VIEW;
     }
diff --git a/tests/actions/ReportPreviewActionUtilsTest.ts b/tests/actions/ReportPreviewActionUtilsTest.ts
index 358627fd829f..5dd15f4d6337 100644
--- a/tests/actions/ReportPreviewActionUtilsTest.ts
+++ b/tests/actions/ReportPreviewActionUtilsTest.ts
@@ -1,11 +1,12 @@
 import type {OnyxCollection} from 'react-native-onyx';
 import Onyx from 'react-native-onyx';
+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';
 
@@ -23,13 +24,19 @@ const PERSONAL_DETAILS = {
 };
 
 const REPORT_ID = 1;
-const TRANSACTION_ID = 'TRANSACTION_ID';
+const TRANSACTION_ID = 1;
 const VIOLATIONS: OnyxCollection<TransactionViolation[]> = {};
 
 jest.mock('@libs/ReportUtils', () => ({
     ...jest.requireActual<typeof ReportUtils>('@libs/ReportUtils'),
     hasViolations: jest.fn().mockReturnValue(false),
 }));
+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({
@@ -44,15 +51,20 @@ describe('getReportPreviewAction', () => {
     });
 
     it('canSubmit should return true for expense preview report with manual submit', async () => {
-        const report : Report = {
+        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,
-        } as unknown as Report;
+        };
+
         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);
@@ -65,10 +77,13 @@ describe('getReportPreviewAction', () => {
             ownerAccountID: CURRENT_USER_ACCOUNT_ID,
             stateNum: CONST.REPORT.STATE_NUM.SUBMITTED,
             statusNum: CONST.REPORT.STATUS_NUM.SUBMITTED,
-        } as unknown as Report;
+        };
+
         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);
@@ -80,9 +95,13 @@ describe('getReportPreviewAction', () => {
             type: CONST.REPORT.TYPE.EXPENSE,
             ownerAccountID: CURRENT_USER_ACCOUNT_ID,
             statusNum: CONST.REPORT.STATUS_NUM.CLOSED,
-        } as unknown as Report;
+        };
+
         const policy = createRandomPolicy(0);
-        policy.role= CONST.POLICY.ROLE.ADMIN;
+        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);
@@ -95,9 +114,13 @@ describe('getReportPreviewAction', () => {
             ownerAccountID: CURRENT_USER_ACCOUNT_ID,
             statusNum: CONST.REPORT.STATUS_NUM.SUBMITTED,
             stateNum: CONST.REPORT.STATE_NUM.SUBMITTED,
-        } as unknown as Report;
+        };
+
         const policy = createRandomPolicy(0);
-        policy.role= CONST.POLICY.ROLE.ADMIN;
+        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);
@@ -109,11 +132,12 @@ describe('getReportPreviewAction', () => {
             type: CONST.REPORT.TYPE.EXPENSE,
             ownerAccountID: CURRENT_USER_ACCOUNT_ID,
             statusNum: CONST.REPORT.STATUS_NUM.CLOSED,
-        } as unknown as Report;
+        };
 
         const policy = createRandomPolicy(0);
-        // policy.connections?.intacct.config.export.exporter = CURRENT_USER_EMAIL; //todo refactor
-      
+        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);
@@ -124,9 +148,12 @@ describe('getReportPreviewAction', () => {
         const report = {
             ...createRandomReport(REPORT_ID),
             ownerAccountID: CURRENT_USER_ACCOUNT_ID,
-        } as unknown as Report;
+        };
+
         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',

From 12eee449d2a5fc0d560dcb30b71b6700a26067c7 Mon Sep 17 00:00:00 2001
From: Jan Nowakowski <janeknowakowski9@gmail.com>
Date: Fri, 21 Mar 2025 15:44:27 +0100
Subject: [PATCH 31/54] Show delete option only for single transaction report

---
 src/components/MoneyReportHeader.tsx         |  2 --
 src/libs/ReportSecondaryActionUtils.ts       | 11 +++++++----
 tests/unit/ReportSecondaryActionUtilsTest.ts |  2 +-
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/components/MoneyReportHeader.tsx b/src/components/MoneyReportHeader.tsx
index afdb7324674c..4b55a028cf75 100644
--- a/src/components/MoneyReportHeader.tsx
+++ b/src/components/MoneyReportHeader.tsx
@@ -651,8 +651,6 @@ function MoneyReportHeader({policy, report: moneyRequestReport, transactionThrea
                         // 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);
-                    } else {
-                        // TODO waiting for https://github.com/Expensify/App/pull/58020/files
                     }
 
                     if (goBackRoute) {
diff --git a/src/libs/ReportSecondaryActionUtils.ts b/src/libs/ReportSecondaryActionUtils.ts
index 24d0aa613a1f..6f8abf999dfe 100644
--- a/src/libs/ReportSecondaryActionUtils.ts
+++ b/src/libs/ReportSecondaryActionUtils.ts
@@ -327,10 +327,13 @@ function isChangeWorkspaceAction(report: Report, reportTransactions: Transaction
     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 isSignleTransaction = reportTransactions.length === 1;
+
+    if (!isExpenseReport || !isSignleTransaction) {
         return false;
     }
 
@@ -391,7 +394,7 @@ function getSecondaryReportActions(
 
     options.push(CONST.REPORT.SECONDARY_ACTIONS.VIEW_DETAILS);
 
-    if (isDeleteAction(report)) {
+    if (isDeleteAction(report, reportTransactions)) {
         options.push(CONST.REPORT.SECONDARY_ACTIONS.DELETE);
     }
 
@@ -407,7 +410,7 @@ function getSecondaryTransactionThreadActions(parentReport: Report, reportTransa
 
     options.push(CONST.REPORT.TRANSACTION_SECONDARY_ACTIONS.VIEW_DETAILS);
 
-    if (isDeleteAction(parentReport)) {
+    if (isDeleteAction(parentReport, [reportTransaction])) {
         options.push(CONST.REPORT.TRANSACTION_SECONDARY_ACTIONS.DELETE);
     }
 
diff --git a/tests/unit/ReportSecondaryActionUtilsTest.ts b/tests/unit/ReportSecondaryActionUtilsTest.ts
index dd67c930b857..99f4458cd8a1 100644
--- a/tests/unit/ReportSecondaryActionUtilsTest.ts
+++ b/tests/unit/ReportSecondaryActionUtilsTest.ts
@@ -512,7 +512,7 @@ describe('getSecondaryAction', () => {
         const policy = {} as unknown as Policy;
         await Onyx.merge(`${ONYXKEYS.COLLECTION.REPORT}${REPORT_ID}`, report);
 
-        const result = getSecondaryReportActions(report, [], {}, policy);
+        const result = getSecondaryReportActions(report, [{} as Transaction], {}, policy);
         expect(result.includes(CONST.REPORT.SECONDARY_ACTIONS.DELETE)).toBe(true);
     });
 });

From 30c6b939cc670cbf80184e1be5cdaca12acd4d3f Mon Sep 17 00:00:00 2001
From: Jan Nowakowski <janeknowakowski9@gmail.com>
Date: Mon, 24 Mar 2025 10:59:27 +0100
Subject: [PATCH 32/54] Apply review suggestions

---
 src/components/MoneyReportHeader.tsx   | 16 ++++++++--------
 src/components/MoneyRequestHeader.tsx  | 14 +++++++-------
 src/libs/ReportSecondaryActionUtils.ts |  4 ++--
 3 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/src/components/MoneyReportHeader.tsx b/src/components/MoneyReportHeader.tsx
index 4b55a028cf75..21d493bd63ac 100644
--- a/src/components/MoneyReportHeader.tsx
+++ b/src/components/MoneyReportHeader.tsx
@@ -324,7 +324,7 @@ function MoneyReportHeader({policy, report: moneyRequestReport, transactionThrea
         return getReportPrimaryAction(moneyRequestReport, transactions, violations, policy);
     }, [moneyRequestReport, policy, transactions, violations]);
 
-    const primaryActions = {
+    const primaryActionsImplementation = {
         [CONST.REPORT.PRIMARY_ACTIONS.SUBMIT]: (
             <Button
                 success
@@ -406,7 +406,7 @@ function MoneyReportHeader({policy, report: moneyRequestReport, transactionThrea
         return getSecondaryReportActions(moneyRequestReport, transactions, violations, policy);
     }, [moneyRequestReport, policy, transactions, violations]);
 
-    const secondaryActionsImpl: Record<ValueOf<typeof CONST.REPORT.SECONDARY_ACTIONS>, DropdownOption<ValueOf<typeof CONST.REPORT.SECONDARY_ACTIONS>>> = {
+    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'),
@@ -509,7 +509,7 @@ function MoneyReportHeader({policy, report: moneyRequestReport, transactionThrea
             },
         },
         [CONST.REPORT.SECONDARY_ACTIONS.CHANGE_WORKSPACE]: {
-            text: 'Change workspace',
+            text: translate('iou.changeWorkspace'),
             icon: Expensicons.Buildings,
             value: CONST.REPORT.SECONDARY_ACTIONS.CHANGE_WORKSPACE,
             onSelected: () => {
@@ -529,7 +529,7 @@ function MoneyReportHeader({policy, report: moneyRequestReport, transactionThrea
         },
     };
 
-    const applicableSecondaryActions = secondaryActions.map((action) => secondaryActionsImpl[action]);
+    const applicableSecondaryActions = secondaryActions.map((action) => secondaryActionsImplemenation[action]);
 
     const shouldShowBackButton = shouldDisplayBackButton || shouldUseNarrowLayout;
 
@@ -547,8 +547,8 @@ function MoneyReportHeader({policy, report: moneyRequestReport, transactionThrea
             >
                 {!shouldUseNarrowLayout && (
                     <View style={[styles.flexRow, styles.gap2]}>
-                        {!!primaryAction && primaryActions[primaryAction]}
-                        {!!secondaryActions.length && (
+                        {!!primaryAction && primaryActionsImplementation[primaryAction]}
+                        {!!applicableSecondaryActions.length && (
                             <ButtonWithDropdownMenu
                                 success={false}
                                 onPress={() => {}}
@@ -563,8 +563,8 @@ 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 && <View style={[styles.flexGrow4]}>{primaryActions[primaryAction]}</View>}
-                    {!!secondaryActions.length && (
+                    {!!primaryAction && <View style={[styles.flexGrow4]}>{primaryActionsImplementation[primaryAction]}</View>}
+                    {!!applicableSecondaryActions.length && (
                         <ButtonWithDropdownMenu
                             success={false}
                             onPress={() => {}}
diff --git a/src/components/MoneyRequestHeader.tsx b/src/components/MoneyRequestHeader.tsx
index a7a9e19694e2..1d307171c510 100644
--- a/src/components/MoneyRequestHeader.tsx
+++ b/src/components/MoneyRequestHeader.tsx
@@ -154,7 +154,7 @@ function MoneyRequestHeader({report, parentReportAction, policy, onBackButtonPre
         return getTransactionThreadPrimaryAction(report, parentReport, transaction, transactionViolations, policy);
     }, [parentReport, policy, report, transaction, transactionViolations]);
 
-    const primaryActionOptions = {
+    const primaryActionImplementation = {
         [CONST.REPORT.TRANSACTION_PRIMARY_ACTIONS.REMOVE_HOLD]: (
             <Button
                 success
@@ -192,7 +192,7 @@ function MoneyRequestHeader({report, parentReportAction, policy, onBackButtonPre
         return getSecondaryTransactionThreadActions(parentReport, transaction);
     }, [parentReport, transaction]);
 
-    const secondaryActionsImpl: Record<ValueOf<typeof CONST.REPORT.TRANSACTION_SECONDARY_ACTIONS>, DropdownOption<ValueOf<typeof CONST.REPORT.TRANSACTION_SECONDARY_ACTIONS>>> = {
+    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,
@@ -223,7 +223,7 @@ function MoneyRequestHeader({report, parentReportAction, policy, onBackButtonPre
         },
     };
 
-    const applicableSecondaryActions = secondaryActions.map((action) => secondaryActionsImpl[action]);
+    const applicableSecondaryActions = secondaryActions.map((action) => secondaryActionsImplementation[action]);
 
     return (
         <View style={[styles.pl0, styles.borderBottom]}>
@@ -247,8 +247,8 @@ function MoneyRequestHeader({report, parentReportAction, policy, onBackButtonPre
             >
                 {!shouldUseNarrowLayout && (
                     <View style={[styles.flexRow, styles.gap2]}>
-                        {!!primaryAction && primaryActionOptions[primaryAction]}
-                        {!!secondaryActions.length && (
+                        {!!primaryAction && primaryActionImplementation[primaryAction]}
+                        {!!applicableSecondaryActions.length && (
                             <ButtonWithDropdownMenu
                                 success={false}
                                 onPress={() => {}}
@@ -263,8 +263,8 @@ function MoneyRequestHeader({report, parentReportAction, policy, onBackButtonPre
             </HeaderWithBackButton>
             {shouldUseNarrowLayout && (
                 <View style={[styles.flexRow, styles.gap2, styles.pb3, styles.ph5, styles.w100, styles.alignItemsCenter, styles.justifyContentCenter]}>
-                    {!!primaryAction && <View style={[styles.flexGrow4]}>{primaryActionOptions[primaryAction]}</View>}
-                    {!!secondaryActions.length && (
+                    {!!primaryAction && <View style={[styles.flexGrow4]}>{primaryActionImplementation[primaryAction]}</View>}
+                    {!!applicableSecondaryActions.length && (
                         <ButtonWithDropdownMenu
                             success={false}
                             onPress={() => {}}
diff --git a/src/libs/ReportSecondaryActionUtils.ts b/src/libs/ReportSecondaryActionUtils.ts
index 6f8abf999dfe..a7ed7bdbd898 100644
--- a/src/libs/ReportSecondaryActionUtils.ts
+++ b/src/libs/ReportSecondaryActionUtils.ts
@@ -331,9 +331,9 @@ function isDeleteAction(report: Report, reportTransactions: Transaction[]): bool
     const isExpenseReport = isExpenseReportUtils(report);
 
     // This should be removed when is merged https://github.com/Expensify/App/pull/58020
-    const isSignleTransaction = reportTransactions.length === 1;
+    const isSingleTransaction = reportTransactions.length === 1;
 
-    if (!isExpenseReport || !isSignleTransaction) {
+    if (!isExpenseReport || !isSingleTransaction) {
         return false;
     }
 

From 49acfcb3b966950504e390406d05f75163de8cab Mon Sep 17 00:00:00 2001
From: borys3kk <szymon.banys01@wp.pl>
Date: Mon, 24 Mar 2025 11:11:11 +0100
Subject: [PATCH 33/54] fixed bug with approving empty report, change of order
 in reportpreviewutils

---
 .../ReportActionItem/ReportPreview.tsx        |  6 +----
 src/libs/ReportPreviewActionUtils.ts          | 22 ++++++++++---------
 2 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/src/components/ReportActionItem/ReportPreview.tsx b/src/components/ReportActionItem/ReportPreview.tsx
index 92c37335bdd2..682bf6ff7e5a 100644
--- a/src/components/ReportActionItem/ReportPreview.tsx
+++ b/src/components/ReportActionItem/ReportPreview.tsx
@@ -190,9 +190,6 @@ function ReportPreview({
     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);
@@ -523,6 +520,7 @@ function ReportPreview({
         [CONST.REPORT.REPORT_PREVIEW_ACTIONS.APPROVE]: (
             <Button
                 text={translate('iou.approve')}
+                success
                 onPress={() => confirmApproval()}
                 isDisabled={shouldDisableSubmitButton}
             />
@@ -546,8 +544,6 @@ function ReportPreview({
                 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,
diff --git a/src/libs/ReportPreviewActionUtils.ts b/src/libs/ReportPreviewActionUtils.ts
index 37e4f907ae91..a46c66776fcf 100644
--- a/src/libs/ReportPreviewActionUtils.ts
+++ b/src/libs/ReportPreviewActionUtils.ts
@@ -6,6 +6,7 @@ import {isApprover as isApprovedMember} from './actions/Policy/Member';
 import {getCurrentUserAccountID} from './actions/Report';
 import {arePaymentsEnabled, getCorrectedAutoReportingFrequency, hasAccountingConnections, isAutoSyncEnabled, isPrefferedExporter} from './PolicyUtils';
 import {
+    getReportTransactions,
     hasViolations as hasAnyViolations,
     isClosedReport,
     isCurrentUserSubmitter,
@@ -35,14 +36,16 @@ 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 hasViolations = hasAnyViolations(report.reportID, violations);
-    return isExpense && isApprover && isProcessing && isApprovalEnabled && !hasViolations;
+    const reportTransactions = 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 isApproved = isReportApproved({report});
+    const isApprovalEnabled = policy ? policy.approvalMode && policy.approvalMode !== CONST.POLICY.APPROVAL_MODE.OPTIONAL : false;
+    const isApproved = isReportApproved({report}) || !isApprovalEnabled;
     const isClosed = isClosedReport(report);
     const hasViolations = hasAnyViolations(report.reportID, violations);
     const isInvoice = isInvoiceReport(report);
@@ -64,7 +67,6 @@ function canExport(report: Report, violations: OnyxCollection<TransactionViolati
     const hasAccountingConnection = hasAccountingConnections(policy);
     const syncEnabled = policy ? isAutoSyncEnabled(policy) : false;
     const hasViolations = hasAnyViolations(report.reportID, violations);
-
     if (isExpense && isExporter && hasAccountingConnection && !syncEnabled && !hasViolations) {
         return isApproved || isReimbursed || isClosed;
     }
@@ -83,17 +85,17 @@ function getReportPreviewAction(violations: OnyxCollection<TransactionViolation[
     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)) {
-        return CONST.REPORT.REPORT_PREVIEW_ACTIONS.APPROVE;
+    if (canExport(report, violations, policy)) {
+        return CONST.REPORT.REPORT_PREVIEW_ACTIONS.EXPORT_TO_ACCOUNTING;
     }
     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 (canApprove(report, violations, policy)) {
+        return CONST.REPORT.REPORT_PREVIEW_ACTIONS.APPROVE;
+    }
+    if (canSubmit(report, violations, policy)) {
+        return CONST.REPORT.REPORT_PREVIEW_ACTIONS.SUBMIT;
     }
     if (canReview(report, violations, policy)) {
         return CONST.REPORT.REPORT_PREVIEW_ACTIONS.REVIEW;

From ac87670214e40a48b51d08bb57d7dbda0751e5f8 Mon Sep 17 00:00:00 2001
From: borys3kk <szymon.banys01@wp.pl>
Date: Mon, 24 Mar 2025 11:26:09 +0100
Subject: [PATCH 34/54] remove unused imports

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

diff --git a/src/components/ReportActionItem/ReportPreview.tsx b/src/components/ReportActionItem/ReportPreview.tsx
index 682bf6ff7e5a..594603f4297c 100644
--- a/src/components/ReportActionItem/ReportPreview.tsx
+++ b/src/components/ReportActionItem/ReportPreview.tsx
@@ -59,7 +59,6 @@ import {
     hasUpdatedTotal,
     hasViolations,
     hasWarningTypeViolations,
-    isAllowedToApproveExpenseReport,
     isAllowedToSubmitDraftExpenseReport,
     isArchivedReportWithID,
     isInvoiceReport as isInvoiceReportUtils,
@@ -85,7 +84,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';

From bdf6178537d1d80c25c1724315ce458d6d2a119a Mon Sep 17 00:00:00 2001
From: borys3kk <szymon.banys01@wp.pl>
Date: Mon, 24 Mar 2025 11:35:16 +0100
Subject: [PATCH 35/54] eslint test fix

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

diff --git a/tests/actions/ReportPreviewActionUtilsTest.ts b/tests/actions/ReportPreviewActionUtilsTest.ts
index 5dd15f4d6337..abd9f9a2b82a 100644
--- a/tests/actions/ReportPreviewActionUtilsTest.ts
+++ b/tests/actions/ReportPreviewActionUtilsTest.ts
@@ -1,7 +1,9 @@
 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';

From 0642d154ac257b648790036f8d504d1851551f86 Mon Sep 17 00:00:00 2001
From: borys3kk <szymon.banys01@wp.pl>
Date: Mon, 24 Mar 2025 12:06:40 +0100
Subject: [PATCH 36/54] tests fixed

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

diff --git a/tests/actions/ReportPreviewActionUtilsTest.ts b/tests/actions/ReportPreviewActionUtilsTest.ts
index abd9f9a2b82a..09b5190b4bcf 100644
--- a/tests/actions/ReportPreviewActionUtilsTest.ts
+++ b/tests/actions/ReportPreviewActionUtilsTest.ts
@@ -1,7 +1,7 @@
 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';
+// eslint-disable-next-line no-restricted-syntax
+import * as PolicyUtils from '@libs/PolicyUtils';
 import getReportPreviewAction from '@libs/ReportPreviewActionUtils';
 // eslint-disable-next-line no-restricted-syntax
 import * as ReportUtils from '@libs/ReportUtils';
@@ -32,6 +32,7 @@ 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'),
@@ -92,6 +93,7 @@ describe('getReportPreviewAction', () => {
     });
 
     it('canPay should return true for expense report with payments enabled', async () => {
+        (PolicyUtils.hasAccountingConnections as jest.Mock).mockReturnValueOnce(false);
         const report = {
             ...createRandomReport(REPORT_ID),
             type: CONST.REPORT.TYPE.EXPENSE,

From f7f6537cb91ba84708396282435cfcd52a93e7b8 Mon Sep 17 00:00:00 2001
From: Jan Nowakowski <janeknowakowski9@gmail.com>
Date: Wed, 26 Mar 2025 17:55:14 +0100
Subject: [PATCH 37/54] Fixes after review

---
 src/components/MoneyReportHeader.tsx  | 33 +++++++++++++++++++++++----
 src/components/MoneyRequestHeader.tsx |  1 +
 src/libs/ReportUtils.ts               |  7 +++++-
 3 files changed, 36 insertions(+), 5 deletions(-)

diff --git a/src/components/MoneyReportHeader.tsx b/src/components/MoneyReportHeader.tsx
index 21d493bd63ac..6e95d20dd59a 100644
--- a/src/components/MoneyReportHeader.tsx
+++ b/src/components/MoneyReportHeader.tsx
@@ -31,6 +31,7 @@ import {
     hasUpdatedTotal,
     isAllowedToApproveExpenseReport,
     isArchivedReportWithID,
+    isExported as isExportedUtils,
     isInvoiceReport,
     isReportOwner,
     navigateToDetailsPage,
@@ -134,6 +135,9 @@ function MoneyReportHeader({policy, report: moneyRequestReport, transactionThrea
     const [dismissedHoldUseExplanation, dismissedHoldUseExplanationResult] = useOnyx(ONYXKEYS.NVP_DISMISSED_HOLD_USE_EXPLANATION, {initialValue: true});
     const isLoadingHoldUseExplained = isLoadingOnyxValue(dismissedHoldUseExplanationResult);
 
+    const isExported = isExportedUtils(reportActions);
+    const [markAsExportedModalVisible, setMarkAsExportedModalVisible] = useState(false);
+
     const [downloadErrorModalVisible, setDownloadErrorModalVisible] = useState(false);
     const [isCancelPaymentModalVisible, setIsCancelPaymentModalVisible] = useState(false);
     const [isDeleteModalVisible, setIsDeleteModalVisible] = useState(false);
@@ -262,6 +266,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}
@@ -489,11 +501,11 @@ function MoneyReportHeader({policy, report: moneyRequestReport, transactionThrea
             icon: Expensicons.CheckCircle,
             value: CONST.REPORT.SECONDARY_ACTIONS.MARK_AS_EXPORTED,
             onSelected: () => {
-                if (!connectedIntegration || !moneyRequestReport) {
-                    throw new Error('Missing data');
+                if (isExported) {
+                    setMarkAsExportedModalVisible(true);
+                    return;
                 }
-
-                markAsManuallyExported(moneyRequestReport.reportID, connectedIntegration);
+                confirmManualExport();
             },
         },
         [CONST.REPORT.SECONDARY_ACTIONS.HOLD]: {
@@ -544,6 +556,7 @@ function MoneyReportHeader({policy, report: moneyRequestReport, transactionThrea
                 shouldDisplaySearchRouter={shouldDisplaySearchRouter}
                 onBackButtonPress={onBackButtonPress}
                 shouldShowBorderBottom={false}
+                shouldEnableDetailPageNavigation
             >
                 {!shouldUseNarrowLayout && (
                     <View style={[styles.flexRow, styles.gap2]}>
@@ -664,6 +677,18 @@ function MoneyReportHeader({policy, report: moneyRequestReport, transactionThrea
                 danger
                 shouldEnableNewFocusManagement
             />
+            <ConfirmModal
+                title={translate('workspace.exportAgainModal.title')}
+                onConfirm={() => {
+                    confirmManualExport();
+                }}
+                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}
+            />
         </View>
     );
 }
diff --git a/src/components/MoneyRequestHeader.tsx b/src/components/MoneyRequestHeader.tsx
index 1d307171c510..2637aef6eb62 100644
--- a/src/components/MoneyRequestHeader.tsx
+++ b/src/components/MoneyRequestHeader.tsx
@@ -244,6 +244,7 @@ function MoneyRequestHeader({report, parentReportAction, policy, onBackButtonPre
                 shouldShowBackButton={shouldUseNarrowLayout}
                 shouldDisplaySearchRouter={shouldDisplaySearchRouter}
                 onBackButtonPress={onBackButtonPress}
+                shouldEnableDetailPageNavigation
             >
                 {!shouldUseNarrowLayout && (
                     <View style={[styles.flexRow, styles.gap2]}>
diff --git a/src/libs/ReportUtils.ts b/src/libs/ReportUtils.ts
index e5c54b57e8bd..3e40138aef1b 100644
--- a/src/libs/ReportUtils.ts
+++ b/src/libs/ReportUtils.ts
@@ -9310,10 +9310,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));
 }
 

From 658f87a7290bbb9672603ee0fb3ba7c484047203 Mon Sep 17 00:00:00 2001
From: Jan Nowakowski <janeknowakowski9@gmail.com>
Date: Thu, 27 Mar 2025 16:20:50 +0100
Subject: [PATCH 38/54] Hide modal on confirmation

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

diff --git a/src/components/MoneyReportHeader.tsx b/src/components/MoneyReportHeader.tsx
index 6e95d20dd59a..8f029002410a 100644
--- a/src/components/MoneyReportHeader.tsx
+++ b/src/components/MoneyReportHeader.tsx
@@ -681,6 +681,7 @@ function MoneyReportHeader({policy, report: moneyRequestReport, transactionThrea
                 title={translate('workspace.exportAgainModal.title')}
                 onConfirm={() => {
                     confirmManualExport();
+                    setMarkAsExportedModalVisible(false);
                 }}
                 onCancel={() => setMarkAsExportedModalVisible(false)}
                 // eslint-disable-next-line @typescript-eslint/no-non-null-assertion

From 17344cd4e77d73df525ae9f1d8add9f459fb3512 Mon Sep 17 00:00:00 2001
From: borys3kk <szymon.banys01@wp.pl>
Date: Tue, 1 Apr 2025 08:52:44 +0200
Subject: [PATCH 39/54] order fix

---
 .../ReportActionItem/ReportPreview.tsx          | 17 +++++++----------
 src/libs/ReportPreviewActionUtils.ts            | 13 ++++++-------
 2 files changed, 13 insertions(+), 17 deletions(-)

diff --git a/src/components/ReportActionItem/ReportPreview.tsx b/src/components/ReportActionItem/ReportPreview.tsx
index 594603f4297c..192210d7ca0b 100644
--- a/src/components/ReportActionItem/ReportPreview.tsx
+++ b/src/components/ReportActionItem/ReportPreview.tsx
@@ -186,7 +186,6 @@ 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;
 
@@ -493,7 +492,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;
@@ -527,22 +525,21 @@ function ReportPreview({
         [CONST.REPORT.REPORT_PREVIEW_ACTIONS.PAY]: (
             <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}
                 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,
diff --git a/src/libs/ReportPreviewActionUtils.ts b/src/libs/ReportPreviewActionUtils.ts
index a46c66776fcf..a177b89ae50b 100644
--- a/src/libs/ReportPreviewActionUtils.ts
+++ b/src/libs/ReportPreviewActionUtils.ts
@@ -44,8 +44,7 @@ function canPay(report: Report, violations: OnyxCollection<TransactionViolation[
     const isReportPayer = isPayer(getSession(), report, false, policy);
     const isExpense = isExpenseReport(report);
     const isPaymentsEnabled = arePaymentsEnabled(policy);
-    const isApprovalEnabled = policy ? policy.approvalMode && policy.approvalMode !== CONST.POLICY.APPROVAL_MODE.OPTIONAL : false;
-    const isApproved = isReportApproved({report}) || !isApprovalEnabled;
+    const isApproved = isReportApproved({report});
     const isClosed = isClosedReport(report);
     const hasViolations = hasAnyViolations(report.reportID, violations);
     const isInvoice = isInvoiceReport(report);
@@ -85,18 +84,18 @@ function getReportPreviewAction(violations: OnyxCollection<TransactionViolation[
     if (!report) {
         return CONST.REPORT.REPORT_PREVIEW_ACTIONS.VIEW;
     }
-    if (canExport(report, violations, policy)) {
-        return CONST.REPORT.REPORT_PREVIEW_ACTIONS.EXPORT_TO_ACCOUNTING;
+    if (canSubmit(report, violations, policy)) {
+        return CONST.REPORT.REPORT_PREVIEW_ACTIONS.SUBMIT;
     }
     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 (canApprove(report, violations, policy)) {
         return CONST.REPORT.REPORT_PREVIEW_ACTIONS.APPROVE;
     }
-    if (canSubmit(report, violations, policy)) {
-        return CONST.REPORT.REPORT_PREVIEW_ACTIONS.SUBMIT;
-    }
     if (canReview(report, violations, policy)) {
         return CONST.REPORT.REPORT_PREVIEW_ACTIONS.REVIEW;
     }

From eacf76272aad0a8032f24e7b2d36809dd246b19e Mon Sep 17 00:00:00 2001
From: Jan Nowakowski <janeknowakowski9@gmail.com>
Date: Tue, 1 Apr 2025 09:35:28 +0200
Subject: [PATCH 40/54] Remove carret from track expense header

---
 src/components/AvatarWithDisplayName.tsx | 31 ++++++------------------
 1 file changed, 8 insertions(+), 23 deletions(-)

diff --git a/src/components/AvatarWithDisplayName.tsx b/src/components/AvatarWithDisplayName.tsx
index c69c369ebe9b..28a73d32362f 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';
@@ -78,7 +77,6 @@ function AvatarWithDisplayName({policy, report, isAnonymous = false, size = CONS
     const subtitle = getChatRoomSubtitle(report, {isCreateExpenseFlow: true});
     const parentNavigationSubtitleData = getParentNavigationSubtitle(report);
     const isMoneyRequestOrReport = isMoneyRequestReport(report) || isMoneyRequest(report) || isTrackExpenseReport(report) || isInvoiceReport(report);
-    const isSingleTransactionView = isTrackExpenseReport(report);
     const icons = getIcons(report, personalDetails, null, '', -1, policy, invoiceReceiverPolicy);
     const ownerPersonalDetails = getPersonalDetailsForAccountIDs(report?.ownerAccountID ? [report.ownerAccountID] : [], personalDetails);
     const displayNamesWithTooltips = getDisplayNamesWithTooltips(Object.values(ownerPersonalDetails), false);
@@ -156,27 +154,14 @@ function AvatarWithDisplayName({policy, report, isAnonymous = false, size = CONS
                         </View>
                     </PressableWithoutFeedback>
                     <View style={[styles.flex1, styles.flexColumn]}>
-                        {isSingleTransactionView ? (
-                            <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}
-                            />
-                        )}
+                        <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}

From bb98e87164cbb7a874b2bab1edc2ccacd34ef2ba Mon Sep 17 00:00:00 2001
From: Jan Nowakowski <janeknowakowski9@gmail.com>
Date: Tue, 1 Apr 2025 09:46:52 +0200
Subject: [PATCH 41/54] Show submit for non empty reports

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

diff --git a/src/libs/ReportPrimaryActionUtils.ts b/src/libs/ReportPrimaryActionUtils.ts
index 39494097fd1e..46d5751f0132 100644
--- a/src/libs/ReportPrimaryActionUtils.ts
+++ b/src/libs/ReportPrimaryActionUtils.ts
@@ -43,7 +43,7 @@ function isSubmitAction(report: Report, policy?: Policy) {
     const isOpenReport = isOpenReportUtils(report);
     const isManualSubmitEnabled = getCorrectedAutoReportingFrequency(policy) === CONST.POLICY.AUTO_REPORTING_FREQUENCIES.MANUAL;
 
-    return isExpenseReport && isReportSubmitter && isOpenReport && isManualSubmitEnabled;
+    return isExpenseReport && isReportSubmitter && isOpenReport && isManualSubmitEnabled && report.total !== 0;
 }
 
 function isApproveAction(report: Report, reportTransactions: Transaction[], policy?: Policy) {
diff --git a/src/libs/ReportSecondaryActionUtils.ts b/src/libs/ReportSecondaryActionUtils.ts
index a7ed7bdbd898..57befeb64ee6 100644
--- a/src/libs/ReportSecondaryActionUtils.ts
+++ b/src/libs/ReportSecondaryActionUtils.ts
@@ -36,7 +36,7 @@ import {allHavePendingRTERViolation, isDuplicate, isOnHold as isOnHoldTransactio
 function isSubmitAction(report: Report, policy?: Policy): boolean {
     const isExpenseReport = isExpenseReportUtils(report);
 
-    if (!isExpenseReport) {
+    if (!isExpenseReport || report?.total === 0) {
         return false;
     }
 

From c20edc9ccfa9c8d22de9d6463855bb2a43240cbf Mon Sep 17 00:00:00 2001
From: borys3kk <szymon.banys01@wp.pl>
Date: Tue, 1 Apr 2025 10:37:48 +0200
Subject: [PATCH 42/54] beautiful hack

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

diff --git a/src/libs/ReportPreviewActionUtils.ts b/src/libs/ReportPreviewActionUtils.ts
index a177b89ae50b..dfc3ee9468fc 100644
--- a/src/libs/ReportPreviewActionUtils.ts
+++ b/src/libs/ReportPreviewActionUtils.ts
@@ -44,12 +44,14 @@ function canPay(report: Report, violations: OnyxCollection<TransactionViolation[
     const isReportPayer = isPayer(getSession(), report, false, policy);
     const isExpense = isExpenseReport(report);
     const isPaymentsEnabled = arePaymentsEnabled(policy);
-    const isApproved = isReportApproved({report});
+    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);
-    const isProcessing = isProcessingReport(report);
 
     if (!isReportPayer) {
         return false;

From 1ff3b70aee27559fd239466fdc761f1fbde7d80f Mon Sep 17 00:00:00 2001
From: borys3kk <szymon.banys01@wp.pl>
Date: Tue, 1 Apr 2025 10:45:00 +0200
Subject: [PATCH 43/54] back to original order

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

diff --git a/src/libs/ReportPreviewActionUtils.ts b/src/libs/ReportPreviewActionUtils.ts
index dfc3ee9468fc..a6aa8f1d67f1 100644
--- a/src/libs/ReportPreviewActionUtils.ts
+++ b/src/libs/ReportPreviewActionUtils.ts
@@ -89,15 +89,15 @@ function getReportPreviewAction(violations: OnyxCollection<TransactionViolation[
     if (canSubmit(report, violations, policy)) {
         return CONST.REPORT.REPORT_PREVIEW_ACTIONS.SUBMIT;
     }
+    if (canApprove(report, violations, policy)) {
+        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 (canApprove(report, violations, policy)) {
-        return CONST.REPORT.REPORT_PREVIEW_ACTIONS.APPROVE;
-    }
     if (canReview(report, violations, policy)) {
         return CONST.REPORT.REPORT_PREVIEW_ACTIONS.REVIEW;
     }

From cee0621955cf8e8d68ec2d7dbbc3457384f72959 Mon Sep 17 00:00:00 2001
From: borys3kk <szymon.banys01@wp.pl>
Date: Tue, 1 Apr 2025 11:57:35 +0200
Subject: [PATCH 44/54] fixed tests

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

diff --git a/tests/actions/ReportPreviewActionUtilsTest.ts b/tests/actions/ReportPreviewActionUtilsTest.ts
index 09b5190b4bcf..a9763b1faa86 100644
--- a/tests/actions/ReportPreviewActionUtilsTest.ts
+++ b/tests/actions/ReportPreviewActionUtilsTest.ts
@@ -93,7 +93,6 @@ describe('getReportPreviewAction', () => {
     });
 
     it('canPay should return true for expense report with payments enabled', async () => {
-        (PolicyUtils.hasAccountingConnections as jest.Mock).mockReturnValueOnce(false);
         const report = {
             ...createRandomReport(REPORT_ID),
             type: CONST.REPORT.TYPE.EXPENSE,

From ad358607b6db6589dd66baafcee404f96241801a Mon Sep 17 00:00:00 2001
From: borys3kk <szymon.banys01@wp.pl>
Date: Tue, 1 Apr 2025 12:02:19 +0200
Subject: [PATCH 45/54] eslint changed

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

diff --git a/tests/actions/ReportPreviewActionUtilsTest.ts b/tests/actions/ReportPreviewActionUtilsTest.ts
index a9763b1faa86..8c07c8c62957 100644
--- a/tests/actions/ReportPreviewActionUtilsTest.ts
+++ b/tests/actions/ReportPreviewActionUtilsTest.ts
@@ -1,7 +1,7 @@
 import type {OnyxCollection} from 'react-native-onyx';
 import Onyx from 'react-native-onyx';
 // eslint-disable-next-line no-restricted-syntax
-import * as PolicyUtils from '@libs/PolicyUtils';
+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';

From 237b695f6a0db86c40adaee3f33e46732a6296e3 Mon Sep 17 00:00:00 2001
From: Jan Nowakowski <janeknowakowski9@gmail.com>
Date: Wed, 2 Apr 2025 10:29:42 +0200
Subject: [PATCH 46/54] Consider transactions lenght instead of total

---
 src/libs/ReportPrimaryActionUtils.ts       | 6 +++---
 tests/unit/ReportPrimaryActionUtilsTest.ts | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/libs/ReportPrimaryActionUtils.ts b/src/libs/ReportPrimaryActionUtils.ts
index 46d5751f0132..69ea215c18a2 100644
--- a/src/libs/ReportPrimaryActionUtils.ts
+++ b/src/libs/ReportPrimaryActionUtils.ts
@@ -37,13 +37,13 @@ import {
     shouldShowBrokenConnectionViolation as shouldShowBrokenConnectionViolationTransactionUtils,
 } from './TransactionUtils';
 
-function isSubmitAction(report: Report, policy?: Policy) {
+function isSubmitAction(report: Report, reportTransaction: 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 && report.total !== 0;
+    return isExpenseReport && isReportSubmitter && isOpenReport && isManualSubmitEnabled && reportTransaction.length !== 0;
 }
 
 function isApproveAction(report: Report, reportTransactions: Transaction[], policy?: Policy) {
@@ -213,7 +213,7 @@ function getReportPrimaryAction(
         return CONST.REPORT.PRIMARY_ACTIONS.REMOVE_HOLD;
     }
 
-    if (isSubmitAction(report, policy)) {
+    if (isSubmitAction(report, reportTransactions, policy)) {
         return CONST.REPORT.PRIMARY_ACTIONS.SUBMIT;
     }
 
diff --git a/tests/unit/ReportPrimaryActionUtilsTest.ts b/tests/unit/ReportPrimaryActionUtilsTest.ts
index 308e6619b878..6910c0ac3232 100644
--- a/tests/unit/ReportPrimaryActionUtilsTest.ts
+++ b/tests/unit/ReportPrimaryActionUtilsTest.ts
@@ -46,7 +46,7 @@ describe('getPrimaryAction', () => {
         };
         await Onyx.merge(`${ONYXKEYS.COLLECTION.REPORT}${REPORT_ID}`, report);
 
-        expect(getReportPrimaryAction(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 () => {

From 0d76ef70ab7383dad9f1a6416270b9682d66176d Mon Sep 17 00:00:00 2001
From: Jan Nowakowski <janeknowakowski9@gmail.com>
Date: Wed, 2 Apr 2025 10:31:43 +0200
Subject: [PATCH 47/54] update copy

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

diff --git a/src/languages/en.ts b/src/languages/en.ts
index 1cc31f70cbec..bdaea067f150 100755
--- a/src/languages/en.ts
+++ b/src/languages/en.ts
@@ -1075,7 +1075,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',

From 0a67fe386c6f52e4a41989dac5335d1349d98744 Mon Sep 17 00:00:00 2001
From: borys3kk <szymon.banys01@wp.pl>
Date: Wed, 2 Apr 2025 12:55:54 +0200
Subject: [PATCH 48/54] race condition fix

---
 .../ReportActionItem/ReportPreview.tsx        |  4 ++--
 src/libs/ReportPreviewActionUtils.ts          | 21 ++++++++++++-------
 2 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/src/components/ReportActionItem/ReportPreview.tsx b/src/components/ReportActionItem/ReportPreview.tsx
index 192210d7ca0b..858a252cb150 100644
--- a/src/components/ReportActionItem/ReportPreview.tsx
+++ b/src/components/ReportActionItem/ReportPreview.tsx
@@ -502,8 +502,8 @@ function ReportPreview({
     }, [iouReportID]);
 
     const reportPreviewAction = useMemo(() => {
-        return getReportPreviewAction(violations, iouReport, policy);
-    }, [iouReport, policy, violations]);
+        return getReportPreviewAction(violations, iouReport, policy, transactions);
+    }, [iouReport, policy, violations, transactions]);
 
     const reportPreviewActions = {
         [CONST.REPORT.REPORT_PREVIEW_ACTIONS.SUBMIT]: (
diff --git a/src/libs/ReportPreviewActionUtils.ts b/src/libs/ReportPreviewActionUtils.ts
index a6aa8f1d67f1..d5039360e532 100644
--- a/src/libs/ReportPreviewActionUtils.ts
+++ b/src/libs/ReportPreviewActionUtils.ts
@@ -1,8 +1,8 @@
 import type {OnyxCollection} from 'react-native-onyx';
 import type {ValueOf} from 'type-fest';
 import CONST from '@src/CONST';
-import type {Policy, Report, TransactionViolation} from '@src/types/onyx';
-import {isApprover as isApprovedMember} from './actions/Policy/Member';
+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, getCorrectedAutoReportingFrequency, hasAccountingConnections, isAutoSyncEnabled, isPrefferedExporter} from './PolicyUtils';
 import {
@@ -30,13 +30,13 @@ function canSubmit(report: Report, violations: OnyxCollection<TransactionViolati
     return isExpense && isSubmitter && isOpen && isManualSubmitEnabled && !hasViolations;
 }
 
-function canApprove(report: Report, violations: OnyxCollection<TransactionViolation[]>, policy?: Policy) {
+function canApprove(report: Report, violations: OnyxCollection<TransactionViolation[]>, policy?: Policy, transactions?: Transaction[]) {
     const isExpense = isExpenseReport(report);
-    const isApprover = isApprovedMember(policy, getCurrentUserAccountID());
+    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 = getReportTransactions(report?.reportID);
+    const reportTransactions = transactions ?? getReportTransactions(report?.reportID);
     return isExpense && isApprover && isProcessing && isApprovalEnabled && !hasViolations && reportTransactions.length > 0;
 }
 
@@ -77,19 +77,24 @@ function canExport(report: Report, violations: OnyxCollection<TransactionViolati
 function canReview(report: Report, violations: OnyxCollection<TransactionViolation[]>, policy?: Policy) {
     const hasViolations = hasAnyViolations(report.reportID, violations);
     const isSubmitter = isCurrentUserSubmitter(report.reportID);
-    const isApprover = isApprovedMember(policy, getCurrentUserAccountID());
+    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): ValueOf<typeof CONST.REPORT.REPORT_PREVIEW_ACTIONS> {
+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)) {
+    if (canApprove(report, violations, policy, transactions)) {
         return CONST.REPORT.REPORT_PREVIEW_ACTIONS.APPROVE;
     }
     if (canPay(report, violations, policy)) {

From 3474259dda8d0bec159180836a2488a4f966bacc Mon Sep 17 00:00:00 2001
From: Jan Nowakowski <janeknowakowski9@gmail.com>
Date: Thu, 3 Apr 2025 10:33:02 +0200
Subject: [PATCH 49/54] Apply review suggestions

---
 src/components/MoneyReportHeader.tsx | 5 +++--
 src/libs/ReportPrimaryActionUtils.ts | 4 ++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/components/MoneyReportHeader.tsx b/src/components/MoneyReportHeader.tsx
index 64ad17ce9e8d..ceec04dfdaa5 100644
--- a/src/components/MoneyReportHeader.tsx
+++ b/src/components/MoneyReportHeader.tsx
@@ -214,7 +214,6 @@ function MoneyReportHeader({policy, report: moneyRequestReport, transactionThrea
     const {nonHeldAmount, fullAmount, hasValidNonHeldAmount} = getNonHeldAndFullAmount(moneyRequestReport, shouldShowPayButton);
     const isAnyTransactionOnHold = hasHeldExpensesReportUtils(moneyRequestReport?.reportID);
     const displayedAmount = isAnyTransactionOnHold && canAllowSettlement && hasValidNonHeldAmount ? nonHeldAmount : formattedAmount;
-    const isMoreContentShown = shouldShowNextStep || shouldShowStatusBar || shouldUseNarrowLayout;
     const {isDelegateAccessRestricted} = useDelegateUserDetails();
     const [isNoDelegateAccessMenuVisible, setIsNoDelegateAccessMenuVisible] = useState(false);
     const [isLoadingReportData] = useOnyx(ONYXKEYS.IS_LOADING_REPORT_DATA);
@@ -553,6 +552,8 @@ function MoneyReportHeader({policy, report: moneyRequestReport, transactionThrea
 
     const shouldShowBackButton = shouldDisplayBackButton || shouldUseNarrowLayout;
 
+    const isMoreContentShown = shouldShowNextStep || !!statusBarProps;
+
     return (
         <View style={[styles.pt0, styles.borderBottom]}>
             <HeaderWithBackButton
@@ -598,7 +599,7 @@ function MoneyReportHeader({policy, report: moneyRequestReport, transactionThrea
                     )}
                 </View>
             )}
-            {!!isMoreContentShown && (
+            {isMoreContentShown && (
                 <View style={[styles.dFlex, styles.flexColumn, shouldAddGapToContents && styles.gap3, styles.pb3, styles.ph5]}>
                     {shouldShowNextStep && <MoneyReportHeaderStatusBar nextStep={optimisticNextStep} />}
                     {!!statusBarProps && (
diff --git a/src/libs/ReportPrimaryActionUtils.ts b/src/libs/ReportPrimaryActionUtils.ts
index 69ea215c18a2..6d05e752102a 100644
--- a/src/libs/ReportPrimaryActionUtils.ts
+++ b/src/libs/ReportPrimaryActionUtils.ts
@@ -37,13 +37,13 @@ import {
     shouldShowBrokenConnectionViolation as shouldShowBrokenConnectionViolationTransactionUtils,
 } from './TransactionUtils';
 
-function isSubmitAction(report: Report, reportTransaction: Transaction[], policy?: Policy) {
+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 && reportTransaction.length !== 0;
+    return isExpenseReport && isReportSubmitter && isOpenReport && isManualSubmitEnabled && reportTransactions.length !== 0;
 }
 
 function isApproveAction(report: Report, reportTransactions: Transaction[], policy?: Policy) {

From 5e03cb3a3dd533c62bb0fa79052ff4ae43219cd9 Mon Sep 17 00:00:00 2001
From: borys3kk <szymon.banys01@wp.pl>
Date: Thu, 3 Apr 2025 13:05:40 +0200
Subject: [PATCH 50/54] fixed tests, removed unused imports

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

diff --git a/src/libs/ReportPreviewActionUtils.ts b/src/libs/ReportPreviewActionUtils.ts
index d5039360e532..13033f249e06 100644
--- a/src/libs/ReportPreviewActionUtils.ts
+++ b/src/libs/ReportPreviewActionUtils.ts
@@ -4,7 +4,7 @@ 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, getCorrectedAutoReportingFrequency, hasAccountingConnections, isAutoSyncEnabled, isPrefferedExporter} from './PolicyUtils';
+import {arePaymentsEnabled, getConnectedIntegration, getCorrectedAutoReportingFrequency, hasAccountingConnections, hasIntegrationAutoSync, isPrefferedExporter} from './PolicyUtils';
 import {
     getReportTransactions,
     hasViolations as hasAnyViolations,
@@ -66,7 +66,8 @@ function canExport(report: Report, violations: OnyxCollection<TransactionViolati
     const isReimbursed = isSettled(report);
     const isClosed = isClosedReport(report);
     const hasAccountingConnection = hasAccountingConnections(policy);
-    const syncEnabled = policy ? isAutoSyncEnabled(policy) : false;
+    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;

From 2ac40dc4b2ddfff1e3c9c7cbad5e079583eb0a13 Mon Sep 17 00:00:00 2001
From: Jan Nowakowski <janeknowakowski9@gmail.com>
Date: Fri, 4 Apr 2025 11:12:57 +0200
Subject: [PATCH 51/54] Do not go back on cancel payment

---
 src/components/MoneyReportHeader.tsx | 1 +
 src/libs/actions/IOU.ts              | 3 +--
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/MoneyReportHeader.tsx b/src/components/MoneyReportHeader.tsx
index ceec04dfdaa5..9745af1016d1 100644
--- a/src/components/MoneyReportHeader.tsx
+++ b/src/components/MoneyReportHeader.tsx
@@ -652,6 +652,7 @@ function MoneyReportHeader({policy, report: moneyRequestReport, transactionThrea
                         return;
                     }
                     cancelPayment(moneyRequestReport, chatReport);
+                    setIsCancelPaymentModalVisible(false);
                 }}
                 onCancel={() => setIsCancelPaymentModalVisible(false)}
                 prompt={translate('iou.cancelPaymentConfirmation')}
diff --git a/src/libs/actions/IOU.ts b/src/libs/actions/IOU.ts
index 61a8d32ee7b2..24ff3f03d54d 100644
--- a/src/libs/actions/IOU.ts
+++ b/src/libs/actions/IOU.ts
@@ -9100,7 +9100,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;
     }
@@ -9245,7 +9245,6 @@ function cancelPayment(expenseReport: OnyxEntry<OnyxTypes.Report>, chatReport: O
         },
         {optimisticData, successData, failureData},
     );
-    Navigation.goBack(backTo);
     notifyNewAction(expenseReport.reportID, userAccountID);
 }
 

From dbe624678aef666a9d0a30ae8a17c57e9d57df47 Mon Sep 17 00:00:00 2001
From: Jan Nowakowski <janeknowakowski9@gmail.com>
Date: Mon, 7 Apr 2025 18:40:09 +0200
Subject: [PATCH 52/54] restore animation

---
 src/components/MoneyReportHeader.tsx | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/components/MoneyReportHeader.tsx b/src/components/MoneyReportHeader.tsx
index 9745af1016d1..080d25eba98e 100644
--- a/src/components/MoneyReportHeader.tsx
+++ b/src/components/MoneyReportHeader.tsx
@@ -89,7 +89,7 @@ import type {MoneyRequestHeaderStatusBarProps} from './MoneyRequestHeaderStatusB
 import MoneyRequestHeaderStatusBar from './MoneyRequestHeaderStatusBar';
 import type {ActionHandledType} from './ProcessMoneyReportHoldMenu';
 import ProcessMoneyReportHoldMenu from './ProcessMoneyReportHoldMenu';
-import SettlementButton from './SettlementButton';
+import AnimatedSettlementButton from './SettlementButton/AnimatedSettlementButton';
 
 type MoneyReportHeaderProps = {
     /** The report currently being looked at */
@@ -143,7 +143,7 @@ function MoneyReportHeader({policy, report: moneyRequestReport, transactionThrea
     const [isCancelPaymentModalVisible, setIsCancelPaymentModalVisible] = useState(false);
     const [isDeleteModalVisible, setIsDeleteModalVisible] = useState(false);
 
-    const {isPaidAnimationRunning, isApprovedAnimationRunning, startAnimation, startApprovedAnimation} = usePaymentAnimations();
+    const {isPaidAnimationRunning, isApprovedAnimationRunning, startAnimation, stopAnimation, startApprovedAnimation} = usePaymentAnimations();
     const styles = useThemeStyles();
     const theme = useTheme();
     const {translate} = useLocalize();
@@ -364,9 +364,14 @@ function MoneyReportHeader({policy, report: moneyRequestReport, transactionThrea
             />
         ),
         [CONST.REPORT.PRIMARY_ACTIONS.PAY]: (
-            <SettlementButton
+            <AnimatedSettlementButton
+                isPaidAnimationRunning={isPaidAnimationRunning}
+                isApprovedAnimationRunning={isApprovedAnimationRunning}
+                onAnimationFinish={stopAnimation}
+                canIOUBePaid
                 onlyShowPayElsewhere={onlyShowPayElsewhere}
                 currency={moneyRequestReport?.currency}
+                confirmApproval={confirmApproval}
                 policyID={moneyRequestReport?.policyID}
                 chatReportID={chatReport?.reportID}
                 iouReport={moneyRequestReport}
@@ -374,6 +379,7 @@ function MoneyReportHeader({policy, report: moneyRequestReport, transactionThrea
                 enablePaymentsRoute={ROUTES.ENABLE_PAYMENTS}
                 addBankAccountRoute={bankAccountRoute}
                 shouldHidePaymentOptions={!shouldShowPayButton}
+                shouldShowApproveButton={shouldShowApproveButton}
                 shouldDisableApproveButton={shouldDisableApproveButton}
                 formattedAmount={!hasOnlyHeldExpenses ? displayedAmount : ''}
                 isDisabled={isOffline && !canAllowSettlement}

From 3725a743906b1b06c0a1ec54b2032ad529f3a603 Mon Sep 17 00:00:00 2001
From: Jan Nowakowski <janeknowakowski9@gmail.com>
Date: Tue, 8 Apr 2025 09:46:02 +0200
Subject: [PATCH 53/54] Fix settlement button animation when payment is
 cancelled

---
 src/components/SettlementButton/AnimatedSettlementButton.tsx | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/components/SettlementButton/AnimatedSettlementButton.tsx b/src/components/SettlementButton/AnimatedSettlementButton.tsx
index 388297075082..fd85b35421f8 100644
--- a/src/components/SettlementButton/AnimatedSettlementButton.tsx
+++ b/src/components/SettlementButton/AnimatedSettlementButton.tsx
@@ -98,6 +98,10 @@ function AnimatedSettlementButton({
         return () => clearTimeout(timer);
     }, [buttonMarginTop, gap, height, isAnimationRunning, shouldAddTopMargin]);
 
+    // eslint-disable-next-line react-compiler/react-compiler
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+    useEffect(() => onAnimationFinish, []);
+
     return (
         <Animated.View style={[containerStyles, wrapperStyle, {minWidth}]}>
             {isAnimationRunning && canShow && (

From d5957c0edfce680d9f1a10abca68653be0f66cdc Mon Sep 17 00:00:00 2001
From: Jan Nowakowski <janeknowakowski9@gmail.com>
Date: Tue, 8 Apr 2025 10:23:02 +0200
Subject: [PATCH 54/54] better fix for settlement button animation

---
 src/components/MoneyReportHeader.tsx                        | 6 +++++-
 .../SettlementButton/AnimatedSettlementButton.tsx           | 4 ----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/components/MoneyReportHeader.tsx b/src/components/MoneyReportHeader.tsx
index 30a33282ad69..e6aeea3057af 100644
--- a/src/components/MoneyReportHeader.tsx
+++ b/src/components/MoneyReportHeader.tsx
@@ -441,11 +441,15 @@ function MoneyReportHeader({policy, report: moneyRequestReport, transactionThrea
     }, [dismissedHoldUseExplanation, isLoadingHoldUseExplained, isOnHold]);
 
     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);
-    }, [moneyRequestReport, policy, transactions, violations]);
+    }, [isPaidAnimationRunning, moneyRequestReport, policy, transactions, violations]);
 
     const primaryActionsImplementation = {
         [CONST.REPORT.PRIMARY_ACTIONS.SUBMIT]: (
diff --git a/src/components/SettlementButton/AnimatedSettlementButton.tsx b/src/components/SettlementButton/AnimatedSettlementButton.tsx
index fd85b35421f8..388297075082 100644
--- a/src/components/SettlementButton/AnimatedSettlementButton.tsx
+++ b/src/components/SettlementButton/AnimatedSettlementButton.tsx
@@ -98,10 +98,6 @@ function AnimatedSettlementButton({
         return () => clearTimeout(timer);
     }, [buttonMarginTop, gap, height, isAnimationRunning, shouldAddTopMargin]);
 
-    // eslint-disable-next-line react-compiler/react-compiler
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-    useEffect(() => onAnimationFinish, []);
-
     return (
         <Animated.View style={[containerStyles, wrapperStyle, {minWidth}]}>
             {isAnimationRunning && canShow && (