Skip to content

Replace Select with Popover in webhook signature selection UI #7219

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 30, 2025
Merged

Replace Select with Popover in webhook signature selection UI #7219

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
188 changes: 94 additions & 94 deletions ...(app)/team/[team_slug]/[project_slug]/(sidebar)/webhooks/components/FilterDetailsStep.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,15 +12,15 @@ import {
} from "@/components/ui/form";
import { Input } from "@/components/ui/input";
import {
Select,
SelectContent,
SelectItem,
SelectTrigger,
SelectValue,
} from "@/components/ui/select";
Popover,
PopoverContent,
PopoverTrigger,
} from "@/components/ui/popover";
import { Textarea } from "@/components/ui/textarea";
import { useThirdwebClient } from "@/constants/thirdweb.client";
import { cn } from "@/lib/utils";
import { useQueryClient } from "@tanstack/react-query";
import { useState } from "react";
import type { UseFormReturn } from "react-hook-form";

import { MultiNetworkSelector } from "@/components/blocks/NetworkSelectors";
Expand Down Expand Up @@ -48,6 +48,74 @@ interface FilterDetailsStepProps {
supportedChainIds: Array<number>;
}

interface SignatureDropdownProps {
signatures: Array<{ name: string; signature: string; abi?: string }>;
value: string;
onChange: (val: string) => void;
setAbi: (abi: string) => void;
buttonLabel: string;
secondaryTextFormatter: (sig: { name: string; signature: string }) => string;
disabled?: boolean;
}

function SignatureDropdown({
signatures,
value,
onChange,
setAbi,
buttonLabel,
secondaryTextFormatter,
disabled,
}: SignatureDropdownProps) {
const [open, setOpen] = useState(false);
return (
<Popover modal open={open} onOpenChange={setOpen}>
<PopoverTrigger asChild>
<button
type="button"
className={cn(
"h-10 w-full rounded-md border bg-background px-3 py-2 text-left text-sm focus:outline-none focus:ring-2 focus:ring-ring disabled:opacity-50",
!value && "text-muted-foreground",
)}
disabled={disabled}
>
{value
? signatures.find((sig) => sig.signature === value)?.name || ""
: buttonLabel}
</button>
</PopoverTrigger>
<PopoverContent
className="max-h-60 w-[--radix-popover-trigger-width] overflow-y-auto p-0"
align="start"
>
<ul className="divide-y divide-border">
{signatures.map((sig) => (
<li key={sig.signature}>
<button
type="button"
className={cn(
"w-full px-4 py-2 text-left text-sm hover:bg-accent focus:bg-accent",
value === sig.signature && "bg-accent",
)}
onClick={() => {
onChange(sig.signature);
setAbi(sig.abi || "");
setOpen(false);
}}
>
<div className="font-medium">{sig.name}</div>
<div className="text-muted-foreground text-xs">
{secondaryTextFormatter(sig)}
</div>
</button>
</li>
))}
</ul>
</PopoverContent>
</Popover>
);
}

export function FilterDetailsStep({
form,
eventSignatures,
Expand Down Expand Up @@ -305,97 +373,29 @@ export function FilterDetailsStep({
{watchFilterType === "event" &&
Object.keys(fetchedAbis).length > 0 &&
eventSignatures.length > 0 ? (
<Select
value={field.value}
onValueChange={(value) => {
field.onChange(value);
// Find the selected event
const selectedEvent = eventSignatures.find(
(sig) => sig.signature === value,
);
// Set the ABI for the event
form.setValue("sigHashAbi", selectedEvent?.abi || "");
}}
>
<SelectTrigger>
<SelectValue placeholder="Select an event signature">
{field.value
? eventSignatures.find(
(sig) => sig.signature === field.value,
)?.name || ""
: null}
</SelectValue>
</SelectTrigger>
<SelectContent className="max-h-60 overflow-y-auto">
{eventSignatures.map((event) => {
// Truncate the hash for display purposes
const truncatedHash = truncateMiddle(
event.signature,
6,
4,
);

return (
<SelectItem
key={event.signature}
value={event.signature}
title={event.name}
>
<div className="flex flex-col">
<span className="font-medium">{event.name}</span>
<span className="text-muted-foreground text-xs">
Signature: {truncatedHash}
</span>
</div>
</SelectItem>
);
})}
</SelectContent>
</Select>
<SignatureDropdown
signatures={eventSignatures}
value={field.value || ""}
onChange={field.onChange}
setAbi={(abi) => form.setValue("sigHashAbi", abi)}
buttonLabel="Select an event signature"
secondaryTextFormatter={(sig) =>
`Signature: ${truncateMiddle(sig.signature, 6, 4)}`
}
/>
) : watchFilterType === "transaction" &&
Object.keys(fetchedTxAbis).length > 0 &&
functionSignatures.length > 0 ? (
<Select
value={field.value}
onValueChange={(value) => {
field.onChange(value);
// Find the selected function
const selectedFunction = functionSignatures.find(
(sig) => sig.signature === value,
);
// Set the ABI for the function
form.setValue("sigHashAbi", selectedFunction?.abi || "");
}}
>
<SelectTrigger className="max-w-full">
<SelectValue placeholder="Select a function signature">
{field.value
? functionSignatures.find(
(sig) => sig.signature === field.value,
)?.name || ""
: null}
</SelectValue>
</SelectTrigger>
<SelectContent className="max-h-60 max-w-[600px] overflow-y-auto">
{functionSignatures.map((func) => (
<SelectItem
key={func.signature}
value={func.signature}
title={func.signature}
className="w-full overflow-x-auto"
>
<div className="flex w-full flex-col">
<span className="overflow-x-auto whitespace-nowrap pb-1 font-medium">
{func.name}
</span>
<span className="overflow-x-auto text-muted-foreground text-xs">
Selector: {func.signature}
</span>
</div>
</SelectItem>
))}
</SelectContent>
</Select>
<SignatureDropdown
signatures={functionSignatures}
value={field.value || ""}
onChange={field.onChange}
setAbi={(abi) => form.setValue("sigHashAbi", abi)}
buttonLabel="Select a function signature"
secondaryTextFormatter={(sig) =>
`Selector: ${sig.signature}`
}
/>
) : (
<Input
placeholder={
Expand Down
Loading