fix(FE): resolve merge conflict

2026-05-23 23:05:46 +00:00 · 2025-11-13 14:12:25 +07:00
parent e5318fd6b5 7478c2597f
commit 56f57c4a6b
20 changed files with 1280 additions and 1410 deletions
@@ -138,10 +138,17 @@ export const formatGroupedApprovalsToApprovalSteps = (

      if (!approvalGroup) {
        const isWaiting = currentStepNumber === latestApproval.step_number + 1;
+        const isPreviousApprovalRejected =
+          groupedApprovals[groupedApprovals.length - 1].approvals[0].action ===
+          'REJECTED';

        return {
          name: approvalLineItem.step_name,
-          status: isWaiting ? 'WAITING' : 'IDLE',
+          status: isPreviousApprovalRejected
+            ? 'IDLE'
+            : isWaiting
+              ? 'WAITING'
+              : 'IDLE',
        };
      }