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>({}); - const [segments, setSegments] = useState(strategySegments); + const [segments, setSegments] = useState( + 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(