From 5224e6a335deac1265c3a400f54eb2c92203bbac Mon Sep 17 00:00:00 2001
From: Thomas Kaul <4159106+dtslvr@users.noreply.github.com>
Date: Sun, 14 Jun 2026 19:08:00 +0200
Subject: [PATCH] Bugfix/improve loading state when customizing rule thresholds
 on X-ray page (#7039)

* Improve loading state

* Update changelog
---
 CHANGELOG.md                                              | 4 ++++
 apps/client/src/app/components/rules/rules.component.html | 4 +---
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 632ad7330..5f1fa380c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -21,6 +21,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Upgraded `bull-board` from version `7.1.5` to `7.2.1`
 - Upgraded `date-fns` from version `4.1.0` to `4.4.0`
 
+### Fixed
+
+- Improved the loading state when customizing the rule thresholds on the _X-ray_ page
+
 ## 3.10.0 - 2026-06-13
 
 ### Changed
diff --git a/apps/client/src/app/components/rules/rules.component.html b/apps/client/src/app/components/rules/rules.component.html
index 0c3153c52..97b41e61b 100644
--- a/apps/client/src/app/components/rules/rules.component.html
+++ b/apps/client/src/app/components/rules/rules.component.html
@@ -3,9 +3,7 @@
     <div class="col">
       @if (isLoading) {
         <gf-rule [isLoading]="true" />
-      }
-
-      @if (rules !== null && rules !== undefined) {
+      } @else if (rules) {
         @for (rule of rules; track rule.key) {
           <gf-rule
             [categoryName]="categoryName"