Merge branch 'dev' of https://github.com/umami-software/umami into dev

# Conflicts:
#	prisma/schema.prisma

prisma/schema.prisma

@@ -6,7 +6,6 @@ generator client {
 
 datasource db {
   provider     = "postgresql"
-  relationMode = "prisma"
 }
 
 model User {

src/app/(main)/teams/TeamsHeader.tsx

@@ -18,7 +18,7 @@ export function TeamsHeader({
   return (
     <PageHeader title={formatMessage(labels.teams)}>
       <Row gap="3">
-        {allowJoin && user.role !== ROLES.viewOnly && <TeamsJoinButton />}
+        {allowJoin && <TeamsJoinButton />}
         {allowCreate && user.role !== ROLES.viewOnly && <TeamsAddButton />}
       </Row>
     </PageHeader>

src/app/(main)/websites/[websiteId]/(reports)/revenue/Revenue.tsx

@@ -137,7 +137,7 @@ export function Revenue({ websiteId, startDate, endDate, unit }: RevenueProps) {
                 metric={formatMessage(labels.revenue)}
                 data={data?.country.map(({ name, value }: { name: string; value: number }) => ({
                   label: name,
-                  count: value,
+                  count: Number(value),
                   percent: (value / data?.total.sum) * 100,
                 }))}
                 currency={currency}