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

# Conflicts:
#	src/app/(main)/teams/TeamsDataTable.tsx
#	src/app/(main)/teams/TeamsJoinButton.tsx
#	src/app/(main)/teams/[teamId]/TeamSettings.tsx
This commit is contained in:
Mike Cao
2025-09-23 23:10:05 -07:00
10 changed files with 43 additions and 32 deletions

View File

@@ -119,7 +119,7 @@ export async function getQueryFilters(
}));
cohortFilters.push({
name: cohortParams.action.type,
name: `cohort_${cohortParams.action.type}`,
operator: 'eq',
value: cohortParams.action.value,
});