Merge pull request #223 from software-mansion-labs/borys3kk-fix-58084-bugs

Borys3kk fix 58084 bugs

Author: jnowakow

src/libs/ReportPreviewActionUtils.ts

@@ -66,6 +66,7 @@ function canPay(report: Report, violations: OnyxCollection<TransactionViolation[
     const isClosed = isClosedReport(report);
     const isReportFinished = isApproved || isClosed;
     const {reimbursableSpend} = getMoneyRequestSpendBreakdown(report);
+    const isReimbursed = isSettled(report);
 
     const hasAnyViolations =
         hasViolations(report.reportID, violations) || hasNoticeTypeViolations(report.reportID, violations, true) || hasWarningTypeViolations(report.reportID, violations, true);
@@ -76,7 +77,7 @@ function canPay(report: Report, violations: OnyxCollection<TransactionViolation[
 
     const isIOU = isIOUReport(report);
 
-    if (isIOU && isReportPayer) {
+    if (isIOU && isReportPayer && !isReimbursed) {
         return true;
     }
 

src/libs/ReportPrimaryActionUtils.ts

@@ -54,7 +54,7 @@ function isApproveAction(report: Report, reportTransactions: Transaction[], poli
     const isReportApprover = isApproverUtils(policy, getCurrentUserAccountID());
     const isApprovalEnabled = policy?.approvalMode && policy.approvalMode !== CONST.POLICY.APPROVAL_MODE.OPTIONAL;
 
-    if (!isExpenseReport || !isReportApprover || !isApprovalEnabled) {
+    if (!isExpenseReport || !isReportApprover || !isApprovalEnabled || reportTransactions.length === 0) {
         return false;
     }
 

src/libs/ReportSecondaryActionUtils.ts

@@ -253,8 +253,10 @@ function isHoldAction(report: Report, reportTransactions: Transaction[]): boolea
 
 function isHoldActionForTransation(report: Report, reportTransaction: Transaction): boolean {
     const isExpenseReport = isExpenseReportUtils(report);
+    const isIOUReport = isIOUReportUtils(report);
+    const iouOrExpenseReport = isExpenseReport || isIOUReport;
 
-    if (!isExpenseReport) {
+    if (!iouOrExpenseReport) {
         return false;
     }