From 50c36e2f4d69d73c582389346a60a3f3f0c91e7d Mon Sep 17 00:00:00 2001 From: allgandalf Date: Wed, 8 Oct 2025 16:58:03 +0530 Subject: [PATCH 1/2] fix approved animation not running --- src/components/MoneyReportHeader.tsx | 2 ++ .../MoneyRequestReportPreviewContent.tsx | 14 +++++++++++++- src/libs/ReportPreviewActionUtils.ts | 3 ++- src/libs/ReportPrimaryActionUtils.ts | 4 +++- 4 files changed, 20 insertions(+), 3 deletions(-) diff --git a/src/components/MoneyReportHeader.tsx b/src/components/MoneyReportHeader.tsx index f4d49e371347..f3268bf3c086 100644 --- a/src/components/MoneyReportHeader.tsx +++ b/src/components/MoneyReportHeader.tsx @@ -571,10 +571,12 @@ function MoneyReportHeader({ isChatReportArchived, invoiceReceiverPolicy, isPaidAnimationRunning, + isApprovedAnimationRunning, isSubmittingAnimationRunning, }); }, [ isPaidAnimationRunning, + isApprovedAnimationRunning, isSubmittingAnimationRunning, moneyRequestReport, chatReport, diff --git a/src/components/ReportActionItem/MoneyRequestReportPreview/MoneyRequestReportPreviewContent.tsx b/src/components/ReportActionItem/MoneyRequestReportPreview/MoneyRequestReportPreviewContent.tsx index 9434fe158f90..d594229b6336 100644 --- a/src/components/ReportActionItem/MoneyRequestReportPreview/MoneyRequestReportPreviewContent.tsx +++ b/src/components/ReportActionItem/MoneyRequestReportPreview/MoneyRequestReportPreviewContent.tsx @@ -479,9 +479,21 @@ function MoneyRequestReportPreviewContent({ transactions, invoiceReceiverPolicy, isPaidAnimationRunning, + isApprovedAnimationRunning, isSubmittingAnimationRunning, ); - }, [isPaidAnimationRunning, isSubmittingAnimationRunning, violations, iouReport, policy, transactions, isIouReportArchived, invoiceReceiverPolicy, isChatReportArchived]); + }, [ + isPaidAnimationRunning, + isApprovedAnimationRunning, + isSubmittingAnimationRunning, + violations, + iouReport, + policy, + transactions, + isIouReportArchived, + invoiceReceiverPolicy, + isChatReportArchived, + ]); const addExpenseDropdownOptions = useMemo( () => [ diff --git a/src/libs/ReportPreviewActionUtils.ts b/src/libs/ReportPreviewActionUtils.ts index ad9223b3cf9b..caac7dbbdede 100644 --- a/src/libs/ReportPreviewActionUtils.ts +++ b/src/libs/ReportPreviewActionUtils.ts @@ -220,13 +220,14 @@ function getReportPreviewAction( transactions?: Transaction[], invoiceReceiverPolicy?: Policy, isPaidAnimationRunning?: boolean, + isApprovedAnimationRunning?: boolean, isSubmittingAnimationRunning?: boolean, ): ValueOf { if (!report) { return CONST.REPORT.REPORT_PREVIEW_ACTIONS.VIEW; } - if (isPaidAnimationRunning) { + if (isPaidAnimationRunning || isApprovedAnimationRunning) { return CONST.REPORT.REPORT_PREVIEW_ACTIONS.PAY; } diff --git a/src/libs/ReportPrimaryActionUtils.ts b/src/libs/ReportPrimaryActionUtils.ts index d9ce94303dc3..3e6823ca644b 100644 --- a/src/libs/ReportPrimaryActionUtils.ts +++ b/src/libs/ReportPrimaryActionUtils.ts @@ -62,6 +62,7 @@ type GetReportPrimaryActionParams = { isChatReportArchived: boolean; invoiceReceiverPolicy?: Policy; isPaidAnimationRunning?: boolean; + isApprovedAnimationRunning?: boolean; isSubmittingAnimationRunning?: boolean; }; @@ -333,10 +334,11 @@ function getReportPrimaryAction(params: GetReportPrimaryActionParams): ValueOf Date: Wed, 8 Oct 2025 17:10:32 +0530 Subject: [PATCH 2/2] fix esLint error --- src/libs/ReportPreviewActionUtils.ts | 2 ++ src/libs/ReportPrimaryActionUtils.ts | 2 ++ 2 files changed, 4 insertions(+) diff --git a/src/libs/ReportPreviewActionUtils.ts b/src/libs/ReportPreviewActionUtils.ts index caac7dbbdede..6615e922785b 100644 --- a/src/libs/ReportPreviewActionUtils.ts +++ b/src/libs/ReportPreviewActionUtils.ts @@ -227,6 +227,8 @@ function getReportPreviewAction( return CONST.REPORT.REPORT_PREVIEW_ACTIONS.VIEW; } + // We want to have action displayed for either paid or approved animations + // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing if (isPaidAnimationRunning || isApprovedAnimationRunning) { return CONST.REPORT.REPORT_PREVIEW_ACTIONS.PAY; } diff --git a/src/libs/ReportPrimaryActionUtils.ts b/src/libs/ReportPrimaryActionUtils.ts index 3e6823ca644b..db6306db66d1 100644 --- a/src/libs/ReportPrimaryActionUtils.ts +++ b/src/libs/ReportPrimaryActionUtils.ts @@ -338,6 +338,8 @@ function getReportPrimaryAction(params: GetReportPrimaryActionParams): ValueOf