From b63589914a7e8afa5d13bedbfd1960e6c2fe9dcc Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Thu, 26 Feb 2026 17:46:22 +0000
Subject: [PATCH] Fix reverse highlight clearing; add state color fill-box to
 merge dialog rows

Co-authored-by: Azgaar <26469650+Azgaar@users.noreply.github.com>
---
 public/modules/dynamic/editors/states-editor.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/public/modules/dynamic/editors/states-editor.js b/public/modules/dynamic/editors/states-editor.js
index 30933c30..21c36912 100644
--- a/public/modules/dynamic/editors/states-editor.js
+++ b/public/modules/dynamic/editors/states-editor.js
@@ -1290,10 +1290,10 @@ function openStateMergeDialog() {
   const statesSelector = validStates
     .map(
       s => /* html */ `
-      <div data-id="${s.i}" data-tip="${s.fullName}" style="cursor:default">
+      <div class="states" data-id="${s.i}" data-tip="${s.fullName}" style="cursor:default">
         <input type="radio" name="rulingState" value="${s.i}" />
         <input id="selectState${s.i}" class="checkbox" type="checkbox" name="statesToMerge" value="${s.i}" />
-        <label for="selectState${s.i}" class="checkbox-label">${emblem(s.i)}${s.fullName}</label>
+        <label for="selectState${s.i}" class="checkbox-label"><fill-box fill="${s.color}" disabled></fill-box>${emblem(s.i)}${s.fullName}</label>
       </div>
     `
     )