Merge pull request #59892 from daledah/fix/59886

fix: empty green button after paying with Expensify
(cherry picked from commit 4c5750a)

(CP triggered by mountiny)

Author: Gonals

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) {

src/libs/ReportPrimaryActionUtils.ts

@@ -73,7 +73,7 @@ function isPayAction(report: Report, policy?: 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;