Skip to content

🐸 Rybbit - open-source and privacy-friendly alternative to Google Analytics that is 10x more intuitive.

Refactor toast imports to use centralized Sonner component

Bill Yanga146f66ce672
diff --git a/client/src/api/admin/hooks/useExcludedCountries.ts b/client/src/api/admin/hooks/useExcludedCountries.ts
index ce928720d..f0e473d9b 100644
--- a/client/src/api/admin/hooks/useExcludedCountries.ts
+++ b/client/src/api/admin/hooks/useExcludedCountries.ts
@@ -1,5 +1,5 @@
import { useMutation, useQuery, useQueryClient } from "@tanstack/react-query";
-import { toast } from "sonner";
+import { toast } from "@/components/ui/sonner";
import {
fetchExcludedCountries,
updateExcludedCountries,
diff --git a/client/src/api/admin/hooks/useExcludedIPs.ts b/client/src/api/admin/hooks/useExcludedIPs.ts
index 87acd8eaf..e3af9c41e 100644
--- a/client/src/api/admin/hooks/useExcludedIPs.ts
+++ b/client/src/api/admin/hooks/useExcludedIPs.ts
@@ -1,5 +1,5 @@
import { useMutation, useQuery, useQueryClient } from "@tanstack/react-query";
-import { toast } from "sonner";
+import { toast } from "@/components/ui/sonner";
import {
fetchExcludedIPs,
updateExcludedIPs,
diff --git a/client/src/app/[site]/components/SubHeader/Export/ExportButton.tsx b/client/src/app/[site]/components/SubHeader/Export/ExportButton.tsx
index d718f8519..653d5d1e0 100644
--- a/client/src/app/[site]/components/SubHeader/Export/ExportButton.tsx
+++ b/client/src/app/[site]/components/SubHeader/Export/ExportButton.tsx
@@ -2,7 +2,7 @@
import { Download, FileArchive, FileText, Loader2 } from "lucide-react";
import { useState } from "react";
-import { toast } from "sonner";
+import { toast } from "@/components/ui/sonner";
import { Button } from "../../../../../components/ui/button";
import {
DropdownMenu,
diff --git a/client/src/app/[site]/components/SubHeader/ShareSite.tsx b/client/src/app/[site]/components/SubHeader/ShareSite.tsx
index f5170d1c4..b25a6eddc 100644
--- a/client/src/app/[site]/components/SubHeader/ShareSite.tsx
+++ b/client/src/app/[site]/components/SubHeader/ShareSite.tsx
@@ -1,6 +1,6 @@
import { Copy, Share } from "lucide-react";
import { useParams } from "next/navigation";
-import { toast } from "sonner";
+import { toast } from "@/components/ui/sonner";
import {
useGeneratePrivateLinkKey,
useGetPrivateLinkConfig,
diff --git a/client/src/app/[site]/errors/components/EnableErrorTracking.tsx b/client/src/app/[site]/errors/components/EnableErrorTracking.tsx
index b411fe227..11c626a42 100644
--- a/client/src/app/[site]/errors/components/EnableErrorTracking.tsx
+++ b/client/src/app/[site]/errors/components/EnableErrorTracking.tsx
@@ -2,7 +2,7 @@
import { AlertTriangle } from "lucide-react";
import { useParams } from "next/navigation";
-import { toast } from "sonner";
+import { toast } from "@/components/ui/sonner";
import { updateSiteConfig } from "../../../../api/admin/endpoints";
import { useGetSite } from "../../../../api/admin/hooks/useSites";
import { Alert, AlertDescription, AlertTitle } from "../../../../components/ui/alert";
diff --git a/client/src/app/[site]/funnels/components/CreateFunnel.tsx b/client/src/app/[site]/funnels/components/CreateFunnel.tsx
index 127998e10..db9895d72 100644
--- a/client/src/app/[site]/funnels/components/CreateFunnel.tsx
+++ b/client/src/app/[site]/funnels/components/CreateFunnel.tsx
@@ -4,7 +4,7 @@ import { Button } from "@/components/ui/button";
import { Dialog, DialogContent, DialogHeader, DialogTitle, DialogTrigger } from "@/components/ui/dialog";
import { Plus } from "lucide-react";
import { useState } from "react";
-import { toast } from "sonner";
+import { toast } from "@/components/ui/sonner";
import { useGetFunnel, useSaveFunnel } from "../../../../api/analytics/hooks/funnels/useGetFunnel";
import { FunnelStep } from "../../../../api/analytics/endpoints";
import { FunnelForm } from "./FunnelForm";
diff --git a/client/src/app/[site]/funnels/components/EditFunnel.tsx b/client/src/app/[site]/funnels/components/EditFunnel.tsx
index 6a92a522f..4de1f5d12 100644
--- a/client/src/app/[site]/funnels/components/EditFunnel.tsx
+++ b/client/src/app/[site]/funnels/components/EditFunnel.tsx
@@ -2,7 +2,7 @@
import { Dialog, DialogContent, DialogHeader, DialogTitle } from "@/components/ui/dialog";
import { useEffect, useState } from "react";
-import { toast } from "sonner";
+import { toast } from "@/components/ui/sonner";
import { useGetFunnel, useSaveFunnel } from "../../../../api/analytics/hooks/funnels/useGetFunnel";
import { FunnelStep, SavedFunnel } from "../../../../api/analytics/endpoints";
import { FunnelForm } from "./FunnelForm";
diff --git a/client/src/app/[site]/funnels/components/FunnelRow.tsx b/client/src/app/[site]/funnels/components/FunnelRow.tsx
index 0d32ca939..ce0b285e1 100644
--- a/client/src/app/[site]/funnels/components/FunnelRow.tsx
+++ b/client/src/app/[site]/funnels/components/FunnelRow.tsx
@@ -6,7 +6,7 @@ import { Card } from "@/components/ui/card";
import { Tooltip, TooltipContent, TooltipTrigger } from "@/components/ui/tooltip";
import { ArrowRight, ChevronDown, ChevronUp, Copy, Edit, Eye, MousePointerClick, Trash2 } from "lucide-react";
import { useState } from "react";
-import { toast } from "sonner";
+import { toast } from "@/components/ui/sonner";
import { useDeleteFunnel } from "../../../../api/analytics/hooks/funnels/useDeleteFunnel";
import { useGetFunnel } from "../../../../api/analytics/hooks/funnels/useGetFunnel";
import { SavedFunnel } from "../../../../api/analytics/endpoints";
diff --git a/client/src/app/[site]/gsc/select-property/page.tsx b/client/src/app/[site]/gsc/select-property/page.tsx
index 864e525ef..6532b86f7 100644
--- a/client/src/app/[site]/gsc/select-property/page.tsx
+++ b/client/src/app/[site]/gsc/select-property/page.tsx
@@ -6,7 +6,7 @@ import { Button } from "@/components/ui/button";
import { Card, CardContent, CardDescription, CardHeader, CardTitle } from "@/components/ui/card";
import { RadioGroup, RadioGroupItem } from "@/components/ui/radio-group";
import { Label } from "@/components/ui/label";
-import { toast } from "sonner";
+import { toast } from "@/components/ui/sonner";
import { authedFetch } from "@/api/utils";
import { useQueryState, parseAsJson } from "nuqs";
diff --git a/client/src/app/[site]/performance/components/EnableWebVitals.tsx b/client/src/app/[site]/performance/components/EnableWebVitals.tsx
index d01ec948d..cf1f033f6 100644
--- a/client/src/app/[site]/performance/components/EnableWebVitals.tsx
+++ b/client/src/app/[site]/performance/components/EnableWebVitals.tsx
@@ -2,7 +2,7 @@
import { Gauge } from "lucide-react";
import { useParams } from "next/navigation";
-import { toast } from "sonner";
+import { toast } from "@/components/ui/sonner";
import { updateSiteConfig } from "../../../../api/admin/endpoints";
import { useGetSite } from "../../../../api/admin/hooks/useSites";
import { Alert, AlertDescription, AlertTitle } from "../../../../components/ui/alert";
diff --git a/client/src/app/[site]/replay/components/EnableSessionReplay.tsx b/client/src/app/[site]/replay/components/EnableSessionReplay.tsx
index 6e3248832..e1776f498 100644
--- a/client/src/app/[site]/replay/components/EnableSessionReplay.tsx
+++ b/client/src/app/[site]/replay/components/EnableSessionReplay.tsx
@@ -2,7 +2,7 @@
import { Video } from "lucide-react";
import { useParams } from "next/navigation";
-import { toast } from "sonner";
+import { toast } from "@/components/ui/sonner";
import { updateSiteConfig } from "../../../../api/admin/endpoints";
import { useGetSite } from "../../../../api/admin/hooks/useSites";
import { Alert, AlertDescription, AlertTitle } from "../../../../components/ui/alert";
diff --git a/client/src/app/admin/components/users/AddToOrganizationDialog.tsx b/client/src/app/admin/components/users/AddToOrganizationDialog.tsx
index a7f15bad1..2e7c3a695 100644
--- a/client/src/app/admin/components/users/AddToOrganizationDialog.tsx
+++ b/client/src/app/admin/components/users/AddToOrganizationDialog.tsx
@@ -15,7 +15,7 @@ import { Command, CommandEmpty, CommandGroup, CommandInput, CommandItem, Command
import { Popover, PopoverContent, PopoverTrigger } from "@/components/ui/popover";
import { Check, ChevronsUpDown } from "lucide-react";
import { useState } from "react";
-import { toast } from "sonner";
+import { toast } from "@/components/ui/sonner";
import { Alert } from "@/components/ui/alert";
import { useAddUserToOrganization } from "@/api/admin/hooks/useOrganizations";
import { useAdminOrganizations } from "@/api/admin/hooks/useAdminOrganizations";
diff --git a/client/src/app/admin/components/users/UsersTable.tsx b/client/src/app/admin/components/users/UsersTable.tsx
index ff25e41c7..4b0478591 100644
--- a/client/src/app/admin/components/users/UsersTable.tsx
+++ b/client/src/app/admin/components/users/UsersTable.tsx
@@ -40,7 +40,7 @@ import { parseUtcTimestamp } from "../../../../lib/dateTimeUtils";
import { AddToOrganizationDialog } from "./AddToOrganizationDialog";
import { useRemoveUserFromOrganization } from "@/api/admin/hooks/useOrganizations";
import { useAdminOrganizations } from "@/api/admin/hooks/useAdminOrganizations";
-import { toast } from "sonner";
+import { toast } from "@/components/ui/sonner";
import { Label } from "@/components/ui/label";
import { Command, CommandEmpty, CommandGroup, CommandInput, CommandItem, CommandList } from "@/components/ui/command";
import { Popover, PopoverContent, PopoverTrigger } from "@/components/ui/popover";
diff --git a/client/src/app/settings/account/components/AccountInner.tsx b/client/src/app/settings/account/components/AccountInner.tsx
index 5219ab9e2..070f41da6 100644
--- a/client/src/app/settings/account/components/AccountInner.tsx
+++ b/client/src/app/settings/account/components/AccountInner.tsx
@@ -4,7 +4,7 @@ import { authClient } from "@/lib/auth";
import { useQueryClient } from "@tanstack/react-query";
import { useRouter } from "next/navigation";
import { useEffect, useState } from "react";
-import { toast } from "sonner";
+import { toast } from "@/components/ui/sonner";
import { useUpdateAccountSettings } from "../../../../api/admin/hooks/useAccountSettings";
import { Button } from "../../../../components/ui/button";
import { Card, CardContent, CardHeader, CardTitle } from "../../../../components/ui/card";
diff --git a/client/src/app/settings/account/components/ApiKeyManager.tsx b/client/src/app/settings/account/components/ApiKeyManager.tsx
index 01e023d08..bb908fae3 100644
--- a/client/src/app/settings/account/components/ApiKeyManager.tsx
+++ b/client/src/app/settings/account/components/ApiKeyManager.tsx
@@ -1,7 +1,7 @@
"use client";
import { useState } from "react";
-import { toast } from "sonner";
+import { toast } from "@/components/ui/sonner";
import { Button } from "../../../../components/ui/button";
import { Card, CardContent, CardHeader, CardTitle } from "../../../../components/ui/card";
import { Input } from "../../../../components/ui/input";
diff --git a/client/src/app/settings/account/components/ChangePassword.tsx b/client/src/app/settings/account/components/ChangePassword.tsx
index 1e967cec9..915a678ab 100644
--- a/client/src/app/settings/account/components/ChangePassword.tsx
+++ b/client/src/app/settings/account/components/ChangePassword.tsx
@@ -3,7 +3,7 @@
import { cn } from "@/lib/utils";
import { CheckCircle2, KeyRound, ShieldAlert, ShieldCheck, XCircle } from "lucide-react";
import { useEffect, useState } from "react";
-import { toast } from "sonner";
+import { toast } from "@/components/ui/sonner";
import { Button } from "../../../../components/ui/button";
import {
Dialog,
diff --git a/client/src/app/settings/account/components/DeleteAccount.tsx b/client/src/app/settings/account/components/DeleteAccount.tsx
index 46554b0a2..d46d88f5d 100644
--- a/client/src/app/settings/account/components/DeleteAccount.tsx
+++ b/client/src/app/settings/account/components/DeleteAccount.tsx
@@ -3,7 +3,7 @@
import { useQueryClient } from "@tanstack/react-query";
import { AlertTriangle } from "lucide-react";
import { useState } from "react";
-import { toast } from "sonner";
+import { toast } from "@/components/ui/sonner";
import {
AlertDialog,
AlertDialogAction,
diff --git a/client/src/app/settings/organization/members/components/CreateUserDialog.tsx b/client/src/app/settings/organization/members/components/CreateUserDialog.tsx
index d45a30cae..0eeb43852 100644
--- a/client/src/app/settings/organization/members/components/CreateUserDialog.tsx
+++ b/client/src/app/settings/organization/members/components/CreateUserDialog.tsx
@@ -15,7 +15,7 @@ import { Label } from "@/components/ui/label";
import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from "@/components/ui/select";
import { UserPlus } from "lucide-react";
import { useState } from "react";
-import { toast } from "sonner";
+import { toast } from "@/components/ui/sonner";
import { Alert } from "../../../../../components/ui/alert";
import { authClient } from "../../../../../lib/auth";
import { validateEmail } from "../../../../../lib/auth-utils";
diff --git a/client/src/app/settings/organization/members/components/DeleteOrganizationDialog.tsx b/client/src/app/settings/organization/members/components/DeleteOrganizationDialog.tsx
index 48561a890..6a925462d 100644
--- a/client/src/app/settings/organization/members/components/DeleteOrganizationDialog.tsx
+++ b/client/src/app/settings/organization/members/components/DeleteOrganizationDialog.tsx
@@ -3,7 +3,7 @@
import { useQueryClient } from "@tanstack/react-query";
import { AlertTriangle } from "lucide-react";
import { useState } from "react";
-import { toast } from "sonner";
+import { toast } from "@/components/ui/sonner";
import {
AlertDialog,
AlertDialogAction,
diff --git a/client/src/app/settings/organization/members/components/Invitations.tsx b/client/src/app/settings/organization/members/components/Invitations.tsx
index 0c267223c..d5935f09c 100644
--- a/client/src/app/settings/organization/members/components/Invitations.tsx
+++ b/client/src/app/settings/organization/members/components/Invitations.tsx
@@ -1,7 +1,7 @@
"use client";
import { DateTime } from "luxon";
import { useState } from "react";
-import { toast } from "sonner";
+import { toast } from "@/components/ui/sonner";
import { useOrganizationInvitations } from "../../../../../api/admin/hooks/useOrganizations";
import { Badge } from "../../../../../components/ui/badge";
import { Button } from "../../../../../components/ui/button";
diff --git a/client/src/app/settings/organization/members/components/InviteMemberDialog.tsx b/client/src/app/settings/organization/members/components/InviteMemberDialog.tsx
index c417050c3..372fea54e 100644
--- a/client/src/app/settings/organization/members/components/InviteMemberDialog.tsx
+++ b/client/src/app/settings/organization/members/components/InviteMemberDialog.tsx
@@ -3,7 +3,7 @@
import { useMutation, useQueryClient } from "@tanstack/react-query";
import { UserPlus } from "lucide-react";
import { useMemo, useState } from "react";
-import { toast } from "sonner";
+import { toast } from "@/components/ui/sonner";
import { authedFetch } from "@/api/utils";
import { Button } from "@/components/ui/button";
diff --git a/client/src/app/settings/organization/members/components/MemberSiteAccessDialog.tsx b/client/src/app/settings/organization/members/components/MemberSiteAccessDialog.tsx
index 90a001ea4..8aff2773e 100644
--- a/client/src/app/settings/organization/members/components/MemberSiteAccessDialog.tsx
+++ b/client/src/app/settings/organization/members/components/MemberSiteAccessDialog.tsx
@@ -2,7 +2,7 @@
import { useMutation, useQueryClient } from "@tanstack/react-query";
import { useEffect, useState } from "react";
-import { toast } from "sonner";
+import { toast } from "@/components/ui/sonner";
import { GetOrganizationMembersResponse, updateMemberSiteAccess } from "@/api/admin/endpoints/auth";
import { Button } from "@/components/ui/button";
diff --git a/client/src/app/settings/organization/members/components/RemoveMemberDialog.tsx b/client/src/app/settings/organization/members/components/RemoveMemberDialog.tsx
index 51526076a..3b087daf0 100644
--- a/client/src/app/settings/organization/members/components/RemoveMemberDialog.tsx
+++ b/client/src/app/settings/organization/members/components/RemoveMemberDialog.tsx
@@ -13,7 +13,7 @@ import {
import { authClient } from "@/lib/auth";
import { UserMinus } from "lucide-react";
import { useState } from "react";
-import { toast } from "sonner";
+import { toast } from "@/components/ui/sonner";
import { Member } from "../page";
interface RemoveMemberDialogProps {
diff --git a/client/src/app/settings/organization/members/page.tsx b/client/src/app/settings/organization/members/page.tsx
index 053c61b32..1f94d8301 100644
--- a/client/src/app/settings/organization/members/page.tsx
+++ b/client/src/app/settings/organization/members/page.tsx
@@ -7,7 +7,7 @@ import { Badge } from "../../../../components/ui/badge";
import { authClient } from "../../../../lib/auth";
import { useEffect, useState } from "react";
-import { toast } from "sonner";
+import { toast } from "@/components/ui/sonner";
import { useOrganizationMembers } from "../../../../api/admin/hooks/useOrganizationMembers";
import { useOrganizationInvitations } from "../../../../api/admin/hooks/useOrganizations";
import { NoOrganization } from "../../../../components/NoOrganization";
diff --git a/client/src/app/subscribe/components/PricingCard.tsx b/client/src/app/subscribe/components/PricingCard.tsx
index 502716afc..7c1c74444 100644
--- a/client/src/app/subscribe/components/PricingCard.tsx
+++ b/client/src/app/subscribe/components/PricingCard.tsx
@@ -5,7 +5,7 @@ import { authClient } from "@/lib/auth";
import { BACKEND_URL } from "@/lib/const";
import { cn } from "@/lib/utils";
import { useState } from "react";
-import { toast } from "sonner";
+import { toast } from "@/components/ui/sonner";
import { DEFAULT_EVENT_LIMIT } from "../../../lib/subscription/constants";
import { trackAdEvent } from "../../../lib/trackAdEvent";
import { FeaturesList } from "./FeaturesList";
diff --git a/client/src/app/uptime/incidents/page.tsx b/client/src/app/uptime/incidents/page.tsx
index c18474fe0..8ba81665c 100644
--- a/client/src/app/uptime/incidents/page.tsx
+++ b/client/src/app/uptime/incidents/page.tsx
@@ -15,7 +15,7 @@ import { cn } from "@/lib/utils";
import { AlertCircle, CheckCircle, MoreHorizontal } from "lucide-react";
import { DateTime } from "luxon";
import { useState } from "react";
-import { toast } from "sonner";
+import { toast } from "@/components/ui/sonner";
import {
UptimeIncident,
useAcknowledgeIncident,
diff --git a/client/src/app/uptime/monitors/components/MonitorActions.tsx b/client/src/app/uptime/monitors/components/MonitorActions.tsx
index 2f5853c39..242a33126 100644
--- a/client/src/app/uptime/monitors/components/MonitorActions.tsx
+++ b/client/src/app/uptime/monitors/components/MonitorActions.tsx
@@ -1,7 +1,7 @@
import { Edit2, MoreVertical, Power, Trash2 } from "lucide-react";
import { useRouter } from "next/navigation";
import { useState } from "react";
-import { toast } from "sonner";
+import { toast } from "@/components/ui/sonner";
import { UptimeMonitor, useDeleteMonitor, useUpdateMonitor } from "../../../../api/uptime/monitors";
import {
AlertDialog,
diff --git a/client/src/app/uptime/monitors/components/dialog/MonitorDialog.tsx b/client/src/app/uptime/monitors/components/dialog/MonitorDialog.tsx
index 77882500c..22db7cebe 100644
--- a/client/src/app/uptime/monitors/components/dialog/MonitorDialog.tsx
+++ b/client/src/app/uptime/monitors/components/dialog/MonitorDialog.tsx
@@ -11,7 +11,7 @@ import {
} from "@/components/ui/dialog";
import { Button } from "@/components/ui/button";
import { useCreateMonitor, useUpdateMonitor, UptimeMonitor } from "@/api/uptime/monitors";
-import { toast } from "sonner";
+import { toast } from "@/components/ui/sonner";
import { Loader2 } from "lucide-react";
import { createMonitorSchema, updateMonitorSchema } from "../monitorSchemas";
import { Form } from "@/components/ui/form";
diff --git a/client/src/app/uptime/notifications/components/NotificationDialog.tsx b/client/src/app/uptime/notifications/components/NotificationDialog.tsx
index 9dbaa2be7..cf7626b40 100644
--- a/client/src/app/uptime/notifications/components/NotificationDialog.tsx
+++ b/client/src/app/uptime/notifications/components/NotificationDialog.tsx
@@ -4,7 +4,7 @@ import { Button } from "@/components/ui/button";
import { Dialog, DialogContent, DialogHeader, DialogTitle } from "@/components/ui/dialog";
import { Input } from "@/components/ui/input";
import { Label } from "@/components/ui/label";
-import { toast } from "sonner";
+import { toast } from "@/components/ui/sonner";
import { useNotificationsStore } from "../notificationsStore";
import { NotificationChannel, useCreateChannel, useUpdateChannel } from "@/api/uptime/notifications";
import { CHANNEL_CONFIG } from "../constants";
diff --git a/client/src/app/uptime/notifications/page.tsx b/client/src/app/uptime/notifications/page.tsx
index cfab376d6..ef4ecfe3e 100644
--- a/client/src/app/uptime/notifications/page.tsx
+++ b/client/src/app/uptime/notifications/page.tsx
@@ -16,7 +16,7 @@ import { Table, TableBody, TableCell, TableHead, TableHeader, TableRow } from "@
import { cn } from "@/lib/utils";
import { Bell, Edit, MoreHorizontal, Power, Trash2 } from "lucide-react";
import { useState } from "react";
-import { toast } from "sonner";
+import { toast } from "@/components/ui/sonner";
import {
NotificationChannel,
useDeleteChannel,
diff --git a/client/src/components/CreateOrganizationDialog.tsx b/client/src/components/CreateOrganizationDialog.tsx
index 9771de2a3..66f95d263 100644
--- a/client/src/components/CreateOrganizationDialog.tsx
+++ b/client/src/components/CreateOrganizationDialog.tsx
@@ -13,7 +13,7 @@ import { Input } from "./ui/input";
import { Label } from "./ui/label";
import { AlertCircle, AlertTriangle, Building2 } from "lucide-react";
import { authClient } from "../lib/auth";
-import { toast } from "sonner";
+import { toast } from "@/components/ui/sonner";
import { useMutation, useQueryClient } from "@tanstack/react-query";
import { USER_ORGANIZATIONS_QUERY_KEY } from "../api/admin/hooks/useOrganizations";
import { Alert, AlertDescription, AlertTitle } from "./ui/alert";
diff --git a/client/src/components/SiteSettings/CountryExclusionManager.tsx b/client/src/components/SiteSettings/CountryExclusionManager.tsx
index c47b7a45e..f6c5eea0d 100644
--- a/client/src/components/SiteSettings/CountryExclusionManager.tsx
+++ b/client/src/components/SiteSettings/CountryExclusionManager.tsx
@@ -2,7 +2,7 @@
import { X } from "lucide-react";
import React, { useState } from "react";
-import { toast } from "sonner";
+import { toast } from "@/components/ui/sonner";
import { Button } from "@/components/ui/button";
import { Label } from "@/components/ui/label";
diff --git a/client/src/components/SiteSettings/GSCManager.tsx b/client/src/components/SiteSettings/GSCManager.tsx
index 719062540..05884ceec 100644
--- a/client/src/components/SiteSettings/GSCManager.tsx
+++ b/client/src/components/SiteSettings/GSCManager.tsx
@@ -8,7 +8,7 @@ import { Button } from "@/components/ui/button";
import { SiGoogle } from "@icons-pack/react-simple-icons";
import { ExternalLink } from "lucide-react";
import { useEffect, useState } from "react";
-import { toast } from "sonner";
+import { toast } from "@/components/ui/sonner";
import { useQueryState, parseAsString } from "nuqs";
interface GSCManagerProps {
diff --git a/client/src/components/SiteSettings/IPExclusionManager.tsx b/client/src/components/SiteSettings/IPExclusionManager.tsx
index e01647e38..fe3b7c207 100644
--- a/client/src/components/SiteSettings/IPExclusionManager.tsx
+++ b/client/src/components/SiteSettings/IPExclusionManager.tsx
@@ -2,7 +2,7 @@
import { Minus, Plus } from "lucide-react";
import React, { useState } from "react";
-import { toast } from "sonner";
+import { toast } from "@/components/ui/sonner";
import { Button } from "@/components/ui/button";
import { Input } from "@/components/ui/input";
diff --git a/client/src/components/SiteSettings/SiteConfiguration.tsx b/client/src/components/SiteSettings/SiteConfiguration.tsx
index 5bb6dcc5b..754abdbe7 100644
--- a/client/src/components/SiteSettings/SiteConfiguration.tsx
+++ b/client/src/components/SiteSettings/SiteConfiguration.tsx
@@ -3,7 +3,7 @@
import { AlertTriangle } from "lucide-react";
import { useRouter } from "next/navigation";
import { useState, useCallback, ReactNode } from "react";
-import { toast } from "sonner";
+import { toast } from "@/components/ui/sonner";
import {
AlertDialog,
diff --git a/client/src/components/subscription/PaidPlain/PaidPlan.tsx b/client/src/components/subscription/PaidPlain/PaidPlan.tsx
index b2d18db33..b20fe8478 100644
--- a/client/src/components/subscription/PaidPlain/PaidPlan.tsx
+++ b/client/src/components/subscription/PaidPlain/PaidPlan.tsx
@@ -1,6 +1,6 @@
import { Shield } from "lucide-react";
import { useState } from "react";
-import { toast } from "sonner";
+import { toast } from "@/components/ui/sonner";
import { DateTime } from "luxon";
import { Alert } from "../../ui/alert";
import { Button } from "../../ui/button";
diff --git a/client/src/components/subscription/PaidPlain/PlanDialog.tsx b/client/src/components/subscription/PaidPlain/PlanDialog.tsx
index 409e887a2..2be559b30 100644
--- a/client/src/components/subscription/PaidPlain/PlanDialog.tsx
+++ b/client/src/components/subscription/PaidPlain/PlanDialog.tsx
@@ -6,7 +6,7 @@ import { usePreviewSubscriptionUpdate, useUpdateSubscription } from "@/lib/subsc
import { cn } from "@/lib/utils";
import { Loader2 } from "lucide-react";
import { useState } from "react";
-import { toast } from "sonner";
+import { toast } from "@/components/ui/sonner";
import { Badge } from "../../ui/badge";
import { PlanChangePreviewDialog } from "./PlanChangePreviewDialog";
diff --git a/client/src/components/ui/sonner.tsx b/client/src/components/ui/sonner.tsx
index 2962e26c1..2632ad439 100644
--- a/client/src/components/ui/sonner.tsx
+++ b/client/src/components/ui/sonner.tsx
@@ -29,3 +29,4 @@ const Toaster = ({ ...props }: ToasterProps) => {
};
export { Toaster };
+export { toast } from "sonner";
diff --git a/client/src/lib/subscription/useSubscriptionMutations.ts b/client/src/lib/subscription/useSubscriptionMutations.ts
index feeaf3234..3cc95c8e6 100644
--- a/client/src/lib/subscription/useSubscriptionMutations.ts
+++ b/client/src/lib/subscription/useSubscriptionMutations.ts
@@ -1,6 +1,6 @@
import { useMutation, useQueryClient } from "@tanstack/react-query";
import { BACKEND_URL } from "../const";
-import { toast } from "sonner";
+import { toast } from "@/components/ui/sonner";
interface PreviewSubscriptionParams {
organizationId: string;