Update TagCaseState.tsx

island-is · Jan 6, 2025 · a52e8cb · a52e8cb
1 parent d06f326
commit a52e8cb
Showing 1 changed file with 9 additions and 6 deletions.
diff --git a/apps/judicial-system/web/src/components/TagCaseState/TagCaseState.tsx b/apps/judicial-system/web/src/components/TagCaseState/TagCaseState.tsx
@@ -84,12 +84,15 @@ export const mapCaseStateToTagVariant = (
         text: formatMessage(isCourtRole ? strings.new : strings.sent),
       }
     case CaseState.RECEIVED: {
-      if (isIndictmentCase(caseType) && defendants) {
-        if (scheduledDate && !haveAllSubpoenasBeenServiced(defendants)) {
-          return {
-            color: 'red',
-            text: formatMessage(strings.notYetServiced),
-          }
+      if (
+        isIndictmentCase(caseType) &&
+        defendants &&
+        scheduledDate &&
+        !haveAllSubpoenasBeenServiced(defendants)
+      ) {
+        return {
+          color: 'red',
+          text: formatMessage(strings.notYetServiced),
         }
       }
       switch (indictmentDecision) {