src/app/(main)/websites/[websiteId]/WebsiteLayout.tsx

@@ -9,10 +9,11 @@ import { WebsiteNav } from './WebsiteNav';
 export function WebsiteLayout({ websiteId, children }: { websiteId: string; children: ReactNode }) {
   return (
     <WebsiteProvider websiteId={websiteId}>
-      <Grid columns={{ xs: '1fr', lg: 'auto 1fr' }} width="100%">
+      <Grid columns={{ xs: '1fr', lg: 'auto 1fr' }} width="100%" height="100%">
         <Column
           display={{ xs: 'none', lg: 'flex' }}
           width="240px"
+          height="100%"
           border="right"
           backgroundColor
           marginRight="2"

src/app/share/ShareProvider.tsx

@@ -1,77 +0,0 @@
-'use client';
-import { Loading } from '@umami/react-zen';
-import { usePathname, useRouter } from 'next/navigation';
-import { createContext, type ReactNode, useEffect } from 'react';
-import { useShareTokenQuery } from '@/components/hooks';
-import type { WhiteLabel } from '@/lib/types';
-
-export interface ShareData {
-  shareId: string;
-  slug: string;
-  websiteId: string;
-  parameters: any;
-  token: string;
-  whiteLabel?: WhiteLabel;
-}
-
-export const ShareContext = createContext<ShareData>(null);
-
-const ALL_SECTION_IDS = [
-  'overview',
-  'events',
-  'sessions',
-  'realtime',
-  'compare',
-  'breakdown',
-  'goals',
-  'funnels',
-  'journeys',
-  'retention',
-  'utm',
-  'revenue',
-  'attribution',
-];
-
-function getSharePath(pathname: string) {
-  const segments = pathname.split('/');
-  const firstSegment = segments[3];
-
-  // If first segment looks like a domain name, skip it
-  if (firstSegment?.includes('.')) {
-    return segments[4];
-  }
-
-  return firstSegment;
-}
-
-export function ShareProvider({ slug, children }: { slug: string; children: ReactNode }) {
-  const { share, isLoading, isFetching } = useShareTokenQuery(slug);
-  const router = useRouter();
-  const pathname = usePathname();
-  const path = getSharePath(pathname);
-
-  const allowedSections = share?.parameters
-    ? ALL_SECTION_IDS.filter(id => share.parameters[id] !== false)
-    : [];
-
-  const shouldRedirect =
-    allowedSections.length === 1 &&
-    allowedSections[0] !== 'overview' &&
-    (path === undefined || path === '' || path === 'overview');
-
-  useEffect(() => {
-    if (shouldRedirect) {
-      router.replace(`/share/${slug}/${allowedSections[0]}`);
-    }
-  }, [shouldRedirect, slug, allowedSections, router]);
-
-  if (isFetching && isLoading) {
-    return <Loading placement="absolute" />;
-  }
-
-  if (!share || shouldRedirect) {
-    return null;
-  }
-
-  return <ShareContext.Provider value={{ ...share, slug }}>{children}</ShareContext.Provider>;
-}

src/app/share/[...shareId]/ShareFooter.tsx

@@ -0,0 +1,23 @@
+import { Row, Text } from '@umami/react-zen';
+import { CURRENT_VERSION, HOMEPAGE_URL } from '@/lib/constants';
+import type { WhiteLabel } from '@/lib/types';
+
+export function ShareFooter({ whiteLabel }: { whiteLabel?: WhiteLabel }) {
+  if (whiteLabel) {
+    return (
+      <Row as="footer" paddingY="6" justifyContent="flex-end">
+        <a href={whiteLabel.url} target="_blank">
+          <Text weight="bold">{whiteLabel.name}</Text>
+        </a>
+      </Row>
+    );
+  }
+
+  return (
+    <Row as="footer" paddingY="6" justifyContent="flex-end">
+      <a href={HOMEPAGE_URL} target="_blank">
+        <Text weight="bold">umami</Text> {`v${CURRENT_VERSION}`}
+      </a>
+    </Row>
+  );
+}

src/app/share/[...shareId]/ShareHeader.tsx

@@ -0,0 +1,33 @@
+import { Icon, Row, Text, ThemeButton } from '@umami/react-zen';
+import { LanguageButton } from '@/components/input/LanguageButton';
+import { PreferencesButton } from '@/components/input/PreferencesButton';
+import { Logo } from '@/components/svg';
+import type { WhiteLabel } from '@/lib/types';
+
+export function ShareHeader({ whiteLabel }: { whiteLabel?: WhiteLabel }) {
+  const logoUrl = whiteLabel?.url || 'https://umami.is';
+  const logoName = whiteLabel?.name || 'umami';
+  const logoImage = whiteLabel?.image;
+
+  return (
+    <Row as="header" justifyContent="space-between" alignItems="center" paddingY="3">
+      <a href={logoUrl} target="_blank" rel="noopener">
+        <Row alignItems="center" gap>
+          {logoImage ? (
+            <img src={logoImage} alt={logoName} style={{ height: 24 }} />
+          ) : (
+            <Icon>
+              <Logo />
+            </Icon>
+          )}
+          <Text weight="bold">{logoName}</Text>
+        </Row>
+      </a>
+      <Row alignItems="center" gap>
+        <ThemeButton />
+        <LanguageButton />
+        <PreferencesButton />
+      </Row>
+    </Row>
+  );
+}

src/app/share/[...shareId]/ShareNav.tsx

@@ -1,30 +1,23 @@
-import { Button, Column, Icon, Row, Text, ThemeButton } from '@umami/react-zen';
+'use client';
+import { Column } from '@umami/react-zen';
 import { SideMenu } from '@/components/common/SideMenu';
-import { useMessages, useNavigation, useShare } from '@/components/hooks';
-import { AlignEndHorizontal, Clock, Eye, PanelLeft, Sheet, Tag, User } from '@/components/icons';
-import { LanguageButton } from '@/components/input/LanguageButton';
-import { PreferencesButton } from '@/components/input/PreferencesButton';
-import { Funnel, Lightning, Logo, Magnet, Money, Network, Path, Target } from '@/components/svg';
+import { useMessages, useNavigation } from '@/components/hooks';
+import { AlignEndHorizontal, Clock, Eye, Sheet, Tag, User } from '@/components/icons';
+import { Funnel, Lightning, Magnet, Money, Network, Path, Target } from '@/components/svg';
 
 export function ShareNav({
-  collapsed,
-  onCollapse,
+  shareId,
+  parameters,
   onItemClick,
 }: {
-  collapsed?: boolean;
-  onCollapse?: (collapsed: boolean) => void;
+  shareId: string;
+  parameters: Record<string, boolean>;
   onItemClick?: () => void;
 }) {
-  const share = useShare();
   const { formatMessage, labels } = useMessages();
   const { pathname } = useNavigation();
-  const { slug, parameters, whiteLabel } = share;
 
-  const logoUrl = whiteLabel?.url || 'https://umami.is';
-  const logoName = whiteLabel?.name || 'umami';
-  const logoImage = whiteLabel?.image;
-
-  const renderPath = (path: string) => `/share/${slug}${path}`;
+  const renderPath = (path: string) => `/share/${shareId}${path}`;
 
   const allItems = [
     {
@@ -137,43 +130,8 @@ export function ShareNav({
     .flatMap(e => e.items)
     .find(({ path }) => path && pathname.endsWith(path.split('?')[0]))?.id;
 
-  const isMobile = !!onItemClick;
-
   return (
-    <Column
-      position={isMobile ? undefined : 'fixed'}
-      padding="3"
-      width={isMobile ? '100%' : collapsed ? '60px' : '240px'}
-      maxHeight="100vh"
-      height="100vh"
-      border={isMobile ? undefined : 'right'}
-      borderColor={isMobile ? undefined : '4'}
-    >
-      <Row as="header" gap alignItems="center" paddingY="3" justifyContent="space-between">
-        {!collapsed && (
-          <a href={logoUrl} target="_blank" rel="noopener" style={{ marginLeft: 12 }}>
-            <Row alignItems="center" gap>
-              {logoImage ? (
-                <img src={logoImage} alt={logoName} style={{ height: 24 }} />
-              ) : (
-                <Icon>
-                  <Logo />
-                </Icon>
-              )}
-              <Text weight="bold">{logoName}</Text>
-            </Row>
-          </a>
-        )}
-        {!onItemClick && (
-          <Button variant="quiet" onPress={() => onCollapse?.(!collapsed)}>
-            <Icon color="muted">
-              <PanelLeft />
-            </Icon>
-          </Button>
-        )}
-      </Row>
-      {!collapsed && (
-        <Column flexGrow={1} overflowY="auto">
+    <Column padding="3" position="sticky" top="0" gap>
       <SideMenu
         items={items}
         selectedKey={selectedKey}
@@ -181,26 +139,5 @@ export function ShareNav({
         onItemClick={onItemClick}
       />
     </Column>
-      )}
-      <Column
-        flexGrow={collapsed ? 1 : undefined}
-        justifyContent="flex-end"
-        alignItems={collapsed ? 'center' : undefined}
-      >
-        {collapsed ? (
-          <Column gap="2" alignItems="center">
-            <ThemeButton />
-            <LanguageButton />
-            <PreferencesButton />
-          </Column>
-        ) : (
-          <Row>
-            <ThemeButton />
-            <LanguageButton />
-            <PreferencesButton />
-          </Row>
-        )}
-      </Column>
-    </Column>
   );
 }

src/app/share/[...shareId]/SharePage.tsx

@@ -0,0 +1,155 @@
+'use client';
+import { Column, Grid, Row, useTheme } from '@umami/react-zen';
+import { useRouter } from 'next/navigation';
+import { useEffect, useMemo } from 'react';
+import { AttributionPage } from '@/app/(main)/websites/[websiteId]/(reports)/attribution/AttributionPage';
+import { BreakdownPage } from '@/app/(main)/websites/[websiteId]/(reports)/breakdown/BreakdownPage';
+import { FunnelsPage } from '@/app/(main)/websites/[websiteId]/(reports)/funnels/FunnelsPage';
+import { GoalsPage } from '@/app/(main)/websites/[websiteId]/(reports)/goals/GoalsPage';
+import { JourneysPage } from '@/app/(main)/websites/[websiteId]/(reports)/journeys/JourneysPage';
+import { RetentionPage } from '@/app/(main)/websites/[websiteId]/(reports)/retention/RetentionPage';
+import { RevenuePage } from '@/app/(main)/websites/[websiteId]/(reports)/revenue/RevenuePage';
+import { UTMPage } from '@/app/(main)/websites/[websiteId]/(reports)/utm/UTMPage';
+import { ComparePage } from '@/app/(main)/websites/[websiteId]/compare/ComparePage';
+import { EventsPage } from '@/app/(main)/websites/[websiteId]/events/EventsPage';
+import { RealtimePage } from '@/app/(main)/websites/[websiteId]/realtime/RealtimePage';
+import { SessionsPage } from '@/app/(main)/websites/[websiteId]/sessions/SessionsPage';
+import { WebsiteHeader } from '@/app/(main)/websites/[websiteId]/WebsiteHeader';
+import { WebsitePage } from '@/app/(main)/websites/[websiteId]/WebsitePage';
+import { WebsiteProvider } from '@/app/(main)/websites/WebsiteProvider';
+import { PageBody } from '@/components/common/PageBody';
+import { useShareTokenQuery } from '@/components/hooks';
+import { MobileMenuButton } from '@/components/input/MobileMenuButton';
+import { ShareFooter } from './ShareFooter';
+import { ShareHeader } from './ShareHeader';
+import { ShareNav } from './ShareNav';
+
+const PAGE_COMPONENTS: Record<string, React.ComponentType<{ websiteId: string }>> = {
+  '': WebsitePage,
+  overview: WebsitePage,
+  events: EventsPage,
+  sessions: SessionsPage,
+  realtime: RealtimePage,
+  compare: ComparePage,
+  breakdown: BreakdownPage,
+  goals: GoalsPage,
+  funnels: FunnelsPage,
+  journeys: JourneysPage,
+  retention: RetentionPage,
+  utm: UTMPage,
+  revenue: RevenuePage,
+  attribution: AttributionPage,
+};
+
+// All section IDs that can be enabled/disabled via parameters
+const ALL_SECTION_IDS = [
+  'overview',
+  'events',
+  'sessions',
+  'realtime',
+  'compare',
+  'breakdown',
+  'goals',
+  'funnels',
+  'journeys',
+  'retention',
+  'utm',
+  'revenue',
+  'attribution',
+];
+
+export function SharePage({ shareId, path = '' }: { shareId: string; path?: string }) {
+  const { shareToken, isLoading } = useShareTokenQuery(shareId);
+  const { setTheme } = useTheme();
+  const router = useRouter();
+
+  // Calculate allowed sections
+  const allowedSections = useMemo(() => {
+    if (!shareToken?.parameters) return [];
+    const params = shareToken.parameters;
+    return ALL_SECTION_IDS.filter(id => params[id] !== false);
+  }, [shareToken?.parameters]);
+
+  useEffect(() => {
+    const url = new URL(window?.location?.href);
+    const theme = url.searchParams.get('theme');
+
+    if (theme === 'light' || theme === 'dark') {
+      setTheme(theme);
+    }
+  }, []);
+
+  // Redirect to the only allowed section if there's just one and we're on the base path
+  useEffect(() => {
+    if (
+      allowedSections.length === 1 &&
+      allowedSections[0] !== 'overview' &&
+      (path === '' || path === 'overview')
+    ) {
+      router.replace(`/share/${shareId}/${allowedSections[0]}`);
+    }
+  }, [allowedSections, shareId, path, router]);
+
+  if (isLoading || !shareToken) {
+    return null;
+  }
+
+  const { websiteId, parameters = {}, whiteLabel } = shareToken;
+
+  // Redirect to only allowed section - return null while redirecting
+  if (
+    allowedSections.length === 1 &&
+    allowedSections[0] !== 'overview' &&
+    (path === '' || path === 'overview')
+  ) {
+    return null;
+  }
+
+  // Check if the requested path is allowed
+  const pageKey = path || '';
+  const isAllowed = pageKey === '' || pageKey === 'overview' || parameters[pageKey] !== false;
+
+  if (!isAllowed) {
+    return null;
+  }
+
+  const PageComponent = PAGE_COMPONENTS[pageKey] || WebsitePage;
+
+  return (
+    <Column backgroundColor="2">
+      <Grid columns={{ xs: '1fr', lg: 'auto 1fr' }} width="100%" height="100%">
+        <Row display={{ xs: 'flex', lg: 'none' }} alignItems="center" gap padding="3">
+          <Grid columns="auto 1fr" flexGrow={1} backgroundColor="3" borderRadius>
+            <MobileMenuButton>
+              {({ close }) => {
+                return <ShareNav shareId={shareId} parameters={parameters} onItemClick={close} />;
+              }}
+            </MobileMenuButton>
+          </Grid>
+        </Row>
+        <Column
+          display={{ xs: 'none', lg: 'flex' }}
+          width="240px"
+          height="100%"
+          border="right"
+          backgroundColor
+          marginRight="2"
+        >
+          <Column display={{ xs: 'none', lg: 'flex' }}>
+            <ShareNav shareId={shareId} parameters={parameters} />
+          </Column>
+        </Column>
+        <PageBody gap>
+          <WebsiteProvider websiteId={websiteId}>
+            <ShareHeader whiteLabel={whiteLabel} />
+            <Column>
+              <WebsiteHeader showActions={false} />
+              <PageComponent websiteId={websiteId} />
+            </Column>
+            <ShareFooter whiteLabel={whiteLabel} />
+          </WebsiteProvider>
+        </PageBody>
+      </Grid>
+    </Column>
+  );
+}

src/app/share/[...shareId]/page.tsx

@@ -0,0 +1,8 @@
+import { SharePage } from './SharePage';
+
+export default async function ({ params }: { params: Promise<{ shareId: string[] }> }) {
+  const { shareId } = await params;
+  const [slug, ...path] = shareId;
+
+  return <SharePage shareId={slug} path={path.join('/')} />;
+}

src/app/share/[slug]/[[...path]]/SharePage.tsx

@@ -1,103 +0,0 @@
-'use client';
-import { Column, Grid, Row, useTheme } from '@umami/react-zen';
-import { usePathname } from 'next/navigation';
-import { useEffect, useState } from 'react';
-import { AttributionPage } from '@/app/(main)/websites/[websiteId]/(reports)/attribution/AttributionPage';
-import { BreakdownPage } from '@/app/(main)/websites/[websiteId]/(reports)/breakdown/BreakdownPage';
-import { FunnelsPage } from '@/app/(main)/websites/[websiteId]/(reports)/funnels/FunnelsPage';
-import { GoalsPage } from '@/app/(main)/websites/[websiteId]/(reports)/goals/GoalsPage';
-import { JourneysPage } from '@/app/(main)/websites/[websiteId]/(reports)/journeys/JourneysPage';
-import { RetentionPage } from '@/app/(main)/websites/[websiteId]/(reports)/retention/RetentionPage';
-import { RevenuePage } from '@/app/(main)/websites/[websiteId]/(reports)/revenue/RevenuePage';
-import { UTMPage } from '@/app/(main)/websites/[websiteId]/(reports)/utm/UTMPage';
-import { ComparePage } from '@/app/(main)/websites/[websiteId]/compare/ComparePage';
-import { EventsPage } from '@/app/(main)/websites/[websiteId]/events/EventsPage';
-import { RealtimePage } from '@/app/(main)/websites/[websiteId]/realtime/RealtimePage';
-import { SessionsPage } from '@/app/(main)/websites/[websiteId]/sessions/SessionsPage';
-import { WebsiteHeader } from '@/app/(main)/websites/[websiteId]/WebsiteHeader';
-import { WebsitePage } from '@/app/(main)/websites/[websiteId]/WebsitePage';
-import { WebsiteProvider } from '@/app/(main)/websites/WebsiteProvider';
-import { PageBody } from '@/components/common/PageBody';
-import { useShare } from '@/components/hooks';
-import { MobileMenuButton } from '@/components/input/MobileMenuButton';
-import { ShareNav } from './ShareNav';
-
-const PAGE_COMPONENTS: Record<string, React.ComponentType<{ websiteId: string }>> = {
-  '': WebsitePage,
-  overview: WebsitePage,
-  events: EventsPage,
-  sessions: SessionsPage,
-  realtime: RealtimePage,
-  compare: ComparePage,
-  breakdown: BreakdownPage,
-  goals: GoalsPage,
-  funnels: FunnelsPage,
-  journeys: JourneysPage,
-  retention: RetentionPage,
-  utm: UTMPage,
-  revenue: RevenuePage,
-  attribution: AttributionPage,
-};
-
-function getSharePath(pathname: string) {
-  const segments = pathname.split('/');
-  const firstSegment = segments[3];
-
-  // If first segment looks like a domain name, skip it
-  if (firstSegment?.includes('.')) {
-    return segments[4];
-  }
-
-  return firstSegment;
-}
-
-export function SharePage() {
-  const [navCollapsed, setNavCollapsed] = useState(false);
-  const share = useShare();
-  const { setTheme } = useTheme();
-  const pathname = usePathname();
-  const path = getSharePath(pathname);
-  const { websiteId, parameters = {} } = share;
-
-  useEffect(() => {
-    const url = new URL(window?.location?.href);
-    const theme = url.searchParams.get('theme');
-
-    if (theme === 'light' || theme === 'dark') {
-      setTheme(theme);
-    }
-  }, []);
-
-  // Check if the requested path is allowed
-  const pageKey = path || '';
-  const isAllowed = pageKey === '' || pageKey === 'overview' || parameters[pageKey] !== false;
-
-  if (!isAllowed) {
-    return null;
-  }
-
-  const PageComponent = PAGE_COMPONENTS[pageKey] || WebsitePage;
-
-  return (
-    <Grid columns={{ xs: '1fr', lg: `${navCollapsed ? '60px' : '240px'} 1fr` }} width="100%">
-      <Row display={{ xs: 'flex', lg: 'none' }} alignItems="center" gap padding="3">
-        <MobileMenuButton>
-          {({ close }) => {
-            return <ShareNav onItemClick={close} />;
-          }}
-        </MobileMenuButton>
-      </Row>
-      <Column display={{ xs: 'none', lg: 'flex' }} marginRight="2">
-        <ShareNav collapsed={navCollapsed} onCollapse={setNavCollapsed} />
-      </Column>
-      <PageBody gap>
-        <WebsiteProvider websiteId={websiteId}>
-          <Column>
-            <WebsiteHeader showActions={false} />
-            <PageComponent websiteId={websiteId} />
-          </Column>
-        </WebsiteProvider>
-      </PageBody>
-    </Grid>
-  );
-}

src/app/share/[slug]/[[...path]]/page.tsx

@@ -1,5 +0,0 @@
-import { SharePage } from './SharePage';
-
-export default function () {
-  return <SharePage />;
-}

src/app/share/[slug]/layout.tsx

@@ -1,13 +0,0 @@
-import { ShareProvider } from '@/app/share/ShareProvider';
-
-export default async function ({
-  params,
-  children,
-}: {
-  params: Promise<{ slug: string }>;
-  children: React.ReactNode;
-}) {
-  const { slug } = await params;
-
-  return <ShareProvider slug={slug}>{children}</ShareProvider>;
-}

src/components/common/SideMenu.tsx

@@ -7,7 +7,6 @@ import {
   NavMenuItem,
   type NavMenuProps,
   Row,
-  Text,
 } from '@umami/react-zen';
 import Link from 'next/link';
 
@@ -43,11 +42,9 @@ export function SideMenu({
 
       return (
         <Link key={id} href={path}>
-          <Row padding hoverBackgroundColor="3">
-            <IconLabel icon={icon}>
-              <Text weight={isSelected ? 'bold' : undefined}>{label}</Text>
-            </IconLabel>
-          </Row>
+          <NavMenuItem isSelected={isSelected}>
+            <IconLabel icon={icon}>{label}</IconLabel>
+          </NavMenuItem>
         </Link>
       );
     });

src/components/hooks/context/useShare.ts

@@ -1,6 +0,0 @@
-import { useContext } from 'react';
-import { ShareContext } from '@/app/share/ShareProvider';
-
-export function useShare() {
-  return useContext(ShareContext);
-}

src/components/hooks/index.ts

@@ -3,7 +3,6 @@
 // Context hooks
 export * from './context/useLink';
 export * from './context/usePixel';
-export * from './context/useShare';
 export * from './context/useTeam';
 export * from './context/useUser';
 export * from './context/useWebsite';

src/components/hooks/queries/useShareTokenQuery.ts

@@ -1,21 +1,25 @@
-import { setShare, useApp } from '@/store/app';
+import { setShareToken, useApp } from '@/store/app';
 import { useApi } from '../useApi';
 
-const selector = state => state.share;
+const selector = (state: { shareToken: string }) => state.shareToken;
 
-export function useShareTokenQuery(slug: string) {
-  const share = useApp(selector);
+export function useShareTokenQuery(slug: string): {
+  shareToken: any;
+  isLoading?: boolean;
+  error?: Error;
+} {
+  const shareToken = useApp(selector);
   const { get, useQuery } = useApi();
-  const query = useQuery({
+  const { isLoading, error } = useQuery({
     queryKey: ['share', slug],
     queryFn: async () => {
       const data = await get(`/share/${slug}`);
 
-      setShare(data);
+      setShareToken(data);
 
       return data;
     },
   });
 
-  return { share, ...query };
+  return { shareToken, isLoading, error };
 }

src/components/input/MobileMenuButton.tsx

@@ -9,8 +9,8 @@ export function MobileMenuButton(props: DialogProps) {
           <Menu />
         </Icon>
       </Button>
-      <Modal placement="left">
-        <Dialog variant="sheet" {...props} style={{ width: 'auto' }} />
+      <Modal placement="left" offset="80px">
+        <Dialog variant="sheet" {...props} />
       </Modal>
     </DialogTrigger>
   );

src/components/input/WebsiteDateFilter.tsx

@@ -31,11 +31,9 @@ export function WebsiteDateFilter({
   const showCompare = allowCompare && !isAllTime;
 
   const websiteDateRange = useDateRangeQuery(websiteId);
-  const { startDate, endDate } = websiteDateRange;
-  const hasData = startDate && endDate;
 
   const handleChange = (date: string) => {
-    if (date === 'all' && hasData) {
+    if (date === 'all') {
       router.push(
         updateParams({
           date: `${getDateRangeValue(websiteDateRange.startDate, websiteDateRange.endDate)}:all`,
@@ -80,7 +78,7 @@ export function WebsiteDateFilter({
         <DateFilter
           value={dateValue}
           onChange={handleChange}
-          showAllTime={hasData && showAllTime}
+          showAllTime={showAllTime}
           renderDate={+offset !== 0}
         />
       </Row>

src/lib/prisma.ts

@@ -108,7 +108,7 @@ function getFilterQuery(filters: Record<string, any>, options: QueryOptions = {}
 
         if (name === 'referrer') {
           arr.push(
-            `and (website_event.referrer_domain != regexp_replace(website_event.hostname, '^www.', '') or website_event.referrer_domain is null)`,
+            `and (website_event.referrer_domain != website_event.hostname or website_event.referrer_domain is null)`,
           );
         }
       }

src/queries/sql/getValues.ts

@@ -23,7 +23,7 @@ async function relationalQuery(websiteId: string, column: string, filters: Query
   let excludeDomain = '';
 
   if (column === 'referrer_domain') {
-    excludeDomain = `and website_event.referrer_domain != regexp_replace(website_event.hostname, '^www.', '')
+    excludeDomain = `and website_event.referrer_domain != website_event.hostname
       and website_event.referrer_domain != ''`;
   }
 

src/queries/sql/pageviews/getPageviewExpandedMetrics.ts

@@ -50,7 +50,7 @@ async function relationalQuery(
   let excludeDomain = '';
 
   if (column === 'referrer_domain') {
-    excludeDomain = `and website_event.referrer_domain != regexp_replace(website_event.hostname, '^www.', '')
+    excludeDomain = `and website_event.referrer_domain != website_event.hostname
       and website_event.referrer_domain != ''`;
     if (type === 'domain') {
       column = toPostgresGroupedReferrer(GROUPED_DOMAINS);

src/queries/sql/pageviews/getPageviewMetrics.ts

@@ -46,7 +46,7 @@ async function relationalQuery(
   let excludeDomain = '';
 
   if (column === 'referrer_domain') {
-    excludeDomain = `and website_event.referrer_domain != regexp_replace(website_event.hostname, '^www.', '')
+    excludeDomain = `and website_event.referrer_domain != website_event.hostname
       and website_event.referrer_domain != ''`;
   }
 

src/queries/sql/reports/getAttribution.ts

@@ -142,7 +142,7 @@ async function relationalQuery(
     ${
       currency
         ? ''
-        : `and we.referrer_domain != regexp_replace(we.hostname, '^www.', '')
+        : `and we.referrer_domain != hostname
       and we.referrer_domain != ''`
     }  
     group by 1

src/store/app.ts

@@ -16,7 +16,7 @@ const initialState = {
   theme: getItem(THEME_CONFIG) || DEFAULT_THEME,
   timezone: getItem(TIMEZONE_CONFIG) || getTimezone(),
   dateRangeValue: getItem(DATE_RANGE_CONFIG) || DEFAULT_DATE_RANGE_VALUE,
-  share: null,
+  shareToken: null,
   user: null,
   config: null,
 };
@@ -31,8 +31,8 @@ export function setLocale(locale: string) {
   store.setState({ locale });
 }
 
-export function setShare(share: object) {
-  store.setState({ share });
+export function setShareToken(shareToken: string) {
+  store.setState({ shareToken });
 }
 
 export function setUser(user: object) {