From 65a1e9f4ca17942a4c12c1e2c9761a52632c69ef Mon Sep 17 00:00:00 2001
From: kenneth-hmcts <91327278+kenneth-hmcts@users.noreply.github.com>
Date: Wed, 30 Aug 2023 13:44:04 +0100
Subject: [PATCH] CIV-10045 Claim missing on the Dashboard (#3163)

* CIV-10045: Adding Checking for Case Settled

* CIV-10045: Code Smell

* CIV-10045: Code Smell

* CIV-10045: Code Smell

* CIV-10045: Rollback

* CIV-10045: Rollback

* CIV-10045: Code Smell

* CIV-10045: Add back changes

* CIV-10045: Code Smell

---------

Co-authored-by: Kadir Egilmez <40733099+laperla11@users.noreply.github.com>
Co-authored-by: neeta-hmcts <115545612+neeta-hmcts@users.noreply.github.com>
Co-authored-by: Pablo Ortiz <pablo.gutierrez@version1.com>
---
 .../civil/model/citizenui/CcdDashboardClaimMatcher.java      | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/main/java/uk/gov/hmcts/reform/civil/model/citizenui/CcdDashboardClaimMatcher.java b/src/main/java/uk/gov/hmcts/reform/civil/model/citizenui/CcdDashboardClaimMatcher.java
index 1e4019ff0b7..ea118401122 100644
--- a/src/main/java/uk/gov/hmcts/reform/civil/model/citizenui/CcdDashboardClaimMatcher.java
+++ b/src/main/java/uk/gov/hmcts/reform/civil/model/citizenui/CcdDashboardClaimMatcher.java
@@ -89,7 +89,8 @@ public boolean isSettled() {
             && (caseData.respondent1PaidInFull()
             || caseData.isResponseAcceptedByClaimant())
             && Objects.isNull(caseData.getCcjPaymentDetails())
-            && !caseData.hasApplicantRejectedRepaymentPlan();
+            && !caseData.hasApplicantRejectedRepaymentPlan()
+            || caseData.isPartAdmitClaimSettled();
     }
 
     @Override
@@ -184,7 +185,7 @@ public boolean hasSdoBeenDrawn() {
 
     @Override
     public boolean isBeforeHearing() {
-        return (isBeforeSmallClaimHearing() || isBeforeFastTrackHearing()) || noHearingScheduled();
+        return isBeforeSmallClaimHearing() || (isBeforeFastTrackHearing() || noHearingScheduled());
     }
 
     private boolean noHearingScheduled() {