Merge remote-tracking branch 'origin/dev' into dev

src/components/hooks/queries/useWebsiteCohortsQuery.ts

@@ -16,7 +16,7 @@ export function useWebsiteCohortsQuery(
   return useQuery({
     queryKey: ['website:cohorts', { websiteId, modified, ...filters, ...params }],
     queryFn: pageParams => {
-      return get(`/websites/${websiteId}/cohorts`, { ...pageParams, ...filters, ...params });
+      return get(`/websites/${websiteId}/segments`, { ...pageParams, ...filters, ...params });
     },
     enabled: !!websiteId,
     placeholderData: keepPreviousData,

src/components/hooks/queries/useWebsiteSegmentsQuery.ts

@@ -15,7 +15,8 @@ export function useWebsiteSegmentsQuery(
 
   return useQuery({
     queryKey: ['website:segments', { websiteId, modified, ...filters, ...params }],
-    queryFn: () => get(`/websites/${websiteId}/segments`, { ...filters, ...params }),
+    queryFn: pageParams =>
+      get(`/websites/${websiteId}/segments`, { ...pageParams, ...filters, ...params }),
     enabled: !!websiteId,
     placeholderData: keepPreviousData,
     ...options,