From 3763e1b24d01884ab5495142fb8ff935bdcbb02d Mon Sep 17 00:00:00 2001
From: Jaanus Sellin <sellinjaanus@gmail.com>
Date: Wed, 21 Jun 2023 15:38:47 +0300
Subject: [PATCH] =?UTF-8?q?fix:=20default=20segments=20should=20only=20be?=
 =?UTF-8?q?=20selected=20when=20using=20default=20stra=E2=80=A6=20(#4040)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../FeatureStrategyCreate/FeatureStrategyCreate.tsx    | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/frontend/src/component/feature/FeatureStrategy/FeatureStrategyCreate/FeatureStrategyCreate.tsx b/frontend/src/component/feature/FeatureStrategy/FeatureStrategyCreate/FeatureStrategyCreate.tsx
index c9d433f09f8..aa982616156 100644
--- a/frontend/src/component/feature/FeatureStrategy/FeatureStrategyCreate/FeatureStrategyCreate.tsx
+++ b/frontend/src/component/feature/FeatureStrategy/FeatureStrategyCreate/FeatureStrategyCreate.tsx
@@ -40,7 +40,7 @@ export const FeatureStrategyCreate = () => {
     const featureId = useRequiredPathParam('featureId');
     const environmentId = useRequiredQueryParam('environmentId');
     const strategyName = useRequiredQueryParam('strategyName');
-    const useDefaultStrategy: boolean = JSON.parse(
+    const shouldUseDefaultStrategy: boolean = JSON.parse(
         useQueryParams().get('defaultStrategy') || 'false'
     );
     const { project } = useProject(projectId);
@@ -56,7 +56,9 @@ export const FeatureStrategyCreate = () => {
 
     const [strategy, setStrategy] = useState<Partial<IFeatureStrategy>>({});
 
-    const [segments, setSegments] = useState<ISegment[]>(strategySegments);
+    const [segments, setSegments] = useState<ISegment[]>(
+        shouldUseDefaultStrategy ? strategySegments : []
+    );
     const { strategyDefinition } = useStrategy(strategyName);
     const errors = useFormErrors();
 
@@ -98,12 +100,12 @@ export const FeatureStrategyCreate = () => {
     }, [feature.name]);
 
     useEffect(() => {
-        if (useDefaultStrategy) {
+        if (shouldUseDefaultStrategy) {
             setStrategy((defaultStrategy as any) || DEFAULT_STRATEGY);
         } else if (strategyDefinition) {
             setStrategy(createFeatureStrategy(featureId, strategyDefinition));
         }
-    }, [featureId, strategyDefinition, useDefaultStrategy]);
+    }, [featureId, strategyDefinition, shouldUseDefaultStrategy]);
 
     const onAddStrategy = async (payload: IFeatureStrategyPayload) => {
         await addStrategyToFeature(