From f444cea9d16d02928451c1fbba2bbb4f68a19d31 Mon Sep 17 00:00:00 2001
From: loucass003 <loucass003@gmail.com>
Date: Fri, 12 Dec 2025 18:22:49 +0100
Subject: [PATCH 1/4] Make ignore buttons be session only in checklist

---
 .../settings/pages/HomeScreenSettings.tsx     |  4 +-
 .../tracking-checklist/TrackingChecklist.tsx  | 28 +++++------
 gui/src/hooks/tracking-checklist.ts           | 46 +++++++++++++++----
 .../dev/slimevr/config/ConfigManager.java     |  1 +
 .../config/CurrentVRConfigConverter.java      |  6 +++
 .../main/java/dev/slimevr/config/VRConfig.kt  |  4 +-
 6 files changed, 62 insertions(+), 27 deletions(-)

diff --git a/gui/src/components/settings/pages/HomeScreenSettings.tsx b/gui/src/components/settings/pages/HomeScreenSettings.tsx
index 12ecb44ad9..6c19d39ed1 100644
--- a/gui/src/components/settings/pages/HomeScreenSettings.tsx
+++ b/gui/src/components/settings/pages/HomeScreenSettings.tsx
@@ -54,11 +54,11 @@ export function TrackingChecklistSettings({
       // doing it this way prevents calling ignore step for every step.
       // that prevent sending a packet for steps that didnt change
       if (!value && !ignoredSteps.includes(stepId)) {
-        ignoreStep(stepId, true);
+        ignoreStep(stepId, true, false);
       }
 
       if (value && ignoredSteps.includes(stepId)) {
-        ignoreStep(stepId, false);
+        ignoreStep(stepId, false, false);
       }
     }
   };
diff --git a/gui/src/components/tracking-checklist/TrackingChecklist.tsx b/gui/src/components/tracking-checklist/TrackingChecklist.tsx
index 1e3271e82f..b1117ead83 100644
--- a/gui/src/components/tracking-checklist/TrackingChecklist.tsx
+++ b/gui/src/components/tracking-checklist/TrackingChecklist.tsx
@@ -109,7 +109,7 @@ const stepContentLookup: Record<
     context: TrackingChecklistContext
   ) => JSX.Element
 > = {
-  [TrackingChecklistStepId.TRACKERS_REST_CALIBRATION]: (step, { toggle }) => {
+  [TrackingChecklistStepId.TRACKERS_REST_CALIBRATION]: (step, { toggleSession }) => {
     return (
       <div className="space-y-2.5">
         <Typography id="tracking_checklist-TRACKERS_REST_CALIBRATION-desc" />
@@ -118,7 +118,7 @@ const stepContentLookup: Record<
             <Button
               id="tracking_checklist-ignore"
               variant="secondary"
-              onClick={() => toggle(step.id)}
+              onClick={() => toggleSession(step.id)}
             />
           )}
         </div>
@@ -166,7 +166,7 @@ const stepContentLookup: Record<
       </div>
     );
   },
-  [TrackingChecklistStepId.STEAMVR_DISCONNECTED]: (step, { toggle }) => {
+  [TrackingChecklistStepId.STEAMVR_DISCONNECTED]: (step, { toggleSession }) => {
     return (
       <>
         <div className="space-y-2.5">
@@ -181,7 +181,7 @@ const stepContentLookup: Record<
               <Button
                 id="tracking_checklist-ignore"
                 variant="secondary"
-                onClick={() => toggle(step.id)}
+                onClick={() => toggleSession(step.id)}
               />
             )}
           </div>
@@ -195,7 +195,7 @@ const stepContentLookup: Record<
   [TrackingChecklistStepId.UNASSIGNED_HMD]: () => {
     return <Typography id="tracking_checklist-UNASSIGNED_HMD-desc" />;
   },
-  [TrackingChecklistStepId.NETWORK_PROFILE_PUBLIC]: (step, { toggle }) => {
+  [TrackingChecklistStepId.NETWORK_PROFILE_PUBLIC]: (step, { toggleSession }) => {
     const data = step.extraData as TrackingChecklistPublicNetworksT | null;
     return (
       <>
@@ -226,7 +226,7 @@ const stepContentLookup: Record<
               <Button
                 id="tracking_checklist-ignore"
                 variant="secondary"
-                onClick={() => toggle(step.id)}
+                onClick={() => toggleSession(step.id)}
               />
             )}
           </div>
@@ -234,7 +234,7 @@ const stepContentLookup: Record<
       </>
     );
   },
