Merge branch 'dev' into boards

# Conflicts:
#	pnpm-lock.yaml

src/components/hooks/queries/useEventDataValuesQuery.ts

@@ -16,7 +16,7 @@ export function useEventDataValuesQuery(
   return useQuery<any>({
     queryKey: [
       'websites:event-data:values',
-      { websiteId, event, propertyName, startAt, endAt, unit, timezone, ...filters },
+      { websiteId, startAt, endAt, unit, timezone, ...filters, event, propertyName },
     ],
     queryFn: () =>
       get(`/websites/${websiteId}/event-data/values`, {

src/components/input/WebsiteSelect.tsx

@@ -65,7 +65,7 @@ export function WebsiteSelect({
       renderValue={renderValue}
       listProps={{
         renderEmptyState: () => <Empty message={formatMessage(messages.noResultsFound)} />,
-        style: { maxHeight: '400px' },
+        style: { maxHeight: 'calc(42vh - 65px)' },
       }}
     >
       {({ id, name }: any) => <ListItem key={id}>{name}</ListItem>}

src/components/messages.ts

@@ -351,6 +351,7 @@ export const labels = defineMessages({
   growth: { id: 'label.growth', defaultMessage: 'Growth' },
   account: { id: 'label.account', defaultMessage: 'Account' },
   application: { id: 'label.application', defaultMessage: 'Application' },
+  version: { id: 'label.version', defaultMessage: 'Version' },
   saveSegment: { id: 'label.save-segment', defaultMessage: 'Save as segment' },
   saveCohort: { id: 'label.save-cohort', defaultMessage: 'Save as cohort' },
   analysis: { id: 'label.analysis', defaultMessage: 'Analysis' },