From aa86422621422ffffb22ea5187e3c51dd93e6f85 Mon Sep 17 00:00:00 2001
From: Eskalifer1 <artemkryt1800@gmail.com>
Date: Fri, 14 Nov 2025 11:56:17 +0200
Subject: [PATCH] fix:74387: Guard against missing keys in currentFeatureStates
 to avoid incorrect state updates

---
 src/pages/workspace/WorkspaceInitialPage.tsx | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/pages/workspace/WorkspaceInitialPage.tsx b/src/pages/workspace/WorkspaceInitialPage.tsx
index 917fa0d934a99..555e14f1e05bb 100644
--- a/src/pages/workspace/WorkspaceInitialPage.tsx
+++ b/src/pages/workspace/WorkspaceInitialPage.tsx
@@ -387,6 +387,10 @@ function WorkspaceInitialPage({policyDraft, policy: policyProp, route}: Workspac
             const newFeatureStates = {} as PolicyFeatureStates;
             let newlyEnabledFeature: PolicyFeatureName | null = null;
             (Object.keys(policy?.pendingFields ?? {}) as PolicyFeatureName[]).forEach((key) => {
+                if (!(key in currentFeatureStates)) {
+                    return;
+                }
+
                 const isFeatureEnabled = isPolicyFeatureEnabled(policy, key);
                 // Determine if this feature is newly enabled (wasn't enabled before but is now)
                 if (isFeatureEnabled && !currentFeatureStates[key]) {