-  [TrackingChecklistStepId.VRCHAT_SETTINGS]: (step, { toggle }) => {
+  [TrackingChecklistStepId.VRCHAT_SETTINGS]: (step, { toggleSession }) => {
     return (
       <>
         <div className="space-y-2.5">
@@ -249,7 +249,7 @@ const stepContentLookup: Record<
               <Button
                 id="tracking_checklist-ignore"
                 variant="secondary"
-                onClick={() => toggle(step.id)}
+                onClick={() => toggleSession(step.id)}
               />
             )}
           </div>
@@ -257,7 +257,7 @@ const stepContentLookup: Record<
       </>
     );
   },
-  [TrackingChecklistStepId.MOUNTING_CALIBRATION]: (step, { toggle }) => {
+  [TrackingChecklistStepId.MOUNTING_CALIBRATION]: (step, { toggleSession }) => {
     return (
       <div className="space-y-2.5">
         <Typography id="onboarding-automatic_mounting-mounting_reset-step-0" />
@@ -275,14 +275,14 @@ const stepContentLookup: Record<
             <Button
               id="tracking_checklist-ignore"
               variant="secondary"
-              onClick={() => toggle(step.id)}
+              onClick={() => toggleSession(step.id)}
             />
           )}
         </div>
       </div>
     );
   },
-  [TrackingChecklistStepId.FEET_MOUNTING_CALIBRATION]: (step, { toggle }) => {
+  [TrackingChecklistStepId.FEET_MOUNTING_CALIBRATION]: (step, { toggleSession }) => {
     return (
       <div className="space-y-2.5">
         <Typography id="onboarding-automatic_mounting-mounting_reset-feet-step-0" />
@@ -309,14 +309,14 @@ const stepContentLookup: Record<
             <Button
               id="tracking_checklist-ignore"
               variant="secondary"
-              onClick={() => toggle(step.id)}
+              onClick={() => toggleSession(step.id)}
             />
           )}
         </div>
       </div>
     );
   },
