Skip to content

fix: make contract and to addresses optional in webhook form #7294

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
Jun 9, 2025
Merged

fix: make contract and to addresses optional in webhook form #7294

Show file tree
Hide file tree
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
2 changes: 1 addition & 1 deletion ...app)/team/[team_slug]/[project_slug]/(sidebar)/webhooks/components/CreateWebhookModal.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ export function CreateWebhookModal({
isOpen,
thirdwebClient: client,
chainIds,
addresses,
addresses: addresses || "",
extractSignatures: extractEventSignatures,
type: "event",
});
Expand Down
8 changes: 2 additions & 6 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 @@ -191,9 +191,7 @@ export function FilterDetailsStep({
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>
<FormLabel>Contract Addresses</FormLabel>
<p className="text-muted-foreground">
Enter a contract address
</p>
Expand Down Expand Up @@ -281,9 +279,7 @@ export function FilterDetailsStep({
render={({ field }) => (
<FormItem className="flex flex-col">
<div className="flex items-center justify-between text-xs">
<FormLabel>
To Address <span className="text-red-500">*</span>
</FormLabel>
<FormLabel>To Address</FormLabel>
<p className="text-muted-foreground">Enter a to address</p>
</div>
<FormControl>
Expand Down
44 changes: 36 additions & 8 deletions ...rd/src/app/(app)/team/[team_slug]/[project_slug]/(sidebar)/webhooks/utils/webhookTypes.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,25 +36,53 @@ export const webhookFormSchema = z.object({
.min(1, { message: "Select at least one chain" }),
addresses: z
.string()
.min(1, { message: "Addresses is required" })
.refine((val) => val.split(/[\,\s]+/).every((a) => isAddress(a.trim())), {
message: "Enter a valid address",
}),
.optional()
.refine(
(val) => {
if (val === undefined || val.trim() === "") {
return true;
}
return val
.split(/[\,\s]+/)
.filter(Boolean)
.every((a) => isAddress(a.trim()));
},
{
message: "Enter valid addresses (comma-separated) or leave empty",
},
),
fromAddresses: z
.string()
.optional()
.refine(
(val) => !val || val.split(/[,\s]+/).every((a) => isAddress(a.trim())),
(val) => {
if (val === undefined || val.trim() === "") {
return true;
}
return val
.split(/[\,\s]+/)
.filter(Boolean)
.every((a) => isAddress(a.trim()));
},
{
message: "Enter a valid address",
message: "Enter valid addresses (comma-separated) or leave empty",
},
),
toAddresses: z
.string()
.optional()
.refine(
(val) => !val || val.split(/[,\s]+/).every((a) => isAddress(a.trim())),
(val) => {
if (val === undefined || val.trim() === "") {
return true;
}
return val
.split(/[\,\s]+/)
.filter(Boolean)
.every((a) => isAddress(a.trim()));
},
{
message: "Enter a valid address (comma-separated)",
message: "Enter valid addresses (comma-separated) or leave empty",
},
),
sigHash: z.string().optional(),
Expand Down
Loading