From c44d59b10cbace207735dc2c6af8e0f878529fee Mon Sep 17 00:00:00 2001
From: daledah <daleda261@outlook.com>
Date: Wed, 9 Apr 2025 16:46:58 +0700
Subject: [PATCH 1/2] fix: empty green button after paying with Expensify

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

diff --git a/src/libs/ReportPrimaryActionUtils.ts b/src/libs/ReportPrimaryActionUtils.ts
index 6d05e752102a..9c4e3a17a00a 100644
--- a/src/libs/ReportPrimaryActionUtils.ts
+++ b/src/libs/ReportPrimaryActionUtils.ts
@@ -68,6 +68,12 @@ function isApproveAction(report: Report, reportTransactions: Transaction[], poli
 }
 
 function isPayAction(report: Report, policy?: Policy) {
+    const isProcessingReport = isProcessingReportUtils(report);
+
+    if (!isProcessingReport) {
+        return false;
+    }
+
     const isExpenseReport = isExpenseReportUtils(report);
     const isReportPayer = isPayer(getSession(), report, false, policy);
     const arePaymentsEnabled = arePaymentsEnabledUtils(policy);
@@ -79,12 +85,6 @@ function isPayAction(report: Report, policy?: Policy) {
         return true;
     }
 
-    const isProcessingReport = isProcessingReportUtils(report);
-
-    if (!isProcessingReport) {
-        return false;
-    }
-
     const isIOUReport = isIOUReportUtils(report);
 
     if (isIOUReport && isReportPayer) {

From 8647853ed68452c287b2c96c6d39f5207809f091 Mon Sep 17 00:00:00 2001
From: daledah <daleda261@outlook.com>
Date: Wed, 9 Apr 2025 17:15:52 +0700
Subject: [PATCH 2/2] add new condition

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

diff --git a/src/libs/ReportPreviewActionUtils.ts b/src/libs/ReportPreviewActionUtils.ts
index 13033f249e06..60cc60630200 100644
--- a/src/libs/ReportPreviewActionUtils.ts
+++ b/src/libs/ReportPreviewActionUtils.ts
@@ -56,7 +56,7 @@ function canPay(report: Report, violations: OnyxCollection<TransactionViolation[
     if (!isReportPayer) {
         return false;
     }
-    return (isExpense && isPaymentsEnabled && (isApproved || isClosed) && !hasViolations) || ((isInvoice || isIOU) && isProcessing);
+    return (isExpense && isPaymentsEnabled && ((isApproved && !report.isWaitingOnBankAccount) || isClosed) && !hasViolations) || ((isInvoice || isIOU) && isProcessing);
 }
 
 function canExport(report: Report, violations: OnyxCollection<TransactionViolation[]>, policy?: Policy) {
diff --git a/src/libs/ReportPrimaryActionUtils.ts b/src/libs/ReportPrimaryActionUtils.ts
index 9c4e3a17a00a..bcc924804a55 100644
--- a/src/libs/ReportPrimaryActionUtils.ts
+++ b/src/libs/ReportPrimaryActionUtils.ts
@@ -68,23 +68,23 @@ function isApproveAction(report: Report, reportTransactions: Transaction[], poli
 }
 
 function isPayAction(report: Report, policy?: Policy) {
-    const isProcessingReport = isProcessingReportUtils(report);
-
-    if (!isProcessingReport) {
-        return false;
-    }
-
     const isExpenseReport = isExpenseReportUtils(report);
     const isReportPayer = isPayer(getSession(), report, false, policy);
     const arePaymentsEnabled = arePaymentsEnabledUtils(policy);
     const isReportApproved = isReportApprovedUtils({report});
     const isReportClosed = isClosedReportUtils(report);
-    const isReportFinished = isReportApproved || isReportClosed;
+    const isReportFinished = (isReportApproved && !report.isWaitingOnBankAccount) || isReportClosed;
 
     if (isReportPayer && isExpenseReport && arePaymentsEnabled && isReportFinished) {
         return true;
     }
 
+    const isProcessingReport = isProcessingReportUtils(report);
+
+    if (!isProcessingReport) {
+        return false;
+    }
+
     const isIOUReport = isIOUReportUtils(report);
 
     if (isIOUReport && isReportPayer) {