-  [TrackingChecklistStepId.STAY_ALIGNED_CONFIGURED]: (step, { toggle }) => {
+  [TrackingChecklistStepId.STAY_ALIGNED_CONFIGURED]: (step, { toggleSession }) => {
     return (
       <>
         <div className="space-y-2.5">
@@ -332,7 +332,7 @@ const stepContentLookup: Record<
               <Button
                 id="tracking_checklist-ignore"
                 variant="secondary"
-                onClick={() => toggle(step.id)}
+                onClick={() => toggleSession(step.id)}
               />
             )}
           </div>
diff --git a/gui/src/hooks/tracking-checklist.ts b/gui/src/hooks/tracking-checklist.ts
index 94f24c2a65..38e2629fc0 100644
--- a/gui/src/hooks/tracking-checklist.ts
+++ b/gui/src/hooks/tracking-checklist.ts
@@ -92,8 +92,16 @@ export type Steps = {
   visibleSteps: TrackingChecklistStep[];
   ignoredSteps: TrackingChecklistStepId[];
 };
+
+const filterActive =
+  (ignoredSteps: TrackingChecklistStepId[]) => (step: TrackingChecklistStepT) =>
+    !ignoredSteps.includes(step.id) && step.enabled;
+
 export function provideTrackingChecklist() {
   const { sendRPCPacket, useRPCPacket } = useWebsocketAPI();
+  const [sessionIgnoredSteps, setSessionIgnoredSteps] = useState<
+    TrackingChecklistStepId[]
+  >([]);
   const [steps, setSteps] = useState<Steps>({
     steps: [],
     visibleSteps: [],
@@ -104,7 +112,7 @@ export function provideTrackingChecklist() {
     RpcMessage.TrackingChecklistResponse,
     (data: TrackingChecklistResponseT) => {
       const activeSteps = data.steps.filter(
-        (step) => !data.ignoredSteps.includes(step.id) && step.enabled
+        filterActive([...data.ignoredSteps, ...sessionIgnoredSteps])
       );
       setSteps({
         steps: data.steps,
@@ -161,26 +169,46 @@ export function provideTrackingChecklist() {
     [steps]
   );
 
-  const ignoreStep = (step: TrackingChecklistStepId, ignore: boolean) => {
-    const res = new IgnoreTrackingChecklistStepRequestT();
-    res.stepId = step;
-    res.ignore = ignore;
-    sendRPCPacket(RpcMessage.IgnoreTrackingChecklistStepRequest, res);
+  const ignoreStep = (
+    step: TrackingChecklistStepId,
+    ignore: boolean,
+    session = true
+  ) => {
+    if (!session) {
+      const res = new IgnoreTrackingChecklistStepRequestT();
+      res.stepId = step;
+      res.ignore = ignore;
+      sendRPCPacket(RpcMessage.IgnoreTrackingChecklistStepRequest, res);
+    }
+    setSessionIgnoredSteps((curr) => {
+      if (ignore && !curr.includes(step)) return [...curr, step];
+      if (!ignore && curr.includes(step)) {
+        curr.splice(curr.indexOf(step), 1);
+        return curr;
+      }
+      return curr;
+    });
     Sentry.metrics.count(ignore ? 'mute_checklist_step' : 'unmute_checklist_step', 1, {
-      attributes: { step: TrackingChecklistStepId[step] },
+      attributes: { step: TrackingChecklistStepId[step], session },
     });
+    if (session) {
+      // Force refresh of the flightlist when ignoring a step as the filtering
+      // is done only in one place to simplify the data flow
+      sendRPCPacket(RpcMessage.TrackingChecklistRequest, new TrackingChecklistRequestT());
+    }
   };
 
   return {
     ...steps,
+    sessionIgnoredSteps,
     firstRequired,
     highlightedTrackers,
     progress,
     completion,
     warnings,
     ignoreStep,
-    toggle: (step: TrackingChecklistStepId) =>
-      ignoreStep(step, !steps.ignoredSteps.includes(step)),
+    toggleSession: (step: TrackingChecklistStepId) =>
+      ignoreStep(step, !sessionIgnoredSteps.includes(step)),
   };
 }
 
diff --git a/server/core/src/main/java/dev/slimevr/config/ConfigManager.java b/server/core/src/main/java/dev/slimevr/config/ConfigManager.java
index 51bfcd7b04..a99bad3f20 100644
--- a/server/core/src/main/java/dev/slimevr/config/ConfigManager.java
+++ b/server/core/src/main/java/dev/slimevr/config/ConfigManager.java
@@ -1,3 +1,4 @@
+
 package dev.slimevr.config;
 
 import com.fasterxml.jackson.databind.DeserializationFeature;
diff --git a/server/core/src/main/java/dev/slimevr/config/CurrentVRConfigConverter.java b/server/core/src/main/java/dev/slimevr/config/CurrentVRConfigConverter.java
index 76dc56d261..be9dc7e231 100644
--- a/server/core/src/main/java/dev/slimevr/config/CurrentVRConfigConverter.java
+++ b/server/core/src/main/java/dev/slimevr/config/CurrentVRConfigConverter.java
@@ -339,6 +339,12 @@ public ObjectNode convert(
 					}
 				}
 			}
+
+			if (version < 15) {
+				ObjectNode checklistNode = (ObjectNode) modelData.get("trackingChecklist");
+				ArrayNode ignoredStepsArray = (ArrayNode) checklistNode.get("ignoredStepsIds");
+				ignoredStepsArray.removeAll();
+			}
 		} catch (Exception e) {
 			LogManager.severe("Error during config migration: " + e);
 		}
diff --git a/server/core/src/main/java/dev/slimevr/config/VRConfig.kt b/server/core/src/main/java/dev/slimevr/config/VRConfig.kt
index 0a01a4d42b..9ad2756f07 100644
--- a/server/core/src/main/java/dev/slimevr/config/VRConfig.kt
+++ b/server/core/src/main/java/dev/slimevr/config/VRConfig.kt
@@ -10,8 +10,8 @@ import dev.slimevr.tracking.trackers.Tracker
 import dev.slimevr.tracking.trackers.TrackerRole
 
 @JsonVersionedModel(
-	currentVersion = "14",
-	defaultDeserializeToVersion = "14",
+	currentVersion = "15",
+	defaultDeserializeToVersion = "15",
 	toCurrentConverterClass = CurrentVRConfigConverter::class,
 )
 class VRConfig {

From f9b62e68dc97f54465affcb5a3a9820ded2720fe Mon Sep 17 00:00:00 2001
From: loucass003 <loucass003@gmail.com>
Date: Fri, 12 Dec 2025 18:34:26 +0100
Subject: [PATCH 2/4] Lint

---
 .../tracking-checklist/TrackingChecklist.tsx  | 20 +++++++++++++++----
 gui/src/hooks/tracking-checklist.ts           |  5 ++++-
 2 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/gui/src/components/tracking-checklist/TrackingChecklist.tsx b/gui/src/components/tracking-checklist/TrackingChecklist.tsx
index b1117ead83..20626fd3dd 100644
--- a/gui/src/components/tracking-checklist/TrackingChecklist.tsx
+++ b/gui/src/components/tracking-checklist/TrackingChecklist.tsx
@@ -109,7 +109,10 @@ const stepContentLookup: Record<
     context: TrackingChecklistContext
   ) => JSX.Element
 > = {
-  [TrackingChecklistStepId.TRACKERS_REST_CALIBRATION]: (step, { toggleSession }) => {
+  [TrackingChecklistStepId.TRACKERS_REST_CALIBRATION]: (
+    step,
+    { toggleSession }
+  ) => {
     return (
       <div className="space-y-2.5">
         <Typography id="tracking_checklist-TRACKERS_REST_CALIBRATION-desc" />
@@ -195,7 +198,10 @@ const stepContentLookup: Record<
   [TrackingChecklistStepId.UNASSIGNED_HMD]: () => {
     return <Typography id="tracking_checklist-UNASSIGNED_HMD-desc" />;
   },
-  [TrackingChecklistStepId.NETWORK_PROFILE_PUBLIC]: (step, { toggleSession }) => {
+  [TrackingChecklistStepId.NETWORK_PROFILE_PUBLIC]: (
+    step,
+    { toggleSession }
+  ) => {
     const data = step.extraData as TrackingChecklistPublicNetworksT | null;
     return (
       <>
@@ -282,7 +288,10 @@ const stepContentLookup: Record<
       </div>
     );
   },
-  [TrackingChecklistStepId.FEET_MOUNTING_CALIBRATION]: (step, { toggleSession }) => {
+  [TrackingChecklistStepId.FEET_MOUNTING_CALIBRATION]: (
+    step,
+    { toggleSession }
+  ) => {
     return (
       <div className="space-y-2.5">
         <Typography id="onboarding-automatic_mounting-mounting_reset-feet-step-0" />
@@ -316,7 +325,10 @@ const stepContentLookup: Record<
       </div>
     );
   },
-  [TrackingChecklistStepId.STAY_ALIGNED_CONFIGURED]: (step, { toggleSession }) => {
+  [TrackingChecklistStepId.STAY_ALIGNED_CONFIGURED]: (
+    step,
+    { toggleSession }
+  ) => {
     return (
       <>
         <div className="space-y-2.5">
diff --git a/gui/src/hooks/tracking-checklist.ts b/gui/src/hooks/tracking-checklist.ts
index 38e2629fc0..872ed6d5ac 100644
--- a/gui/src/hooks/tracking-checklist.ts
+++ b/gui/src/hooks/tracking-checklist.ts
@@ -194,7 +194,10 @@ export function provideTrackingChecklist() {
     if (session) {
       // Force refresh of the flightlist when ignoring a step as the filtering
       // is done only in one place to simplify the data flow
-      sendRPCPacket(RpcMessage.TrackingChecklistRequest, new TrackingChecklistRequestT());
+      sendRPCPacket(
+        RpcMessage.TrackingChecklistRequest,
+        new TrackingChecklistRequestT()
+      );
     }
   };
 

From 3f694d1b75c472387f5cb95cc311fc3658418301 Mon Sep 17 00:00:00 2001
From: loucass003 <loucass003@gmail.com>
Date: Fri, 12 Dec 2025 18:39:19 +0100
Subject: [PATCH 3/4] Pevent dual flightlist refresh for nothing

---
 gui/src/hooks/tracking-checklist.ts | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/gui/src/hooks/tracking-checklist.ts b/gui/src/hooks/tracking-checklist.ts
index 872ed6d5ac..8bb7c433e6 100644
--- a/gui/src/hooks/tracking-checklist.ts
+++ b/gui/src/hooks/tracking-checklist.ts
@@ -174,12 +174,6 @@ export function provideTrackingChecklist() {
     ignore: boolean,
     session = true
   ) => {
-    if (!session) {
-      const res = new IgnoreTrackingChecklistStepRequestT();
-      res.stepId = step;
-      res.ignore = ignore;
-      sendRPCPacket(RpcMessage.IgnoreTrackingChecklistStepRequest, res);
-    }
     setSessionIgnoredSteps((curr) => {
       if (ignore && !curr.includes(step)) return [...curr, step];
       if (!ignore && curr.includes(step)) {
@@ -198,6 +192,11 @@ export function provideTrackingChecklist() {
         RpcMessage.TrackingChecklistRequest,
         new TrackingChecklistRequestT()
       );
+    } else {
+      const res = new IgnoreTrackingChecklistStepRequestT();
+      res.stepId = step;
+      res.ignore = ignore;
+      sendRPCPacket(RpcMessage.IgnoreTrackingChecklistStepRequest, res);
     }
   };
 

From 252370835e0cc5e6cdfca2964778d0b0b840b637 Mon Sep 17 00:00:00 2001
From: loucass003 <loucass003@gmail.com>
Date: Thu, 18 Dec 2025 03:55:53 +0100
Subject: [PATCH 4/4] Prevent null error

---
 .../src/main/java/dev/slimevr/config/ConfigManager.java    | 1 -
 .../java/dev/slimevr/config/CurrentVRConfigConverter.java  | 7 +++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/server/core/src/main/java/dev/slimevr/config/ConfigManager.java b/server/core/src/main/java/dev/slimevr/config/ConfigManager.java
index a99bad3f20..51bfcd7b04 100644
--- a/server/core/src/main/java/dev/slimevr/config/ConfigManager.java
+++ b/server/core/src/main/java/dev/slimevr/config/ConfigManager.java
@@ -1,4 +1,3 @@
-
 package dev.slimevr.config;
 
 import com.fasterxml.jackson.databind.DeserializationFeature;
diff --git a/server/core/src/main/java/dev/slimevr/config/CurrentVRConfigConverter.java b/server/core/src/main/java/dev/slimevr/config/CurrentVRConfigConverter.java
index be9dc7e231..77a1a777fb 100644
--- a/server/core/src/main/java/dev/slimevr/config/CurrentVRConfigConverter.java
+++ b/server/core/src/main/java/dev/slimevr/config/CurrentVRConfigConverter.java
@@ -342,8 +342,11 @@ public ObjectNode convert(
 
 			if (version < 15) {
 				ObjectNode checklistNode = (ObjectNode) modelData.get("trackingChecklist");
-				ArrayNode ignoredStepsArray = (ArrayNode) checklistNode.get("ignoredStepsIds");
-				ignoredStepsArray.removeAll();
+				if (checklistNode != null) {
+					ArrayNode ignoredStepsArray = (ArrayNode) checklistNode.get("ignoredStepsIds");
+					if (ignoredStepsArray != null)
+						ignoredStepsArray.removeAll();
+				}
 			}
 		} catch (Exception e) {
 			LogManager.severe("Error during config migration: " + e);