From 7cfe677126451c2d80a9648f46b9b9806c368e24 Mon Sep 17 00:00:00 2001
From: Aaron Wood <aaron.wood@mac.lan>
Date: Sun, 12 Apr 2026 01:41:43 -0400
Subject: [PATCH] fix: rounds_remaining null fallback; is_dead guard on dying
 tag; flex layout

---
 client/src/components/InitiativeTracker.module.css | 1 +
 client/src/components/InitiativeTracker.tsx        | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/client/src/components/InitiativeTracker.module.css b/client/src/components/InitiativeTracker.module.css
index 352d3aa..a835b4b 100644
--- a/client/src/components/InitiativeTracker.module.css
+++ b/client/src/components/InitiativeTracker.module.css
@@ -309,6 +309,7 @@
   font-weight: 600;
   margin-left: auto;
   white-space: nowrap;
+  flex-shrink: 0;
 }
 
 .recoveryBtn {
diff --git a/client/src/components/InitiativeTracker.tsx b/client/src/components/InitiativeTracker.tsx
index b67999c..98d6dd3 100644
--- a/client/src/components/InitiativeTracker.tsx
+++ b/client/src/components/InitiativeTracker.tsx
@@ -278,9 +278,9 @@ function ActivePhase({
               <span className={partyActive ? styles.activeName : styles.rollName}>
                 {c.is_dead ? "\u{1F480} " : ""}{c.name}
               </span>
-              {dyingCondition && (
+              {dyingCondition && !c.is_dead && (
                 <span className={styles.dyingTag}>
-                  {"\u{1F480}"} Dying ({dyingCondition.rounds_remaining}r)
+                  {"\u{1F480}"} Dying ({dyingCondition.rounds_remaining ?? "?"}r)
                 </span>
               )}
               {isDM && dyingCondition && !c.is_dead && (