Merge conflict

weareinreach · Mar 22, 2024 · 40598eb · 40598eb
1 parent ac4221b
commit 40598eb
Showing 1 changed file with 2 additions and 7 deletions.
diff --git a/packages/ui/modals/ServiceFilter/index.tsx b/packages/ui/modals/ServiceFilter/index.tsx
@@ -56,14 +56,9 @@ export const ServiceFilter = ({ resultCount, isFetching, current, disabled }: Se
 	const scrollAreaMaxHeight = isMobile ? viewportHeight - 210 + 30 : viewportHeight * 0.6 - 88
 	// #endregion
 
-	const preSelected = Array.isArray(router.query.s)
-		? router.query.s
-		: typeof router.query.s === 'string'
-			? [router.query.s]
-			: []
-
+	const preSelected = searchState.services
 	const form = useForm<{ selected: string[] }>({
-		values: { selected: current ? current : preSelected },
+		values: { selected: preSelected },
 	})
 	const servicesByCategory = useMemo(
 		() =>