Skip to content

[Dashboard] Trim whitespace at the end of the input value for claim form #5860

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
Jan 3, 2025
Merged

[Dashboard] Trim whitespace at the end of the input value for claim form #5860

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
25 changes: 21 additions & 4 deletions ...src/app/(dashboard)/(chain)/[chain_id]/[contractAddress]/nfts/components/claim-button.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import { GemIcon } from "lucide-react";
import { useState } from "react";
import { useForm } from "react-hook-form";
import { toast } from "sonner";
import { type ThirdwebContract, ZERO_ADDRESS } from "thirdweb";
import { type ThirdwebContract, ZERO_ADDRESS, isAddress } from "thirdweb";
import { getApprovalForTransaction } from "thirdweb/extensions/erc20";
import { claimTo } from "thirdweb/extensions/erc721";
import { useActiveAccount, useSendAndConfirmTransaction } from "thirdweb/react";
Expand All @@ -40,7 +40,7 @@ export const NFTClaimButton: React.FC<NFTClaimButtonProps> = ({
}) => {
const trackEvent = useTrack();
const address = useActiveAccount()?.address;
const { register, handleSubmit, formState } = useForm({
const { register, handleSubmit, formState, setValue } = useForm({
defaultValues: { amount: "1", to: address },
});
const { errors } = formState;
Expand All @@ -67,7 +67,24 @@ export const NFTClaimButton: React.FC<NFTClaimButtonProps> = ({
<div className="flex w-full flex-col gap-6 md:flex-row">
<FormControl isRequired isInvalid={!!errors.to}>
<FormLabel>To Address</FormLabel>
<Input placeholder={ZERO_ADDRESS} {...register("to")} />
<Input
placeholder={ZERO_ADDRESS}
{...register("to", {
validate: (value) => {
if (!value) {
return "Enter a recipient address";
}
if (!isAddress(value.trim())) {
return "Invalid EVM address";
}
},
onChange: (e) => {
setValue("to", e.target.value.trim(), {
shouldValidate: true,
});
},
})}
/>
<FormHelperText>Enter the address to claim to.</FormHelperText>
<FormErrorMessage>{errors.to?.message}</FormErrorMessage>
</FormControl>
Expand Down Expand Up @@ -115,7 +132,7 @@ export const NFTClaimButton: React.FC<NFTClaimButtonProps> = ({

const transaction = claimTo({
contract,
to: d.to,
to: d.to.trim(),
Copy link
Member

@MananTank MananTank Jan 1, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

whitespace is ignored during validation, so it may or may not have whitespace - but its not removed when passing to claimTo.

Always save the trimmed value instead:

onChange: (e) => {
 form.setValue('to', e.target.value.trim(), { shouldValidate: true });
}

Copy link
Contributor Author

@kien-ngo kien-ngo Jan 3, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

updated thanks for the review

quantity: BigInt(d.amount),
from: account.address,
});
Expand Down
Loading