diff --git a/apps/dashboard/src/@/api/insight/webhooks.ts b/apps/dashboard/src/@/api/insight/webhooks.ts
index f5101c258b1..0373bf32d00 100644
--- a/apps/dashboard/src/@/api/insight/webhooks.ts
+++ b/apps/dashboard/src/@/api/insight/webhooks.ts
@@ -41,12 +41,6 @@ export interface WebhookFilters {
   };
 }
 
-interface CreateWebhookPayload {
-  name: string;
-  webhook_url: string;
-  filters: WebhookFilters;
-}
-
 interface WebhooksListResponse {
   data: WebhookResponse[];
   error?: string;
@@ -57,56 +51,10 @@ interface WebhookSingleResponse {
   error?: string;
 }
 
-interface TestWebhookPayload {
-  webhook_url: string;
-  type?: "event" | "transaction";
-}
-
-interface TestWebhookResponse {
-  success: boolean;
-  error?: string;
-}
-
 type SupportedWebhookChainsResponse =
   | { chains: Array<number> }
   | { error: string };
 
-export async function createWebhook(
-  payload: CreateWebhookPayload,
-  clientId: string,
-): Promise<WebhookSingleResponse> {
-  try {
-    const authToken = await getAuthToken();
-    const response = await fetch(
-      `https://${THIRDWEB_INSIGHT_API_DOMAIN}/v1/webhooks`,
-      {
-        body: JSON.stringify(payload),
-        headers: {
-          Authorization: `Bearer ${authToken}`,
-          "Content-Type": "application/json",
-          "x-client-id": clientId,
-        },
-        method: "POST",
-      },
-    );
-
-    if (!response.ok) {
-      const errorText = await response.text();
-      return {
-        data: null,
-        error: `Failed to create webhook: ${errorText}`,
-      };
-    }
-
-    return (await response.json()) as WebhookSingleResponse;
-  } catch (error) {
-    return {
-      data: null,
-      error: `Network or parsing error: ${error instanceof Error ? error.message : "Unknown error"}`,
-    };
-  }
-}
-
 export async function getWebhooks(
   clientId: string,
 ): Promise<WebhooksListResponse> {
@@ -174,42 +122,6 @@ export async function deleteWebhook(
   }
 }
 
-export async function testWebhook(
-  payload: TestWebhookPayload,
-  clientId: string,
-): Promise<TestWebhookResponse> {
-  try {
-    const authToken = await getAuthToken();
-    const response = await fetch(
-      `https://${THIRDWEB_INSIGHT_API_DOMAIN}/v1/webhooks/test`,
-      {
-        body: JSON.stringify(payload),
-        headers: {
-          Authorization: `Bearer ${authToken}`,
-          "Content-Type": "application/json",
-          "x-client-id": clientId,
-        },
-        method: "POST",
-      },
-    );
-
-    if (!response.ok) {
-      const errorText = await response.text();
-      return {
-        error: `Failed to test webhook: ${errorText}`,
-        success: false,
-      };
-    }
-
-    return (await response.json()) as TestWebhookResponse;
-  } catch (error) {
-    return {
-      error: `Network or parsing error: ${error instanceof Error ? error.message : "Unknown error"}`,
-      success: false,
-    };
-  }
-}
-
 export async function getSupportedWebhookChains(): Promise<SupportedWebhookChainsResponse> {
   try {
     const response = await fetch(
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/webhooks/components/BasicInfoStep.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/webhooks/components/BasicInfoStep.tsx
deleted file mode 100644
index 872c8802c68..00000000000
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/webhooks/components/BasicInfoStep.tsx
+++ /dev/null
@@ -1,192 +0,0 @@
-"use client";
-
-import { useId } from "react";
-import type { UseFormReturn } from "react-hook-form";
-import { Button } from "@/components/ui/button";
-import {
-  FormControl,
-  FormField,
-  FormItem,
-  FormLabel,
-  FormMessage,
-} from "@/components/ui/form";
-import { Input } from "@/components/ui/input";
-import { RadioGroup, RadioGroupItem } from "@/components/ui/radio-group";
-import { cn } from "@/lib/utils";
-import type { WebhookFormValues } from "../utils/webhookTypes";
-
-interface BasicInfoStepProps {
-  form: UseFormReturn<WebhookFormValues>;
-  goToNextStep: () => void;
-  isLoading: boolean;
-}
-
-export default function BasicInfoStep({
-  form,
-  goToNextStep,
-  isLoading,
-}: BasicInfoStepProps) {
-  const filterEventId = useId();
-  const filterTransactionId = useId();
-  return (
-    <>
-      <div className="mb-4">
-        <h2 className="font-medium text-lg">Step 1: Basic Information</h2>
-        <p className="text-muted-foreground text-sm">
-          Provide webhook details and select filter type
-        </p>
-      </div>
-
-      <FormField
-        control={form.control}
-        name="name"
-        render={({ field }) => (
-          <FormItem className="flex flex-col">
-            <FormLabel>
-              Name <span className="text-red-500">*</span>
-            </FormLabel>
-            <FormControl>
-              <Input
-                onChange={field.onChange}
-                placeholder="Webhook name"
-                value={field.value}
-              />
-            </FormControl>
-            <FormMessage />
-          </FormItem>
-        )}
-      />
-
-      <FormField
-        control={form.control}
-        name="webhookUrl"
-        render={({ field }) => (
-          <FormItem className="mt-4 flex flex-col">
-            <FormLabel>
-              Webhook URL <span className="text-red-500">*</span>
-            </FormLabel>
-            <FormControl>
-              <Input
-                onChange={field.onChange}
-                placeholder="https://your-server.com/webhook"
-                type="url"
-                value={field.value}
-              />
-            </FormControl>
-            <FormMessage />
-          </FormItem>
-        )}
-      />
-
-      <FormField
-        control={form.control}
-        name="filterType"
-        render={({ field }) => (
-          <FormItem className="mt-6 flex flex-col">
-            <FormLabel>
-              Filter Type <span className="text-red-500">*</span>
-            </FormLabel>
-            <FormControl>
-              <RadioGroup
-                className="grid grid-cols-1 gap-4 md:grid-cols-2"
-                onValueChange={(value: string) => {
-                  if (value !== "event" && value !== "transaction") {
-                    return;
-                  }
-                  field.onChange(value);
-                  // Ensure the form state is updated immediately
-                  form.setValue("filterType", value, {
-                    shouldDirty: true,
-                    shouldValidate: true,
-                  });
-                }}
-                value={field.value || undefined}
-              >
-                <div className="col-span-1">
-                  <label
-                    className={cn(
-                      "flex cursor-pointer flex-col rounded-lg border-2 p-4 hover:border-primary/50",
-                      field.value === "event"
-                        ? "border-primary bg-primary/5"
-                        : "",
-                    )}
-                    htmlFor={filterEventId}
-                  >
-                    <RadioGroupItem
-                      className="sr-only"
-                      id={filterEventId}
-                      value="event"
-                    />
-                    <div className="mb-2 flex items-center justify-between">
-                      <span className="font-medium text-base">Event</span>
-                      <div
-                        className={cn(
-                          "flex h-5 w-5 items-center justify-center rounded-full border",
-                          field.value === "event"
-                            ? "border-primary"
-                            : "border-muted-foreground",
-                        )}
-                      >
-                        {field.value === "event" && (
-                          <div className="h-3 w-3 rounded-full bg-primary" />
-                        )}
-                      </div>
-                    </div>
-                    <span className="text-muted-foreground text-sm">
-                      Listen for contract events like token transfers or state
-                      changes
-                    </span>
-                  </label>
-                </div>
-
-                <div className="col-span-1">
-                  <label
-                    className={cn(
-                      "flex cursor-pointer flex-col rounded-lg border-2 p-4 hover:border-primary/50",
-                      field.value === "transaction"
-                        ? "border-primary bg-primary/5"
-                        : "",
-                    )}
-                    htmlFor={filterTransactionId}
-                  >
-                    <RadioGroupItem
-                      className="sr-only"
-                      id={filterTransactionId}
-                      value="transaction"
-                    />
-                    <div className="mb-2 flex items-center justify-between">
-                      <span className="font-medium text-base">Transaction</span>
-                      <div
-                        className={cn(
-                          "flex h-5 w-5 items-center justify-center rounded-full border",
-                          field.value === "transaction"
-                            ? "border-primary"
-                            : "border-muted-foreground",
-                        )}
-                      >
-                        {field.value === "transaction" && (
-                          <div className="h-3 w-3 rounded-full bg-primary" />
-                        )}
-                      </div>
-                    </div>
-                    <span className="text-muted-foreground text-sm">
-                      Listen for blockchain transactions with specific
-                      parameters
-                    </span>
-                  </label>
-                </div>
-              </RadioGroup>
-            </FormControl>
-            <FormMessage />
-          </FormItem>
-        )}
-      />
-
-      <div className="mt-6 flex justify-end">
-        <Button disabled={isLoading} onClick={goToNextStep} type="button">
-          Next
-        </Button>
-      </div>
-    </>
-  );
-}
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/webhooks/components/CreateWebhookModal.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/webhooks/components/CreateWebhookModal.tsx
deleted file mode 100644
index 9d2ee68c3d4..00000000000
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/webhooks/components/CreateWebhookModal.tsx
+++ /dev/null
@@ -1,310 +0,0 @@
-"use client";
-
-import { zodResolver } from "@hookform/resolvers/zod";
-import { PlusIcon, XIcon } from "lucide-react";
-import { useState } from "react";
-import { useForm, useWatch } from "react-hook-form";
-import { toast } from "sonner";
-import type { ThirdwebClient } from "thirdweb";
-import { createWebhook } from "@/api/insight/webhooks";
-import { Button } from "@/components/ui/button";
-import {
-  Dialog,
-  DialogContent,
-  DialogTitle,
-  DialogTrigger,
-} from "@/components/ui/dialog";
-import { Form } from "@/components/ui/form";
-import { useDashboardRouter } from "@/lib/DashboardRouter";
-import { useAbiMultiFetch } from "../hooks/useAbiProcessing";
-import { useTestWebhook } from "../hooks/useTestWebhook";
-import {
-  extractEventSignatures,
-  extractFunctionSignatures,
-} from "../utils/abiUtils";
-import type { WebhookPayload } from "../utils/webhookPayloadUtils";
-import {
-  buildEventWebhookPayload,
-  buildTransactionWebhookPayload,
-} from "../utils/webhookPayloadUtils";
-import {
-  type WebhookFormStep,
-  WebhookFormSteps,
-  type WebhookFormValues,
-  webhookFormSchema,
-} from "../utils/webhookTypes";
-import BasicInfoStep from "./BasicInfoStep";
-import { FilterDetailsStep } from "./FilterDetailsStep";
-import ReviewStep from "./ReviewStep";
-
-interface CreateWebhookModalProps {
-  projectClientId: string;
-  supportedChainIds: Array<number>;
-  client: ThirdwebClient;
-}
-
-export function CreateContractWebhookButton({
-  projectClientId,
-  supportedChainIds,
-  client,
-}: CreateWebhookModalProps) {
-  const router = useDashboardRouter();
-  const [isOpen, setIsOpen] = useState(false);
-  const [currentStep, setCurrentStep] = useState<WebhookFormStep>(
-    WebhookFormSteps.BasicInfo,
-  );
-
-  const formHook = useForm<WebhookFormValues>({
-    defaultValues: {
-      abi: "",
-      addresses: "",
-      chainIds: [],
-      eventTypes: [],
-      filterType: "event",
-      fromAddresses: "",
-      inputAbi: [],
-      name: "",
-      secret: "",
-      sigHash: "",
-      sigHashAbi: "",
-      toAddresses: "",
-      webhookUrl: "",
-    },
-    resolver: zodResolver(webhookFormSchema),
-  });
-
-  const chainIds = useWatch({ control: formHook.control, name: "chainIds" });
-  const addresses = useWatch({ control: formHook.control, name: "addresses" });
-  const toAddresses = useWatch({
-    control: formHook.control,
-    name: "toAddresses",
-  });
-
-  const eventAbi = useAbiMultiFetch({
-    addresses: addresses || "",
-    chainIds,
-    extractSignatures: extractEventSignatures,
-    isOpen,
-    thirdwebClient: client,
-    type: "event",
-  });
-
-  const txAbi = useAbiMultiFetch({
-    addresses: toAddresses || "",
-    chainIds,
-    extractSignatures: extractFunctionSignatures,
-    isOpen,
-    thirdwebClient: client,
-    type: "transaction",
-  });
-
-  // Track loading state locally
-  const [isLoading, setIsLoading] = useState(false);
-
-  // Standalone function for the review step create button
-  const handleCreateButtonClick = async () => {
-    try {
-      const data = formHook.getValues();
-
-      await handleSubmit(data);
-    } catch (error) {
-      toast.error(
-        `Failed to process webhook: ${
-          error instanceof Error ? error.message : String(error)
-        }`,
-      );
-    }
-  };
-
-  // Create our own submit handler
-  const handleSubmit = async (data: WebhookFormValues) => {
-    setIsLoading(true);
-
-    try {
-      let payload: WebhookPayload;
-      if (data.filterType === "event") {
-        payload = buildEventWebhookPayload(data);
-      } else {
-        payload = buildTransactionWebhookPayload(data);
-      }
-
-      const response = await createWebhook(payload, projectClientId);
-      if (response?.error) {
-        toast.error(`${response.error}`);
-        return;
-      }
-      toast.success("Webhook created successfully!");
-
-      // Reset local state
-      formHook.reset();
-      setCurrentStep(WebhookFormSteps.BasicInfo);
-      setIsOpen(false);
-
-      // Refresh the webhooks table
-      router.refresh();
-    } catch (error) {
-      toast.error(
-        `Failed to create webhook: ${
-          error instanceof Error ? error.message : String(error)
-        }`,
-      );
-    } finally {
-      setIsLoading(false);
-    }
-  };
-
-  const goToNextStep = async () => {
-    switch (currentStep) {
-      case WebhookFormSteps.BasicInfo: {
-        const result = await formHook.trigger([
-          "name",
-          "webhookUrl",
-          "filterType",
-        ]);
-
-        if (result) {
-          setCurrentStep(WebhookFormSteps.FilterDetails);
-        } else {
-          toast.error("Please fill in all required fields marked with *");
-        }
-        break;
-      }
-      case WebhookFormSteps.FilterDetails: {
-        // Validate based on filter type
-        const filterType = formHook.getValues("filterType");
-        let result: boolean;
-
-        if (filterType === "event") {
-          result = await formHook.trigger(["chainIds", "addresses"]);
-        } else {
-          result = await formHook.trigger([
-            "chainIds",
-            "toAddresses",
-            "fromAddresses",
-          ]);
-        }
-
-        if (result) {
-          setCurrentStep(WebhookFormSteps.Review);
-        } else {
-          toast.error("Please fill in all required fields marked with *");
-        }
-        break;
-      }
-      default:
-        break;
-    }
-  };
-
-  const goToPreviousStep = () => {
-    switch (currentStep) {
-      case WebhookFormSteps.FilterDetails:
-        setCurrentStep(WebhookFormSteps.BasicInfo);
-        break;
-      case WebhookFormSteps.Review:
-        setCurrentStep(WebhookFormSteps.FilterDetails);
-        break;
-      default:
-        break;
-    }
-  };
-
-  const handleOpenModal = () => {
-    formHook.reset();
-    setCurrentStep(WebhookFormSteps.BasicInfo);
-    setIsOpen(true);
-  };
-
-  const handleCloseModal = () => {
-    setIsOpen(false);
-  };
-
-  const { testWebhookEndpoint, isTestingMap, testResults, isRecentResult } =
-    useTestWebhook(projectClientId);
-
-  const handleTestWebhook = async (webhookUrl: string) => {
-    const filterType = formHook.getValues("filterType");
-    return await testWebhookEndpoint(webhookUrl, filterType);
-  };
-
-  return (
-    <Dialog open={isOpen}>
-      <DialogTrigger asChild>
-        <Button className="gap-1.5" onClick={handleOpenModal} size="sm">
-          <PlusIcon className="size-4" />
-          Create Webhook
-        </Button>
-      </DialogTrigger>
-
-      <DialogContent
-        className="max-h-[85vh] max-w-5xl overflow-y-auto"
-        dialogCloseClassName="hidden"
-      >
-        <div className="flex items-center justify-between">
-          <DialogTitle className="font-medium text-lg">
-            Create New Webhook
-          </DialogTitle>
-          <Button
-            className="h-6 w-6"
-            onClick={handleCloseModal}
-            size="icon"
-            variant="ghost"
-          >
-            <XIcon className="h-4 w-4" />
-            <span className="sr-only">Close</span>
-          </Button>
-        </div>
-
-        <Form {...formHook}>
-          <form
-            className="space-y-4"
-            onSubmit={formHook.handleSubmit(handleSubmit)}
-          >
-            {/* Step Content */}
-            <div className="min-h-[300px]">
-              {currentStep === WebhookFormSteps.BasicInfo && (
-                <BasicInfoStep
-                  form={formHook}
-                  goToNextStep={goToNextStep}
-                  isLoading={isLoading}
-                />
-              )}
-
-              {currentStep === WebhookFormSteps.FilterDetails && (
-                <FilterDetailsStep
-                  abiErrors={eventAbi.errors}
-                  client={client}
-                  eventSignatures={eventAbi.signatures}
-                  fetchedAbis={eventAbi.fetchedAbis}
-                  fetchedTxAbis={txAbi.fetchedAbis}
-                  form={formHook}
-                  functionSignatures={txAbi.signatures}
-                  goToNextStep={goToNextStep}
-                  goToPreviousStep={goToPreviousStep}
-                  isFetchingEventAbi={eventAbi.isFetching}
-                  isFetchingTxAbi={txAbi.isFetching}
-                  isLoading={isLoading}
-                  supportedChainIds={supportedChainIds}
-                  txAbiErrors={txAbi.errors}
-                />
-              )}
-
-              {currentStep === WebhookFormSteps.Review && (
-                <ReviewStep
-                  form={formHook}
-                  goToPreviousStep={goToPreviousStep}
-                  handleCreateButtonClick={handleCreateButtonClick}
-                  isLoading={isLoading}
-                  isRecentResult={isRecentResult}
-                  isTestingMap={isTestingMap}
-                  testResults={testResults}
-                  testWebhookEndpoint={handleTestWebhook}
-                />
-              )}
-            </div>
-          </form>
-        </Form>
-      </DialogContent>
-    </Dialog>
-  );
-}
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/webhooks/components/FilterDetailsStep.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/webhooks/components/FilterDetailsStep.tsx
deleted file mode 100644
index ef164b83391..00000000000
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/webhooks/components/FilterDetailsStep.tsx
+++ /dev/null
@@ -1,532 +0,0 @@
-"use client";
-
-import { useQueryClient } from "@tanstack/react-query";
-import type { UseFormReturn } from "react-hook-form";
-import type { ThirdwebClient } from "thirdweb";
-import { MultiNetworkSelector } from "@/components/blocks/NetworkSelectors";
-import { SignatureSelector } from "@/components/blocks/SignatureSelector";
-import { Badge } from "@/components/ui/badge";
-import { Button } from "@/components/ui/button";
-import {
-  FormControl,
-  FormField,
-  FormItem,
-  FormLabel,
-  FormMessage,
-} from "@/components/ui/form";
-import { Input } from "@/components/ui/input";
-import { Spinner } from "@/components/ui/Spinner/Spinner";
-import { Textarea } from "@/components/ui/textarea";
-import { truncateMiddle } from "../utils/abiUtils";
-import type {
-  AbiData,
-  EventSignature,
-  FunctionSignature,
-  WebhookFormValues,
-} from "../utils/webhookTypes";
-
-interface FilterDetailsStepProps {
-  form: UseFormReturn<WebhookFormValues>;
-  eventSignatures: EventSignature[];
-  functionSignatures: FunctionSignature[];
-  fetchedAbis: Record<string, AbiData>;
-  abiErrors: Record<string, string>;
-  fetchedTxAbis: Record<string, AbiData>;
-  txAbiErrors: Record<string, string>;
-  isFetchingEventAbi: boolean;
-  isFetchingTxAbi: boolean;
-  goToNextStep: () => void;
-  goToPreviousStep: () => void;
-  isLoading: boolean;
-  supportedChainIds: Array<number>;
-  client: ThirdwebClient;
-}
-
-export function FilterDetailsStep({
-  form,
-  eventSignatures,
-  functionSignatures,
-  fetchedAbis = {},
-  abiErrors = {},
-  fetchedTxAbis = {},
-  txAbiErrors = {},
-  isFetchingEventAbi,
-  isFetchingTxAbi,
-  goToNextStep,
-  goToPreviousStep,
-  isLoading,
-  supportedChainIds,
-  client,
-}: FilterDetailsStepProps) {
-  const queryClient = useQueryClient();
-  const watchFilterType = form.watch("filterType") as
-    | "event"
-    | "transaction"
-    | undefined;
-  const selectedChainIds = Array.isArray(form.watch("chainIds"))
-    ? form.watch("chainIds").map(Number)
-    : [];
-  const contractAddresses = form.watch("addresses") || "";
-
-  // --- Custom signature detection logic ---
-  const sigHash = form.watch("sigHash") || "";
-  const knownEventSignatures = eventSignatures.map((sig) => sig.signature);
-  const knownFunctionSignatures = functionSignatures.map(
-    (sig) => sig.signature,
-  );
-  const isCustomSignature =
-    (watchFilterType === "event" &&
-      sigHash &&
-      !knownEventSignatures.includes(sigHash)) ||
-    (watchFilterType === "transaction" &&
-      sigHash &&
-      !knownFunctionSignatures.includes(sigHash));
-
-  return (
-    <>
-      <div className="mb-4">
-        <h2 className="font-medium text-lg">
-          Step 2: Configure Filters & Advanced Options
-        </h2>
-        <p className="text-muted-foreground text-sm">
-          Configure filter options and advanced settings for your webhook
-        </p>
-      </div>
-
-      {/* Filter Options */}
-      <div className="space-y-3">
-        {/* Chain IDs Field */}
-        <FormField
-          control={form.control}
-          name="chainIds"
-          render={({ field }) => (
-            <FormItem className="flex flex-col">
-              <div className="flex items-center justify-between text-xs">
-                <FormLabel>
-                  Chain IDs <span className="text-red-500">*</span>
-                </FormLabel>
-                <p className="text-muted-foreground">
-                  Select the chains you want to monitor
-                </p>
-              </div>
-              <FormControl>
-                <MultiNetworkSelector
-                  chainIds={supportedChainIds}
-                  client={client}
-                  onChange={(chainIds) => field.onChange(chainIds.map(String))}
-                  selectedChainIds={
-                    Array.isArray(field.value) ? field.value.map(Number) : []
-                  }
-                />
-              </FormControl>
-              <FormMessage />
-            </FormItem>
-          )}
-        />
-
-        {watchFilterType === "event" && (
-          <FormField
-            control={form.control}
-            name="addresses"
-            render={({ field }) => (
-              <FormItem className="flex flex-col">
-                <div className="flex items-center justify-between text-xs">
-                  <FormLabel>
-                    Contract Addresses <span className="text-red-500">*</span>
-                  </FormLabel>
-                  <p className="text-muted-foreground">
-                    Enter a contract address
-                  </p>
-                </div>
-                <FormControl>
-                  <div className="space-y-2">
-                    <Input placeholder="0x1234..." {...field} />
-
-                    {/* ABI fetch status */}
-                    <div className="mt-2 flex items-center justify-between">
-                      {watchFilterType === "event" && isFetchingEventAbi && (
-                        <div className="flex items-center">
-                          <Spinner className="mr-2 h-3 w-3" />
-                          <span className="text-xs">Fetching ABIs...</span>
-                        </div>
-                      )}
-                    </div>
-
-                    {/* ABI fetch results */}
-                    {(Object.keys(fetchedAbis).length > 0 ||
-                      Object.keys(abiErrors).length > 0) && (
-                      <div className="mt-2 space-y-2 text-xs">
-                        {Object.keys(fetchedAbis).length > 0 && (
-                          <div className="flex items-center gap-2">
-                            <Badge
-                              className="border-green-200 bg-green-50 text-green-700"
-                              variant="outline"
-                            >
-                              ✓ {Object.keys(fetchedAbis).length} ABI
-                              {Object.keys(fetchedAbis).length !== 1 ? "s" : ""}{" "}
-                              fetched
-                            </Badge>
-                          </div>
-                        )}
-
-                        {Object.keys(abiErrors).length > 0 && (
-                          <div className="flex items-center gap-2">
-                            <Badge
-                              className="border-red-200 bg-red-50 text-red-700"
-                              variant="outline"
-                            >
-                              ✗ {Object.keys(abiErrors).length} error
-                              {Object.keys(abiErrors).length !== 1 ? "s" : ""}
-                            </Badge>
-                          </div>
-                        )}
-                      </div>
-                    )}
-                  </div>
-                </FormControl>
-                <FormMessage />
-              </FormItem>
-            )}
-          />
-        )}
-
-        {watchFilterType === "transaction" && (
-          <>
-            <FormField
-              control={form.control}
-              name="fromAddresses"
-              render={({ field }) => (
-                <FormItem className="flex flex-col">
-                  <div className="flex items-center justify-between text-xs">
-                    <FormLabel>
-                      From Address <span className="text-red-500">*</span>
-                    </FormLabel>
-                    <p className="text-muted-foreground">
-                      Enter a from address
-                    </p>
-                  </div>
-                  <FormControl>
-                    <Input
-                      onChange={field.onChange}
-                      placeholder="0x1234..."
-                      value={field.value ?? ""}
-                    />
-                  </FormControl>
-                  <FormMessage />
-                </FormItem>
-              )}
-            />
-
-            <FormField
-              control={form.control}
-              name="toAddresses"
-              render={({ field }) => (
-                <FormItem className="flex flex-col">
-                  <div className="flex items-center justify-between text-xs">
-                    <FormLabel>To Address</FormLabel>
-                    <p className="text-muted-foreground">Enter a to address</p>
-                  </div>
-                  <FormControl>
-                    <div className="space-y-2">
-                      <Input
-                        onChange={field.onChange}
-                        placeholder="0x1234..."
-                        value={field.value || ""}
-                      />
-
-                      {/* ABI fetch status */}
-                      <div className="mt-2 flex items-center justify-between">
-                        {watchFilterType === "transaction" &&
-                          isFetchingTxAbi && (
-                            <div className="flex items-center">
-                              <Spinner className="mr-2 h-3 w-3" />
-                              <span className="text-xs">Fetching ABIs...</span>
-                            </div>
-                          )}
-                      </div>
-
-                      {/* ABI fetch results */}
-                      {(Object.keys(fetchedTxAbis).length > 0 ||
-                        Object.keys(txAbiErrors).length > 0) && (
-                        <div className="mt-2 space-y-2 text-xs">
-                          {Object.keys(fetchedTxAbis).length > 0 && (
-                            <div className="flex items-center gap-2">
-                              <Badge
-                                className="border-green-200 bg-green-50 text-green-700"
-                                variant="outline"
-                              >
-                                ✓ {Object.keys(fetchedTxAbis).length} ABI
-                                {Object.keys(fetchedTxAbis).length !== 1
-                                  ? "s"
-                                  : ""}{" "}
-                                fetched
-                              </Badge>
-                            </div>
-                          )}
-
-                          {Object.keys(txAbiErrors).length > 0 && (
-                            <div className="flex items-center gap-2">
-                              <Badge
-                                className="border-red-200 bg-red-50 text-red-700"
-                                variant="outline"
-                              >
-                                ⚠️ {Object.keys(txAbiErrors).length} error
-                                {Object.keys(txAbiErrors).length !== 1
-                                  ? "s"
-                                  : ""}
-                              </Badge>
-                            </div>
-                          )}
-                        </div>
-                      )}
-                    </div>
-                  </FormControl>
-                  <FormMessage />
-                </FormItem>
-              )}
-            />
-          </>
-        )}
-      </div>
-
-      {/* Advanced Options Section */}
-      <div className="space-y-3">
-        {/* Signature Hash Field - reused for both event and transaction types */}
-        <FormField
-          control={form.control}
-          name="sigHash"
-          render={({ field }) => (
-            <FormItem className="flex flex-col">
-              <div className="flex items-center justify-between text-xs">
-                <FormLabel>
-                  {watchFilterType === "event"
-                    ? "Event Signature (optional)"
-                    : "Function Signature (optional)"}
-                </FormLabel>
-                <p className="text-muted-foreground">
-                  {watchFilterType === "event"
-                    ? "Select an event to monitor"
-                    : "Select a function to monitor"}
-                </p>
-              </div>
-              <FormControl>
-                {watchFilterType === "event" &&
-                Object.keys(fetchedAbis).length > 0 &&
-                eventSignatures.length > 0 ? (
-                  <SignatureSelector
-                    className="block w-full max-w-90 overflow-hidden text-ellipsis"
-                    onChange={(val) => {
-                      field.onChange(val);
-                      // If custom signature, clear ABI field
-                      const known = eventSignatures.map((sig) => sig.signature);
-                      if (val && !known.includes(val)) {
-                        form.setValue("abi", "");
-                      }
-                    }}
-                    options={eventSignatures.map((sig) => ({
-                      abi: sig.abi,
-                      label: truncateMiddle(sig.name, 30, 15),
-                      value: sig.signature,
-                    }))}
-                    placeholder="Select or enter an event signature"
-                    setAbi={(abi) => form.setValue("sigHashAbi", abi)}
-                    value={field.value || ""}
-                  />
-                ) : watchFilterType === "transaction" &&
-                  Object.keys(fetchedTxAbis).length > 0 &&
-                  functionSignatures.length > 0 ? (
-                  <SignatureSelector
-                    onChange={(val) => {
-                      field.onChange(val);
-                      // If custom signature, clear ABI field
-                      const known = functionSignatures.map(
-                        (sig) => sig.signature,
-                      );
-                      if (val && !known.includes(val)) {
-                        form.setValue("abi", "");
-                      }
-                    }}
-                    options={functionSignatures.map((sig) => ({
-                      abi: sig.abi,
-                      label: truncateMiddle(sig.name, 30, 15),
-                      value: sig.signature,
-                    }))}
-                    placeholder="Select or enter a function signature"
-                    setAbi={(abi) => form.setValue("sigHashAbi", abi)}
-                    value={field.value || ""}
-                  />
-                ) : (
-                  <Input
-                    disabled={
-                      (watchFilterType === "event" && isFetchingEventAbi) ||
-                      (watchFilterType === "transaction" && isFetchingTxAbi)
-                    }
-                    onChange={field.onChange}
-                    placeholder={
-                      watchFilterType === "event"
-                        ? "Fetching event signatures..."
-                        : "Fetching function signatures..."
-                    }
-                    value={field.value}
-                  />
-                )}
-              </FormControl>
-              <FormMessage />
-            </FormItem>
-          )}
-        />
-
-        {/* ABI Field */}
-        <FormField
-          control={form.control}
-          name="sigHashAbi"
-          render={({ field }) => {
-            let showFetchedAbi = false;
-            if (!isCustomSignature) {
-              if (
-                (watchFilterType === "event" &&
-                  Object.keys(fetchedAbis).length > 0) ||
-                (watchFilterType === "transaction" &&
-                  Object.keys(fetchedTxAbis).length > 0)
-              ) {
-                showFetchedAbi = true;
-              }
-            }
-            return (
-              <FormItem className="flex flex-col">
-                <div className="flex items-center justify-between text-xs">
-                  <FormLabel>ABI (optional)</FormLabel>
-                  <p className="text-muted-foreground">
-                    {watchFilterType === "event"
-                      ? "Enter the ABI of the contract or event"
-                      : "Enter the ABI of the contract or function"}
-                  </p>
-                </div>
-                <FormControl>
-                  {!showFetchedAbi ? (
-                    <Textarea
-                      className="font-mono"
-                      onChange={field.onChange}
-                      placeholder={"[{...}]"}
-                      rows={2}
-                      value={field.value}
-                    />
-                  ) : (
-                    <div className="space-y-2 rounded-md border bg-primary/5 p-3">
-                      <div className="flex items-center">
-                        <Badge className="border-green-200 bg-green-100 text-green-800">
-                          ✓ ABI Automatically Fetched
-                        </Badge>
-                        <Button
-                          className="ml-auto h-7 text-xs"
-                          onClick={async () => {
-                            try {
-                              if (watchFilterType === "event") {
-                                await Promise.all(
-                                  selectedChainIds.flatMap((chainId) =>
-                                    contractAddresses
-                                      .split(/[,"\s]+/)
-                                      .map((a) => a.trim())
-                                      .filter(Boolean)
-                                      .map((address) =>
-                                        queryClient.resetQueries({
-                                          exact: true,
-                                          queryKey: [
-                                            "abis",
-                                            String(chainId),
-                                            address,
-                                            watchFilterType,
-                                          ],
-                                        }),
-                                      ),
-                                  ),
-                                );
-
-                                // Reset event-specific form values
-                                form.setValue("addresses", "");
-                                // Reset signature hash
-                                form.setValue("sigHash", "");
-                                form.setValue("sigHashAbi", "");
-                              } else if (watchFilterType === "transaction") {
-                                // Reset for all chainId/address pairs concurrently
-                                const resetPromises: Promise<void>[] = [];
-                                for (const chainId of selectedChainIds) {
-                                  for (const address of (
-                                    form.watch("toAddresses") || ""
-                                  )
-                                    .split(/[,"\s]+/)
-                                    .map((a) => a.trim())
-                                    .filter(Boolean)) {
-                                    resetPromises.push(
-                                      (async () => {
-                                        try {
-                                          await queryClient.resetQueries({
-                                            exact: true,
-                                            queryKey: [
-                                              "abis",
-                                              String(chainId),
-                                              address,
-                                              watchFilterType,
-                                            ],
-                                          });
-                                        } catch (err) {
-                                          console.error(
-                                            "Failed to reset query for tx ABI",
-                                            chainId,
-                                            address,
-                                            err,
-                                          );
-                                        }
-                                      })(),
-                                    );
-                                  }
-                                }
-                                await Promise.all(resetPromises);
-
-                                // Reset transaction-specific form values
-                                form.setValue("toAddresses", "");
-                                // Reset signature hash
-                                form.setValue("sigHash", "");
-                                form.setValue("sigHashAbi", "");
-                              }
-                            } catch (err) {
-                              console.error("Error during ABI reset:", err);
-                            }
-                          }}
-                          size="sm"
-                          type="button"
-                          variant="ghost"
-                        >
-                          Reset
-                        </Button>
-                      </div>
-                      <p className="text-muted-foreground text-xs">
-                        ABIs have been automatically fetched for the contracts
-                        you specified.
-                      </p>
-                    </div>
-                  )}
-                </FormControl>
-                <FormMessage />
-              </FormItem>
-            );
-          }}
-        />
-      </div>
-
-      <div className="flex justify-between pt-4">
-        <Button
-          disabled={isLoading}
-          onClick={goToPreviousStep}
-          type="button"
-          variant="outline"
-        >
-          Back
-        </Button>
-        <Button disabled={isLoading} onClick={goToNextStep} type="button">
-          Next
-        </Button>
-      </div>
-    </>
-  );
-}
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/webhooks/components/ReviewStep.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/webhooks/components/ReviewStep.tsx
deleted file mode 100644
index 1c36494b42d..00000000000
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/webhooks/components/ReviewStep.tsx
+++ /dev/null
@@ -1,246 +0,0 @@
-"use client";
-import { CheckIcon, PlayIcon, XIcon } from "lucide-react";
-import type { UseFormReturn } from "react-hook-form";
-import { Button } from "@/components/ui/button";
-import { Spinner } from "@/components/ui/Spinner/Spinner";
-import { truncateMiddle } from "../utils/abiUtils";
-import type { WebhookFormValues } from "../utils/webhookTypes";
-
-interface WebhookTestResult {
-  status: string;
-  timestamp?: number;
-  error?: string;
-  statusCode?: number;
-}
-
-interface ReviewStepProps {
-  form: UseFormReturn<WebhookFormValues>;
-  isTestingMap: Record<string, boolean>;
-  testResults: Record<string, WebhookTestResult>;
-  isRecentResult: (id: string) => boolean;
-  testWebhookEndpoint: (url: string, filterType: string) => Promise<boolean>;
-  goToPreviousStep: () => void;
-  isLoading: boolean;
-  handleCreateButtonClick: () => void;
-}
-
-// Helper to format addresses
-function formatAddresses(addresses: string | undefined, start = 6, end = 4) {
-  if (!addresses) return "None";
-  return addresses
-    .split(/[,\s]+/)
-    .map((addr) => truncateMiddle(addr.trim(), start, end))
-    .join(", ");
-}
-
-export default function ReviewStep({
-  form,
-  isTestingMap,
-  testResults,
-  isRecentResult,
-  testWebhookEndpoint,
-  goToPreviousStep,
-  isLoading,
-  handleCreateButtonClick,
-}: ReviewStepProps) {
-  // Determine if testing is in progress
-  const webhookUrl = form.watch("webhookUrl");
-  const filterType = form.watch("filterType");
-  const uniqueId = `${webhookUrl}-${filterType}`;
-  const isTesting = isTestingMap[uniqueId];
-  // Get test result if available
-  const testResult = testResults[uniqueId];
-  const isRecent = isRecentResult(uniqueId);
-
-  const handleTestWebhook = async () => {
-    if (webhookUrl && filterType) {
-      await testWebhookEndpoint(webhookUrl, filterType);
-    }
-  };
-
-  function renderTestButton() {
-    if (testResult?.status === "success" && isRecent) {
-      return (
-        <Button
-          className="gap-2 border-green-500 text-green-700"
-          disabled={isTesting}
-          onClick={handleTestWebhook}
-          size="sm"
-          type="button"
-          variant="outline"
-        >
-          <CheckIcon className="h-4 w-4" />
-          Test Successful
-        </Button>
-      );
-    }
-    if (testResult?.status === "error" && isRecent) {
-      return (
-        <Button
-          className="gap-2 border-red-500 text-red-700"
-          disabled={isTesting}
-          onClick={handleTestWebhook}
-          size="sm"
-          type="button"
-          variant="outline"
-        >
-          <XIcon className="h-4 w-4" />
-          Test Failed
-        </Button>
-      );
-    }
-    return (
-      <Button
-        className="gap-2"
-        disabled={isTesting}
-        onClick={handleTestWebhook}
-        size="sm"
-        type="button"
-        variant="outline"
-      >
-        {isTesting ? (
-          <>
-            <Spinner className="h-4 w-4" />
-            Testing...
-          </>
-        ) : (
-          <>
-            <PlayIcon className="h-4 w-4" />
-            Test Webhook
-          </>
-        )}
-      </Button>
-    );
-  }
-
-  return (
-    <>
-      <div className="mb-4">
-        <h2 className="font-medium text-lg">Step 3: Review</h2>
-        <p className="text-muted-foreground text-sm">
-          Review your webhook configuration before creating
-        </p>
-      </div>
-
-      {/* Review Details */}
-      <div className="rounded-md border p-4">
-        <ul className="space-y-2">
-          <li className="flex justify-between">
-            <span className="text-muted-foreground text-sm">Name:</span>
-            <span className="font-medium text-sm">{form.watch("name")}</span>
-          </li>
-          <li className="flex justify-between">
-            <span className="text-muted-foreground text-sm">Webhook URL:</span>
-            <span className="font-medium text-sm">
-              {truncateMiddle(form.watch("webhookUrl"), 12, 10)}
-            </span>
-          </li>
-
-          <li className="flex justify-between">
-            <span className="text-muted-foreground text-sm">Type:</span>
-            <span className="font-medium text-sm capitalize">
-              {form.watch("filterType")}
-            </span>
-          </li>
-
-          <li className="flex justify-between">
-            <span className="text-muted-foreground text-sm">Chain IDs:</span>
-            <span className="font-medium text-sm">
-              {(form.watch("chainIds") || []).length > 0
-                ? (form.watch("chainIds") || [])
-                    .map((id) => id.toString())
-                    .join(", ")
-                : "None"}
-            </span>
-          </li>
-          <li className="flex justify-between">
-            <span className="text-muted-foreground text-sm">
-              Contract Addresses:
-            </span>
-            <span className="font-medium text-sm">
-              {(() => {
-                const filterType = form.watch("filterType");
-                if (filterType === "event") {
-                  return formatAddresses(form.watch("addresses"));
-                } else if (filterType === "transaction") {
-                  return formatAddresses(form.watch("toAddresses"));
-                } else {
-                  return "None";
-                }
-              })()}
-            </span>
-          </li>
-
-          {form.watch("filterType") === "event" ? null : (
-            <>
-              <li className="flex justify-between">
-                <span className="text-muted-foreground text-sm">
-                  From Address:
-                </span>
-                <span className="font-medium text-sm">
-                  {formatAddresses(form.watch("fromAddresses"))}
-                </span>
-              </li>
-              <li className="flex justify-between">
-                <span className="text-muted-foreground text-sm">
-                  To Address:
-                </span>
-                <span className="font-medium text-sm">
-                  {formatAddresses(form.watch("toAddresses"))}
-                </span>
-              </li>
-            </>
-          )}
-
-          <li className="flex justify-between">
-            <span className="text-muted-foreground text-sm">
-              Signature Hash:
-            </span>
-            <span className="font-medium text-sm">
-              {(() => {
-                const sigHash = form.watch("sigHash");
-                return sigHash ? truncateMiddle(sigHash, 10, 6) : "None";
-              })()}
-            </span>
-          </li>
-
-          <li className="flex justify-between">
-            <span className="text-muted-foreground text-sm">ABIs:</span>
-            <span className="font-medium text-sm">
-              {form.watch("sigHashAbi") ? "Provided" : "None"}
-            </span>
-          </li>
-        </ul>
-      </div>
-
-      {/* Test Webhook Section */}
-      <div className="mt-6 rounded-md border bg-primary/5 p-4">
-        <h3 className="mb-2 font-medium text-sm">Test your webhook</h3>
-        <p className="mb-4 text-muted-foreground text-sm">
-          Before creating your webhook, you can test if your endpoint is
-          configured correctly to receive events.
-        </p>
-
-        {renderTestButton()}
-      </div>
-
-      <div className="flex justify-between pt-4">
-        <Button
-          disabled={isLoading}
-          onClick={goToPreviousStep}
-          type="button"
-          variant="outline"
-        >
-          Back
-        </Button>
-        <Button
-          disabled={isLoading}
-          onClick={handleCreateButtonClick}
-          type="submit"
-        >
-          {isLoading ? "Creating..." : "Create Webhook"}
-        </Button>
-      </div>
-    </>
-  );
-}
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/webhooks/components/WebhooksTable.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/webhooks/components/WebhooksTable.tsx
index a569aa88469..0a2b689c381 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/webhooks/components/WebhooksTable.tsx
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/webhooks/components/WebhooksTable.tsx
@@ -2,23 +2,22 @@
 
 import type { ColumnDef } from "@tanstack/react-table";
 import { format } from "date-fns";
-import { PlayIcon, TrashIcon } from "lucide-react";
+import { AlertTriangleIcon, TrashIcon } from "lucide-react";
+import Link from "next/link";
 import { useMemo, useState } from "react";
 import { toast } from "sonner";
-import type { ThirdwebClient } from "thirdweb";
 import {
   deleteWebhook,
   type WebhookFilters,
   type WebhookResponse,
 } from "@/api/insight/webhooks";
+import type { Project } from "@/api/projects";
 import { TWTable } from "@/components/blocks/TWTable";
 import { Badge } from "@/components/ui/badge";
 import { Button } from "@/components/ui/button";
 import { CopyTextButton } from "@/components/ui/CopyTextButton";
 import { Spinner } from "@/components/ui/Spinner/Spinner";
 import { useDashboardRouter } from "@/lib/DashboardRouter";
-import { useTestWebhook } from "../hooks/useTestWebhook";
-import { CreateContractWebhookButton } from "./CreateWebhookModal";
 import { RelativeTime } from "./RelativeTime";
 
 function getEventType(filters: WebhookFilters): string {
@@ -41,27 +40,24 @@ function maskWebhookSecret(secret: string): string {
 
 interface WebhooksTableProps {
   webhooks: WebhookResponse[];
-  projectClientId: string;
-  supportedChainIds: number[];
-  client: ThirdwebClient;
+  project: Project;
 }
 
 export function ContractsWebhooksTable({
   webhooks,
-  projectClientId,
-  client,
-  supportedChainIds,
+  project,
 }: WebhooksTableProps) {
   const [isDeleting, setIsDeleting] = useState<Record<string, boolean>>({});
-  const { testWebhookEndpoint, isTestingMap } = useTestWebhook(projectClientId);
   const router = useDashboardRouter();
 
-  const handleDeleteWebhook = async (webhookId: string) => {
+  const webhooksPath = `/team/${project.teamId}/${project.slug}/webhooks`;
+
+  const _handleDeleteWebhook = async (webhookId: string) => {
     if (isDeleting[webhookId]) return;
 
     try {
       setIsDeleting((prev) => ({ ...prev, [webhookId]: true }));
-      await deleteWebhook(webhookId, projectClientId);
+      await deleteWebhook(webhookId, project.publishableKey);
       toast.success("Webhook deleted successfully");
       router.refresh();
     } catch (error) {
@@ -77,41 +73,31 @@ export function ContractsWebhooksTable({
     }
   };
 
-  const handleTestWebhook = async (webhook: WebhookResponse) => {
-    const filterType = getEventType(webhook.filters);
-    if (filterType === "Unknown") {
-      toast.error("Cannot test webhook", {
-        description:
-          "This webhook does not have a valid event type (event or transaction).",
-      });
-      return;
-    }
-    await testWebhookEndpoint(
-      webhook.webhook_url,
-      filterType.toLowerCase() as "event" | "transaction",
-      webhook.id,
-    );
-  };
-
   const columns: ColumnDef<WebhookResponse>[] = [
     {
       accessorKey: "name",
-      cell: ({ row }) => (
-        <div className="flex items-center gap-2">
-          <span className="max-w-40 truncate" title={row.original.name}>
-            {row.original.name}
-          </span>
-        </div>
-      ),
+      cell: ({ row }) => {
+        const webhook = row.original;
+        return (
+          <div className="flex items-center gap-2">
+            <span
+              className="max-w-40 truncate text-muted-foreground"
+              title={webhook.name}
+            >
+              {webhook.name}
+            </span>
+          </div>
+        );
+      },
       header: "Name",
     },
     {
       accessorKey: "filters",
       cell: ({ getValue }) => {
         const filters = getValue() as WebhookFilters;
-        if (!filters) return <span>-</span>;
+        if (!filters) return <span className="text-muted-foreground">-</span>;
         const eventType = getEventType(filters);
-        return <span>{eventType}</span>;
+        return <span className="text-muted-foreground">{eventType}</span>;
       },
       header: "Event Type",
     },
@@ -121,7 +107,9 @@ export function ContractsWebhooksTable({
         const url = getValue() as string;
         return (
           <div className="flex items-center gap-2">
-            <span className="max-w-60 truncate">{url}</span>
+            <span className="max-w-60 truncate text-muted-foreground">
+              {url}
+            </span>
             <CopyTextButton
               className="flex h-6 w-6 items-center justify-center"
               copyIconPosition="right"
@@ -171,7 +159,7 @@ export function ContractsWebhooksTable({
         return (
           <div className="flex flex-col">
             <RelativeTime date={date} />
-            <span className="text-muted-foreground text-xs">
+            <span className="text-muted-foreground text-xs opacity-50">
               {formattedDate}
             </span>
           </div>
@@ -181,12 +169,10 @@ export function ContractsWebhooksTable({
     },
     {
       accessorKey: "suspended_at",
-      cell: ({ row }) => {
-        const webhook = row.original;
-        const isSuspended = Boolean(webhook.suspended_at);
+      cell: () => {
         return (
-          <Badge variant={isSuspended ? "destructive" : "default"}>
-            {isSuspended ? "Suspended" : "Active"}
+          <Badge variant="secondary" className="bg-gray-100 text-gray-600">
+            Deprecated
           </Badge>
         );
       },
@@ -199,25 +185,11 @@ export function ContractsWebhooksTable({
 
         return (
           <div className="flex items-center justify-end gap-2">
-            <Button
-              aria-label={`Test webhook ${webhook.name}`}
-              className="h-8 w-8"
-              disabled={isTestingMap[webhook.id] || isDeleting[webhook.id]}
-              onClick={() => handleTestWebhook(webhook)}
-              size="icon"
-              variant="outline"
-            >
-              {isTestingMap[webhook.id] ? (
-                <Spinner className="h-4 w-4" />
-              ) : (
-                <PlayIcon className="h-4 w-4" />
-              )}
-            </Button>
             <Button
               aria-label={`Delete webhook ${webhook.name}`}
               className="h-8 w-8 text-red-500 hover:border-red-700 hover:text-red-700"
               disabled={isDeleting[webhook.id]}
-              onClick={() => handleDeleteWebhook(webhook.id)}
+              onClick={() => _handleDeleteWebhook(webhook.id)}
               size="icon"
               variant="outline"
             >
@@ -250,20 +222,36 @@ export function ContractsWebhooksTable({
 
   return (
     <div className="w-full">
+      {/* Deprecation Notice */}
+      <div className="mb-4 rounded-lg border border-amber-200 bg-amber-50 p-4">
+        <div className="flex items-start gap-3">
+          <AlertTriangleIcon className="h-5 w-5 text-amber-600 mt-0.5" />
+          <div className="flex-1">
+            <h3 className="text-sm font-medium text-amber-800">
+              Legacy Webhooks (Deprecated)
+            </h3>
+            <p className="mt-1 text-sm text-amber-700">
+              Contract webhooks are deprecated, but will continue to work for
+              the time being. New unified webhooks are available in the{" "}
+              <Link
+                className="inline-flex items-center rounded-md bg-blue-50 px-2.5 py-0.5 text-xs font-medium text-blue-700 ring-1 ring-inset ring-blue-700/10 hover:bg-blue-100 transition-colors"
+                href={webhooksPath}
+              >
+                Webhooks
+              </Link>{" "}
+              section.
+            </p>
+          </div>
+        </div>
+      </div>
+
       <TWTable
         columns={columns}
         data={sortedWebhooks}
         isFetched={true}
         isPending={false}
-        title="Webhooks"
+        title="Legacy Webhooks"
       />
-      <div className="mt-4 flex justify-end">
-        <CreateContractWebhookButton
-          client={client}
-          projectClientId={projectClientId}
-          supportedChainIds={supportedChainIds}
-        />
-      </div>
     </div>
   );
 }
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/webhooks/contract-webhooks/contract-webhooks-page.tsx b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/webhooks/contract-webhooks/contract-webhooks-page.tsx
index b3fe91d55ae..f4a63e96caa 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/webhooks/contract-webhooks/contract-webhooks-page.tsx
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/webhooks/contract-webhooks/contract-webhooks-page.tsx
@@ -5,7 +5,6 @@ import {
 } from "@/api/insight/webhooks";
 import type { Project } from "@/api/projects";
 import { getClientThirdwebClient } from "@/constants/thirdweb-client.client";
-import { CreateContractWebhookButton } from "../components/CreateWebhookModal";
 import { ContractsWebhooksTable } from "../components/WebhooksTable";
 
 export async function ContractsWebhooksPageContent(props: {
@@ -14,7 +13,7 @@ export async function ContractsWebhooksPageContent(props: {
 }) {
   let webhooks: WebhookResponse[] = [];
   let errorMessage = "";
-  let supportedChainIds: number[] = [];
+  let _supportedChainIds: number[] = [];
 
   const projectClientId = props.project.publishableKey;
 
@@ -28,7 +27,7 @@ export async function ContractsWebhooksPageContent(props: {
 
     const supportedChainsRes = await getSupportedWebhookChains();
     if ("chains" in supportedChainsRes) {
-      supportedChainIds = supportedChainsRes.chains;
+      _supportedChainIds = supportedChainsRes.chains;
     } else {
       errorMessage = supportedChainsRes.error;
     }
@@ -37,7 +36,7 @@ export async function ContractsWebhooksPageContent(props: {
     console.error("Error loading project or webhooks", error);
   }
 
-  const client = getClientThirdwebClient({
+  const _client = getClientThirdwebClient({
     jwt: props.authToken,
     teamId: props.project.teamId,
   });
@@ -54,25 +53,12 @@ export async function ContractsWebhooksPageContent(props: {
           </div>
         </div>
       ) : webhooks.length > 0 ? (
-        <ContractsWebhooksTable
-          client={client}
-          projectClientId={projectClientId}
-          supportedChainIds={supportedChainIds}
-          webhooks={webhooks}
-        />
+        <ContractsWebhooksTable project={props.project} webhooks={webhooks} />
       ) : (
         <div className="flex flex-col items-center justify-center gap-4 rounded-lg border border-border p-12 text-center">
           <div>
             <h3 className="mb-1 font-medium text-lg">No webhooks found</h3>
-            <p className="text-muted-foreground">
-              Create a webhook to get started.
-            </p>
           </div>
-          <CreateContractWebhookButton
-            client={client}
-            projectClientId={projectClientId}
-            supportedChainIds={supportedChainIds}
-          />
         </div>
       )}
     </div>
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/webhooks/hooks/useTestWebhook.ts b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/webhooks/hooks/useTestWebhook.ts
deleted file mode 100644
index fe986358ad6..00000000000
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/webhooks/hooks/useTestWebhook.ts
+++ /dev/null
@@ -1,122 +0,0 @@
-import { useState } from "react";
-import { toast } from "sonner";
-import { testWebhook } from "@/api/insight/webhooks";
-
-type TestResult = {
-  status: "success" | "error";
-  timestamp: number;
-};
-
-export function useTestWebhook(clientId: string) {
-  const [isTestingMap, setIsTestingMap] = useState<Record<string, boolean>>({});
-  const [testResults, setTestResults] = useState<Record<string, TestResult>>(
-    {},
-  );
-
-  const testWebhookEndpoint = async (
-    webhookUrl: string,
-    type: "event" | "transaction",
-    id?: string,
-  ) => {
-    try {
-      new URL(webhookUrl);
-    } catch {
-      toast.error("Cannot test webhook", {
-        description:
-          "Please enter a valid URL starting with http:// or https://",
-      });
-      return false;
-    }
-
-    const uniqueId = id || `${webhookUrl}-${type}`;
-
-    if (isTestingMap[uniqueId]) return false;
-
-    try {
-      setIsTestingMap((prev) => ({ ...prev, [uniqueId]: true }));
-      setTestResults((prev) => {
-        const newResults = { ...prev };
-        delete newResults[uniqueId];
-        return newResults;
-      });
-
-      const result = await testWebhook(
-        { type, webhook_url: webhookUrl },
-        clientId,
-      );
-
-      if (result.success) {
-        setTestResults((prev) => ({
-          ...prev,
-          [uniqueId]: {
-            status: "success",
-            timestamp: Date.now(),
-          },
-        }));
-
-        toast.success("Test event sent successfully", {
-          description:
-            "Check your webhook endpoint to verify the delivery. The test event is signed with a secret key.",
-        });
-        return true;
-      } else {
-        setTestResults((prev) => ({
-          ...prev,
-          [uniqueId]: {
-            status: "error",
-            timestamp: Date.now(),
-          },
-        }));
-
-        toast.error("Failed to send test event", {
-          description:
-            "The server reported a failure in sending the test event.",
-        });
-        return false;
-      }
-    } catch (error) {
-      console.error("Error testing webhook:", error);
-
-      setTestResults((prev) => ({
-        ...prev,
-        [uniqueId]: {
-          status: "error",
-          timestamp: Date.now(),
-        },
-      }));
-
-      const errorMessage =
-        error instanceof Error ? error.message : "An unexpected error occurred";
-      const isFailedSendError = errorMessage.includes(
-        "Failed to send test event",
-      );
-
-      toast.error(
-        isFailedSendError ? "Unable to test webhook" : "Failed to test webhook",
-        {
-          description: isFailedSendError
-            ? "We couldn't send a test request to your webhook endpoint. This might be due to network issues or the endpoint being unavailable. Please verify your webhook URL and try again later."
-            : errorMessage,
-          duration: 10000,
-        },
-      );
-      return false;
-    } finally {
-      setIsTestingMap((prev) => ({ ...prev, [uniqueId]: false }));
-    }
-  };
-
-  const isRecentResult = (uniqueId: string) => {
-    const result = testResults[uniqueId];
-    if (!result) return false;
-
-    return Date.now() - result.timestamp < 5000;
-  };
-
-  return {
-    isRecentResult,
-    isTestingMap,
-    testResults,
-    testWebhookEndpoint,
-  };
-}
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/webhooks/utils/webhookPayloadUtils.ts b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/webhooks/utils/webhookPayloadUtils.ts
index ec322eb7805..0ebf3b4ad93 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/webhooks/utils/webhookPayloadUtils.ts
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/webhooks/utils/webhookPayloadUtils.ts
@@ -1,6 +1,3 @@
-import { keccak256, toFunctionSelector } from "thirdweb/utils";
-import type { WebhookFormValues } from "./webhookTypes";
-
 export function parseAddresses(addresses: string | undefined): string[] {
   if (!addresses) return [];
   return addresses
@@ -8,77 +5,3 @@ export function parseAddresses(addresses: string | undefined): string[] {
     .map((addr) => addr.trim())
     .filter(Boolean);
 }
-
-export interface WebhookPayload {
-  name: string;
-  filters: Record<
-    string,
-    {
-      chain_ids?: string[];
-      addresses?: string[];
-      from_addresses?: string[];
-      to_addresses?: string[];
-      signatures?: Array<{
-        sig_hash: string;
-        abi?: string;
-        params: Record<string, unknown>;
-      }>;
-    }
-  >;
-  webhook_url: string;
-}
-
-export function buildEventWebhookPayload(
-  data: WebhookFormValues,
-): WebhookPayload {
-  const eventSignatures = [];
-  if (data.sigHash) {
-    eventSignatures.push({
-      abi: data.sigHashAbi || data.abi,
-      params: {},
-      sig_hash: data.sigHash.startsWith("0x")
-        ? data.sigHash
-        : keccak256(new TextEncoder().encode(data.sigHash)),
-    });
-  }
-  return {
-    filters: {
-      "v1.events": {
-        addresses: parseAddresses(data.addresses),
-        chain_ids: data.chainIds?.map(String),
-        signatures: eventSignatures.length > 0 ? eventSignatures : undefined,
-      },
-    },
-    name: data.name ?? "",
-    webhook_url: data.webhookUrl,
-  };
-}
-
-export function buildTransactionWebhookPayload(
-  data: WebhookFormValues,
-): WebhookPayload {
-  const txSignatures = [];
-  if (data.sigHash) {
-    txSignatures.push({
-      abi: data.sigHashAbi || data.abi,
-      params: {},
-      sig_hash: data.sigHash.startsWith("0x")
-        ? data.sigHash
-        : toFunctionSelector(data.sigHash),
-    });
-  }
-  return {
-    filters: {
-      "v1.transactions": {
-        chain_ids: data.chainIds?.map(String),
-        from_addresses: parseAddresses(data.fromAddresses),
-        signatures: txSignatures.length > 0 ? txSignatures : undefined,
-        to_addresses: data.toAddresses
-          ? parseAddresses(data.toAddresses)
-          : undefined,
-      },
-    },
-    name: data.name ?? "",
-    webhook_url: data.webhookUrl,
-  };
-}
diff --git a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/webhooks/utils/webhookTypes.ts b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/webhooks/utils/webhookTypes.ts
index beac699f2a9..9e169065fde 100644
--- a/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/webhooks/utils/webhookTypes.ts
+++ b/apps/dashboard/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/webhooks/utils/webhookTypes.ts
@@ -149,11 +149,3 @@ export interface AbiData {
   functions?: string[];
   name?: string;
 }
-
-export type WebhookFormStep = "basicInfo" | "filterDetails" | "review";
-
-export const WebhookFormSteps = {
-  BasicInfo: "basicInfo" as WebhookFormStep,
-  FilterDetails: "filterDetails" as WebhookFormStep,
-  Review: "review" as WebhookFormStep,
-} as const;