Skip to content

Fix: Approve button does not show 👍 Approved after clicking Approve button #72082

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Valforte merged 2 commits into from
Oct 15, 2025
Merged

Fix: Approve button does not show 👍 Approved after clicking Approve button #72082

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
50c36e2
fix approved animation not running
allgandalf Oct 8, 2025
b7e117d
fix esLint error
allgandalf Oct 8, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions src/components/MoneyReportHeader.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -571,10 +571,12 @@ function MoneyReportHeader({
isChatReportArchived,
invoiceReceiverPolicy,
isPaidAnimationRunning,
isApprovedAnimationRunning,
isSubmittingAnimationRunning,
});
}, [
isPaidAnimationRunning,
isApprovedAnimationRunning,
isSubmittingAnimationRunning,
moneyRequestReport,
chatReport,
Expand Down
14 changes: 13 additions & 1 deletion ...omponents/ReportActionItem/MoneyRequestReportPreview/MoneyRequestReportPreviewContent.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(
() => [
Expand Down
5 changes: 4 additions & 1 deletion src/libs/ReportPreviewActionUtils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -220,13 +220,16 @@ function getReportPreviewAction(
transactions?: Transaction[],
invoiceReceiverPolicy?: Policy,
isPaidAnimationRunning?: boolean,
isApprovedAnimationRunning?: boolean,
isSubmittingAnimationRunning?: boolean,
): ValueOf<typeof CONST.REPORT.REPORT_PREVIEW_ACTIONS> {
if (!report) {
return CONST.REPORT.REPORT_PREVIEW_ACTIONS.VIEW;
}

if (isPaidAnimationRunning) {
// We want to have action displayed for either paid or approved animations
// eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
if (isPaidAnimationRunning || isApprovedAnimationRunning) {

@hoangzinh hoangzinh Oct 12, 2025

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could you elaborate on why we don't use ?? here?

@allgandalf allgandalf Oct 13, 2025

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I copied this logic from the previous code, so don't have much context here, but i think the issue here is that both the values above are booleans and not strings so my guess is that ?? won't work here, if you think we should try with ?? lmk i can work on this later today

@hoangzinh hoangzinh Oct 15, 2025

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I see. Let keep previous code then.

return CONST.REPORT.REPORT_PREVIEW_ACTIONS.PAY;
}

Expand Down
6 changes: 5 additions & 1 deletion src/libs/ReportPrimaryActionUtils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@ type GetReportPrimaryActionParams = {
isChatReportArchived: boolean;
invoiceReceiverPolicy?: Policy;
isPaidAnimationRunning?: boolean;
isApprovedAnimationRunning?: boolean;
isSubmittingAnimationRunning?: boolean;
};

Expand Down Expand Up @@ -333,10 +334,13 @@ function getReportPrimaryAction(params: GetReportPrimaryActionParams): ValueOf<t
chatReport,
invoiceReceiverPolicy,
isPaidAnimationRunning,
isApprovedAnimationRunning,
isSubmittingAnimationRunning,
} = params;

if (isPaidAnimationRunning) {
// 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.PRIMARY_ACTIONS.PAY;
}
if (isSubmittingAnimationRunning) {
Expand Down
Loading