From 6f540c8017e5efeee5a015589ee696c62cd55492 Mon Sep 17 00:00:00 2001 From: sumo_slonik Date: Wed, 9 Apr 2025 12:04:34 +0200 Subject: [PATCH 1/2] fix issue --- src/components/MoneyReportHeader.tsx | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/components/MoneyReportHeader.tsx b/src/components/MoneyReportHeader.tsx index e6aeea3057af..3b42f87667d3 100644 --- a/src/components/MoneyReportHeader.tsx +++ b/src/components/MoneyReportHeader.tsx @@ -35,6 +35,7 @@ import { isArchivedReportWithID, isExported as isExportedUtils, isInvoiceReport, + isPaidGroupPolicy, isReportOwner, navigateToDetailsPage, reportTransactionsSelector, @@ -74,6 +75,7 @@ import ROUTES from '@src/ROUTES'; import SCREENS from '@src/SCREENS'; import type * as OnyxTypes from '@src/types/onyx'; import type {PaymentMethodType} from '@src/types/onyx/OriginalMessage'; +import report from '@src/types/onyx/Report'; import type IconAsset from '@src/types/utils/IconAsset'; import isLoadingOnyxValue from '@src/types/utils/isLoadingOnyxValue'; import BrokenConnectionDescription from './BrokenConnectionDescription'; @@ -201,8 +203,9 @@ function MoneyReportHeader({policy, report: moneyRequestReport, transactionThrea const anyTransactionOnHold = selectedTransactions.some(isOnHoldTransactionUtils); const allTransactionOnHold = selectedTransactions.every(isOnHoldTransactionUtils); + const isReportApprovedAndPaid = moneyRequestReport?.stateNum === CONST.REPORT.STATE_NUM.APPROVED && moneyRequestReport?.statusNum === CONST.REPORT.STATUS_NUM.REIMBURSED; - if (!anyTransactionOnHold && selectedTransactions.length === 1) { + if (!anyTransactionOnHold && selectedTransactions.length === 1 && !isReportApprovedAndPaid) { options.push({ text: translate('iou.hold'), icon: Expensicons.Stopwatch, From 0665d1b6a23c9174c2ceca4b282919095d9c7ad2 Mon Sep 17 00:00:00 2001 From: sumo_slonik Date: Thu, 10 Apr 2025 13:38:21 +0200 Subject: [PATCH 2/2] commit Vit suggestion --- src/components/MoneyReportHeader.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/MoneyReportHeader.tsx b/src/components/MoneyReportHeader.tsx index 263075f96690..48fcad5dc4b4 100644 --- a/src/components/MoneyReportHeader.tsx +++ b/src/components/MoneyReportHeader.tsx @@ -202,9 +202,9 @@ function MoneyReportHeader({policy, report: moneyRequestReport, transactionThrea const anyTransactionOnHold = selectedTransactions.some(isOnHoldTransactionUtils); const allTransactionOnHold = selectedTransactions.every(isOnHoldTransactionUtils); - const isReportApprovedAndPaid = moneyRequestReport?.stateNum === CONST.REPORT.STATE_NUM.APPROVED && moneyRequestReport?.statusNum === CONST.REPORT.STATUS_NUM.REIMBURSED; + const isReportReimbursed = moneyRequestReport?.stateNum === CONST.REPORT.STATE_NUM.APPROVED && moneyRequestReport?.statusNum === CONST.REPORT.STATUS_NUM.REIMBURSED; - if (!anyTransactionOnHold && selectedTransactions.length === 1 && !isReportApprovedAndPaid) { + if (!anyTransactionOnHold && selectedTransactions.length === 1 && !isReportReimbursed) { options.push({ text: translate('iou.hold'), icon: Expensicons.Stopwatch,