aaron/darkwatch
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix: rounds_remaining null fallback; is_dead guard on dying tag; flex layout

Browse source
This commit is contained in:
Aaron Wood 2026-04-12 01:41:43 -04:00
parent bf7db6bd4c
commit 7cfe677126
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
client/src/components/InitiativeTracker.module.css
View file

@ -309,6 +309,7 @@
font-weight: 600;
margin-left: auto;
white-space: nowrap;
flex-shrink: 0;
}
.recoveryBtn {

4
client/src/components/InitiativeTracker.tsx
View file

@ -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 && (