From 81dea02379b05589d3a8d538f7e8d9c74b74141e Mon Sep 17 00:00:00 2001
From: Francis Cao <franciscao@gmail.com>
Date: Tue, 30 Sep 2025 09:38:37 -0700
Subject: [PATCH 1/5] fix transfer website dropdown and values

---
 pnpm-lock.yaml                                              | 2 --
 .../websites/[websiteId]/settings/WebsiteTransferForm.tsx   | 6 +++---
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 61707399d..ef343700c 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -367,8 +367,6 @@ importers:
         specifier: ^5.9.2
         version: 5.9.2
 
-  dist: {}
-
 packages:
 
   '@ampproject/remapping@2.3.0':
diff --git a/src/app/(main)/websites/[websiteId]/settings/WebsiteTransferForm.tsx b/src/app/(main)/websites/[websiteId]/settings/WebsiteTransferForm.tsx
index 9752a48e5..f16ab93c0 100644
--- a/src/app/(main)/websites/[websiteId]/settings/WebsiteTransferForm.tsx
+++ b/src/app/(main)/websites/[websiteId]/settings/WebsiteTransferForm.tsx
@@ -37,8 +37,8 @@ export function WebsiteTransferForm({
   const isTeamWebsite = !!website?.teamId;
 
   const items =
-    teams?.data?.filter(({ teamUser }) =>
-      teamUser.find(
+    teams?.data?.filter(({ members }) =>
+      members.some(
         ({ role, userId }) =>
           [ROLES.teamOwner, ROLES.teamManager].includes(role) && userId === user.id,
       ),
@@ -79,7 +79,7 @@ export function WebsiteTransferForm({
           <Select onSelectionChange={handleChange} selectedKey={teamId}>
             {items.map(({ id, name }) => {
               return (
-                <ListItem key={`${id}!!!!`} id={`${id}????`}>
+                <ListItem key={`${id}`} id={`${id}`}>
                   {name}
                 </ListItem>
               );

From 1b54ba3e6ed57474fdd3dae0f584b73c698b2e60 Mon Sep 17 00:00:00 2001
From: Francis Cao <franciscao@gmail.com>
Date: Tue, 30 Sep 2025 11:19:13 -0700
Subject: [PATCH 2/5] MetricsTable anchor more to bottom of component

---
 src/components/metrics/MetricsTable.tsx | 28 ++++++++++++++-----------
 1 file changed, 16 insertions(+), 12 deletions(-)

diff --git a/src/components/metrics/MetricsTable.tsx b/src/components/metrics/MetricsTable.tsx
index fa363eec9..b84fef236 100644
--- a/src/components/metrics/MetricsTable.tsx
+++ b/src/components/metrics/MetricsTable.tsx
@@ -73,19 +73,23 @@ export function MetricsTable({
       isFetching={isFetching}
       isLoading={isLoading}
       error={error}
-      minHeight="380px"
+      minHeight="400px"
     >
-      {data && <ListTable {...props} data={filteredData} renderLabel={renderLabel} />}
-      {showMore && limit && (
-        <Row justifyContent="center">
-          <LinkButton href={updateParams({ view: type })} variant="quiet">
-            <Icon size="sm">
-              <Maximize />
-            </Icon>
-            <Text>{formatMessage(labels.more)}</Text>
-          </LinkButton>
-        </Row>
-      )}
+      <div style={{ display: 'grid', gridTemplateRows: '1fr auto', minHeight: '400px' }}>
+        <div>{data && <ListTable {...props} data={filteredData} renderLabel={renderLabel} />}</div>
+        <div>
+          {showMore && limit && (
+            <Row justifyContent="center" alignItems="flex-end">
+              <LinkButton href={updateParams({ view: type })} variant="quiet">
+                <Icon size="sm">
+                  <Maximize />
+                </Icon>
+                <Text>{formatMessage(labels.more)}</Text>
+              </LinkButton>
+            </Row>
+          )}
+        </div>
+      </div>
     </LoadingPanel>
   );
 }

From bf99068bd7e9f110dc33d44363674be45a0970a2 Mon Sep 17 00:00:00 2001
From: Francis Cao <franciscao@gmail.com>
Date: Tue, 30 Sep 2025 12:03:15 -0700
Subject: [PATCH 3/5] Remove tables result set from getRevenue. Fix min/max
 date for revenuechart

---
 .../[websiteId]/(reports)/revenue/Revenue.tsx | 44 ++++++-------
 .../(reports)/revenue/RevenuePage.tsx         |  4 +-
 src/queries/sql/reports/getRevenue.ts         | 66 +------------------
 3 files changed, 26 insertions(+), 88 deletions(-)

diff --git a/src/app/(main)/websites/[websiteId]/(reports)/revenue/Revenue.tsx b/src/app/(main)/websites/[websiteId]/(reports)/revenue/Revenue.tsx
index 420c94fec..4c870810e 100644
--- a/src/app/(main)/websites/[websiteId]/(reports)/revenue/Revenue.tsx
+++ b/src/app/(main)/websites/[websiteId]/(reports)/revenue/Revenue.tsx
@@ -1,39 +1,37 @@
-import { useState } from 'react';
-import { Grid, Row, Text } from '@umami/react-zen';
-import classNames from 'classnames';
-import { colord } from 'colord';
 import { BarChart } from '@/components/charts/BarChart';
+import { LoadingPanel } from '@/components/common/LoadingPanel';
+import { Panel } from '@/components/common/Panel';
 import { TypeIcon } from '@/components/common/TypeIcon';
 import { useCountryNames, useLocale, useMessages, useResultQuery } from '@/components/hooks';
+import { CurrencySelect } from '@/components/input/CurrencySelect';
 import { ListTable } from '@/components/metrics/ListTable';
 import { MetricCard } from '@/components/metrics/MetricCard';
 import { MetricsBar } from '@/components/metrics/MetricsBar';
 import { renderDateLabels } from '@/lib/charts';
 import { CHART_COLORS } from '@/lib/constants';
+import { generateTimeSeries } from '@/lib/date';
 import { formatLongCurrency, formatLongNumber } from '@/lib/format';
-import { useCallback, useMemo } from 'react';
-import { Panel } from '@/components/common/Panel';
-import { Column } from '@umami/react-zen';
-import { LoadingPanel } from '@/components/common/LoadingPanel';
-import { getMinimumUnit } from '@/lib/date';
-import { CurrencySelect } from '@/components/input/CurrencySelect';
+import { Column, Grid, Row, Text } from '@umami/react-zen';
+import classNames from 'classnames';
+import { colord } from 'colord';
+import { useCallback, useMemo, useState } from 'react';
 
 export interface RevenueProps {
   websiteId: string;
-  startDate: Date;
-  endDate: Date;
+  minDate: Date;
+  maxDate: Date;
+  unit: string;
 }
 
-export function Revenue({ websiteId, startDate, endDate }: RevenueProps) {
+export function Revenue({ websiteId, minDate, maxDate, unit }: RevenueProps) {
   const [currency, setCurrency] = useState('USD');
   const { formatMessage, labels } = useMessages();
-  const { locale } = useLocale();
+  const { locale, dateLocale } = useLocale();
   const { countryNames } = useCountryNames(locale);
-  const unit = getMinimumUnit(startDate, endDate);
   const { data, error, isLoading } = useResultQuery<any>('revenue', {
     websiteId,
-    startDate,
-    endDate,
+    minDate,
+    maxDate,
     currency,
   });
 
@@ -65,7 +63,7 @@ export function Revenue({ websiteId, startDate, endDate }: RevenueProps) {
         const color = colord(CHART_COLORS[index % CHART_COLORS.length]);
         return {
           label: key,
-          data: map[key],
+          data: generateTimeSeries(map[key], minDate, maxDate, unit, dateLocale),
           lineTension: 0,
           backgroundColor: color.alpha(0.6).toRgbString(),
           borderColor: color.alpha(0.7).toRgbString(),
@@ -73,7 +71,7 @@ export function Revenue({ websiteId, startDate, endDate }: RevenueProps) {
         };
       }),
     };
-  }, [data, startDate, endDate, unit]);
+  }, [data, minDate, maxDate, unit]);
 
   const metrics = useMemo(() => {
     if (!data) return [];
@@ -104,6 +102,8 @@ export function Revenue({ websiteId, startDate, endDate }: RevenueProps) {
     ] as any;
   }, [data, locale]);
 
+  const renderXLabel = useCallback(renderDateLabels(unit, locale), [unit, locale]);
+
   return (
     <Column gap>
       <Grid columns="280px" gap>
@@ -122,12 +122,12 @@ export function Revenue({ websiteId, startDate, endDate }: RevenueProps) {
             <Panel>
               <BarChart
                 chartData={chartData}
-                minDate={startDate}
-                maxDate={endDate}
+                minDate={minDate}
+                maxDate={maxDate}
                 unit={unit}
                 stacked={true}
                 currency={currency}
-                renderXLabel={renderDateLabels(unit, locale)}
+                renderXLabel={renderXLabel}
                 height="400px"
               />
             </Panel>
diff --git a/src/app/(main)/websites/[websiteId]/(reports)/revenue/RevenuePage.tsx b/src/app/(main)/websites/[websiteId]/(reports)/revenue/RevenuePage.tsx
index 19ac89dba..0b46a2da9 100644
--- a/src/app/(main)/websites/[websiteId]/(reports)/revenue/RevenuePage.tsx
+++ b/src/app/(main)/websites/[websiteId]/(reports)/revenue/RevenuePage.tsx
@@ -6,13 +6,13 @@ import { useDateRange } from '@/components/hooks';
 
 export function RevenuePage({ websiteId }: { websiteId: string }) {
   const {
-    dateRange: { startDate, endDate },
+    dateRange: { startDate, endDate, unit },
   } = useDateRange(websiteId);
 
   return (
     <Column gap>
       <WebsiteControls websiteId={websiteId} />
-      <Revenue websiteId={websiteId} startDate={startDate} endDate={endDate} />
+      <Revenue websiteId={websiteId} minDate={startDate} maxDate={endDate} unit={unit} />
     </Column>
   );
 }
diff --git a/src/queries/sql/reports/getRevenue.ts b/src/queries/sql/reports/getRevenue.ts
index 1a0e03321..1ec4a1306 100644
--- a/src/queries/sql/reports/getRevenue.ts
+++ b/src/queries/sql/reports/getRevenue.ts
@@ -14,12 +14,6 @@ export interface RevenueResult {
   chart: { x: string; t: string; y: number }[];
   country: { name: string; value: number }[];
   total: { sum: number; count: number; average: number; unique_count: number };
-  table: {
-    currency: string;
-    sum: number;
-    count: number;
-    unique_count: number;
-  }[];
 }
 
 export async function getRevenue(
@@ -121,32 +115,7 @@ async function relationalQuery(
 
   total.average = total.count > 0 ? total.sum / total.count : 0;
 
-  const table = await rawQuery(
-    `
-    select
-      revenue.currency,
-      sum(revenue.revenue) as sum,
-      count(distinct revenue.event_id) as count,
-      count(distinct revenue.session_id) as unique_count
-    from revenue
-    join website_event
-      on website_event.website_id = revenue.website_id
-        and website_event.session_id = revenue.session_id
-        and website_event.event_id = revenue.event_id
-        and website_event.website_id = {{websiteId::uuid}}
-        and website_event.created_at between {{startDate}} and {{endDate}}
-    ${cohortQuery}
-    ${joinSessionQuery}
-    where revenue.website_id = {{websiteId::uuid}}
-      and revenue.created_at between {{startDate}} and {{endDate}}
-      ${filterQuery}
-    group by revenue.currency
-    order by sum desc
-    `,
-    queryParams,
-  );
-
-  return { chart, country, table, total };
+  return { chart, country, total };
 }
 
 async function clickhouseQuery(
@@ -250,36 +219,5 @@ async function clickhouseQuery(
 
   total.average = total.count > 0 ? total.sum / total.count : 0;
 
-  const table = await rawQuery<
-    {
-      currency: string;
-      sum: number;
-      count: number;
-      unique_count: number;
-    }[]
-  >(
-    `
-    select
-      website_revenue.currency,
-      sum(website_revenue.revenue) as sum,
-      uniqExact(website_revenue.event_id) as count,
-      uniqExact(website_revenue.session_id) as unique_count
-    from website_revenue
-    join website_event
-          on website_event.website_id = website_revenue.website_id
-            and website_event.session_id = website_revenue.session_id
-            and website_event.event_id = website_revenue.event_id
-            and website_event.website_id = {websiteId:UUID}
-            and website_event.created_at between {startDate:DateTime64} and {endDate:DateTime64}
-    ${cohortQuery}
-    where website_revenue.website_id = {websiteId:UUID}
-      and website_revenue.created_at between {startDate:DateTime64} and {endDate:DateTime64}
-      ${filterQuery}
-    group by website_revenue.currency
-    order by sum desc
-    `,
-    queryParams,
-  );
-
-  return { chart, country, table, total };
+  return { chart, country, total };
 }

From 89d3cd4f5abd9bc9b0e96e9acc4fa3c56909bdfa Mon Sep 17 00:00:00 2001
From: Francis Cao <franciscao@gmail.com>
Date: Tue, 30 Sep 2025 13:11:11 -0700
Subject: [PATCH 4/5] add timezone to revenue chartData. Fix min/max date for
 7day value

---
 .../[websiteId]/(reports)/revenue/Revenue.tsx  | 18 +++++++++---------
 .../(reports)/revenue/RevenuePage.tsx          |  2 +-
 src/lib/date.ts                                |  7 ++++++-
 src/queries/sql/reports/getRevenue.ts          |  9 +++++----
 4 files changed, 21 insertions(+), 15 deletions(-)

diff --git a/src/app/(main)/websites/[websiteId]/(reports)/revenue/Revenue.tsx b/src/app/(main)/websites/[websiteId]/(reports)/revenue/Revenue.tsx
index 4c870810e..c56eca68d 100644
--- a/src/app/(main)/websites/[websiteId]/(reports)/revenue/Revenue.tsx
+++ b/src/app/(main)/websites/[websiteId]/(reports)/revenue/Revenue.tsx
@@ -18,20 +18,20 @@ import { useCallback, useMemo, useState } from 'react';
 
 export interface RevenueProps {
   websiteId: string;
-  minDate: Date;
-  maxDate: Date;
+  startDate: Date;
+  endDate: Date;
   unit: string;
 }
 
-export function Revenue({ websiteId, minDate, maxDate, unit }: RevenueProps) {
+export function Revenue({ websiteId, startDate, endDate, unit }: RevenueProps) {
   const [currency, setCurrency] = useState('USD');
   const { formatMessage, labels } = useMessages();
   const { locale, dateLocale } = useLocale();
   const { countryNames } = useCountryNames(locale);
   const { data, error, isLoading } = useResultQuery<any>('revenue', {
     websiteId,
-    minDate,
-    maxDate,
+    startDate,
+    endDate,
     currency,
   });
 
@@ -63,7 +63,7 @@ export function Revenue({ websiteId, minDate, maxDate, unit }: RevenueProps) {
         const color = colord(CHART_COLORS[index % CHART_COLORS.length]);
         return {
           label: key,
-          data: generateTimeSeries(map[key], minDate, maxDate, unit, dateLocale),
+          data: generateTimeSeries(map[key], startDate, endDate, unit, dateLocale),
           lineTension: 0,
           backgroundColor: color.alpha(0.6).toRgbString(),
           borderColor: color.alpha(0.7).toRgbString(),
@@ -71,7 +71,7 @@ export function Revenue({ websiteId, minDate, maxDate, unit }: RevenueProps) {
         };
       }),
     };
-  }, [data, minDate, maxDate, unit]);
+  }, [data, startDate, endDate, unit]);
 
   const metrics = useMemo(() => {
     if (!data) return [];
@@ -122,8 +122,8 @@ export function Revenue({ websiteId, minDate, maxDate, unit }: RevenueProps) {
             <Panel>
               <BarChart
                 chartData={chartData}
-                minDate={minDate}
-                maxDate={maxDate}
+                minDate={startDate}
+                maxDate={endDate}
                 unit={unit}
                 stacked={true}
                 currency={currency}
diff --git a/src/app/(main)/websites/[websiteId]/(reports)/revenue/RevenuePage.tsx b/src/app/(main)/websites/[websiteId]/(reports)/revenue/RevenuePage.tsx
index 0b46a2da9..0d74c38e9 100644
--- a/src/app/(main)/websites/[websiteId]/(reports)/revenue/RevenuePage.tsx
+++ b/src/app/(main)/websites/[websiteId]/(reports)/revenue/RevenuePage.tsx
@@ -12,7 +12,7 @@ export function RevenuePage({ websiteId }: { websiteId: string }) {
   return (
     <Column gap>
       <WebsiteControls websiteId={websiteId} />
-      <Revenue websiteId={websiteId} minDate={startDate} maxDate={endDate} unit={unit} />
+      <Revenue websiteId={websiteId} startDate={startDate} endDate={endDate} unit={unit} />
     </Column>
   );
 }
diff --git a/src/lib/date.ts b/src/lib/date.ts
index 6a967477e..029318340 100644
--- a/src/lib/date.ts
+++ b/src/lib/date.ts
@@ -157,7 +157,12 @@ export function parseDateRange(value: string, locale = 'en-US'): DateRange {
 
   const now = new Date();
   const dateLocale = getDateLocale(locale);
-  const { num = 1, unit } = parseDateValue(value);
+  const { unit } = parseDateValue(value);
+  let { num = 1 } = parseDateValue(value);
+
+  if (value === '7day') {
+    num--;
+  }
 
   switch (unit) {
     case 'hour':
diff --git a/src/queries/sql/reports/getRevenue.ts b/src/queries/sql/reports/getRevenue.ts
index 1ec4a1306..890717d96 100644
--- a/src/queries/sql/reports/getRevenue.ts
+++ b/src/queries/sql/reports/getRevenue.ts
@@ -7,6 +7,7 @@ export interface RevenuParameters {
   startDate: Date;
   endDate: Date;
   unit: string;
+  timezone: string;
   currency: string;
 }
 
@@ -30,7 +31,7 @@ async function relationalQuery(
   parameters: RevenuParameters,
   filters: QueryFilters,
 ): Promise<RevenueResult> {
-  const { startDate, endDate, currency, unit = 'day' } = parameters;
+  const { startDate, endDate, unit = 'day', timezone = 'utc', currency } = parameters;
   const { getDateSQL, rawQuery, parseFilters } = prisma;
   const { queryParams, filterQuery, cohortQuery, joinSessionQuery } = parseFilters({
     ...filters,
@@ -44,7 +45,7 @@ async function relationalQuery(
     `
     select
       revenue.event_name x,
-      ${getDateSQL('revenue.created_at', unit)} t,
+      ${getDateSQL('revenue.created_at', unit, timezone)} t,
       sum(revenue.revenue) y
     from revenue
     join website_event
@@ -123,7 +124,7 @@ async function clickhouseQuery(
   parameters: RevenuParameters,
   filters: QueryFilters,
 ): Promise<RevenueResult> {
-  const { startDate, endDate, unit = 'day', currency } = parameters;
+  const { startDate, endDate, unit = 'day', timezone = 'utc', currency } = parameters;
   const { getDateSQL, rawQuery, parseFilters } = clickhouse;
   const { filterQuery, cohortQuery, queryParams } = parseFilters({
     ...filters,
@@ -143,7 +144,7 @@ async function clickhouseQuery(
     `
     select
       website_revenue.event_name x,
-      ${getDateSQL('website_revenue.created_at', unit)} t,
+      ${getDateSQL('website_revenue.created_at', unit, timezone)} t,
       sum(website_revenue.revenue) y
     from website_revenue
     join website_event

From 55c8a6f7ccb80de67e34410954d82c02bbd2c11b Mon Sep 17 00:00:00 2001
From: Francis Cao <franciscao@gmail.com>
Date: Tue, 30 Sep 2025 13:38:55 -0700
Subject: [PATCH 5/5] fix "Last X unit" minDate cutoff

---
 src/lib/date.ts | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/src/lib/date.ts b/src/lib/date.ts
index 029318340..410a8acf6 100644
--- a/src/lib/date.ts
+++ b/src/lib/date.ts
@@ -122,8 +122,9 @@ export function parseDateValue(value: string) {
   if (!match) return null;
 
   const { num, unit } = match.groups;
+  const formattedNum = +num > 0 ? +num - 1 : +num;
 
-  return { num: +num, unit };
+  return { num: formattedNum, unit };
 }
 
 export function parseDateRange(value: string, locale = 'en-US'): DateRange {
@@ -157,12 +158,7 @@ export function parseDateRange(value: string, locale = 'en-US'): DateRange {
 
   const now = new Date();
   const dateLocale = getDateLocale(locale);
-  const { unit } = parseDateValue(value);
-  let { num = 1 } = parseDateValue(value);
-
-  if (value === '7day') {
-    num--;
-  }
+  const { num = 1, unit } = parseDateValue(value);
 
   switch (unit) {
     case 'hour':