feat(bounty): add FCFS single-claim flow with claim/approve UI and cl… #161
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||||||||||||||||||||||||||||||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
|
|
@@ -65,6 +65,11 @@ const statusConfig: Record< | |||||||||||||||||||||||||||||||||||||||||
| label: "Under Review", | ||||||||||||||||||||||||||||||||||||||||||
| dotColor: "bg-amber-500", | ||||||||||||||||||||||||||||||||||||||||||
| }, | ||||||||||||||||||||||||||||||||||||||||||
| in_review: { | ||||||||||||||||||||||||||||||||||||||||||
| variant: "secondary", | ||||||||||||||||||||||||||||||||||||||||||
| label: "In Review", | ||||||||||||||||||||||||||||||||||||||||||
| dotColor: "bg-amber-500", | ||||||||||||||||||||||||||||||||||||||||||
| }, | ||||||||||||||||||||||||||||||||||||||||||
| disputed: { | ||||||||||||||||||||||||||||||||||||||||||
| variant: "destructive", | ||||||||||||||||||||||||||||||||||||||||||
| label: "Disputed", | ||||||||||||||||||||||||||||||||||||||||||
|
|
@@ -77,7 +82,13 @@ export function BountyCard({ | |||||||||||||||||||||||||||||||||||||||||
| onClick, | ||||||||||||||||||||||||||||||||||||||||||
| variant = "grid", | ||||||||||||||||||||||||||||||||||||||||||
| }: BountyCardProps) { | ||||||||||||||||||||||||||||||||||||||||||
| const normalizedStatus = bounty.status | ||||||||||||||||||||||||||||||||||||||||||
| .toUpperCase() | ||||||||||||||||||||||||||||||||||||||||||
| .replace(/-/g, "_") as string; | ||||||||||||||||||||||||||||||||||||||||||
| const status = | ||||||||||||||||||||||||||||||||||||||||||
| statusConfig[normalizedStatus.toLowerCase()] ?? statusConfig.open; | ||||||||||||||||||||||||||||||||||||||||||
|
Comment on lines
+88
to
+89
There was a problem hiding this comment. Map
Suggested fix const statusConfig: Record<
string,
{
variant: "default" | "secondary" | "outline" | "destructive";
label: string;
dotColor: string;
}
> = {
+ in_review: {
+ variant: "secondary",
+ label: "In Review",
+ dotColor: "bg-amber-500",
+ },
open: {
variant: "default",
label: "Open",
dotColor: "bg-emerald-500",
},📝 Committable suggestion
Suggested change
🤖 Prompt for AI Agents |
||||||||||||||||||||||||||||||||||||||||||
| const isFcfsClaimed = | ||||||||||||||||||||||||||||||||||||||||||
| bounty.type === "FIXED_PRICE" && normalizedStatus === "IN_PROGRESS"; | ||||||||||||||||||||||||||||||||||||||||||
| const timeLeft = bounty.updatedAt | ||||||||||||||||||||||||||||||||||||||||||
| ? formatDistanceToNow(new Date(bounty.updatedAt), { addSuffix: true }) | ||||||||||||||||||||||||||||||||||||||||||
| : "N/A"; | ||||||||||||||||||||||||||||||||||||||||||
|
|
@@ -112,7 +123,7 @@ export function BountyCard({ | |||||||||||||||||||||||||||||||||||||||||
| <div className="flex items-center gap-2"> | ||||||||||||||||||||||||||||||||||||||||||
| <div className={cn("w-2 h-2 rounded-full", status.dotColor)} /> | ||||||||||||||||||||||||||||||||||||||||||
| <Badge variant={status.variant} className="text-xs font-medium"> | ||||||||||||||||||||||||||||||||||||||||||
| {isFcfsClaimed ? "Claimed" : status.label} | ||||||||||||||||||||||||||||||||||||||||||
| </Badge> | ||||||||||||||||||||||||||||||||||||||||||
| </div> | ||||||||||||||||||||||||||||||||||||||||||
|
|
||||||||||||||||||||||||||||||||||||||||||
|
|
||||||||||||||||||||||||||||||||||||||||||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,136 @@ | ||
| "use client"; | ||
|
|
||
| import { useState } from "react"; | ||
| import Link from "next/link"; | ||
| import { Loader2 } from "lucide-react"; | ||
| import { toast } from "sonner"; | ||
| import { authClient } from "@/lib/auth-client"; | ||
| import { Button } from "@/components/ui/button"; | ||
| import { Input } from "@/components/ui/input"; | ||
| import { Label } from "@/components/ui/label"; | ||
| import { useApproveFcfs } from "@/hooks/use-claim-bounty"; | ||
|
|
||
| type FcfsApprovalBounty = { | ||
| id: string; | ||
| type: string; | ||
| status: string; | ||
| createdBy: string; | ||
| submissions?: Array<{ | ||
| id: string; | ||
| githubPullRequestUrl?: string | null; | ||
| submittedBy?: string; | ||
| submittedByUser?: { name?: string | null } | null; | ||
| }> | null; | ||
| }; | ||
|
|
||
| export function FcfsApprovalPanel({ bounty }: { bounty: FcfsApprovalBounty }) { | ||
| const { data: session } = authClient.useSession(); | ||
| const approveMutation = useApproveFcfs(); | ||
| const [points, setPoints] = useState(10); | ||
|
|
||
| const currentUserId = (session?.user as { id?: string } | undefined)?.id; | ||
| const walletAddress = | ||
| (session?.user as { walletAddress?: string; address?: string } | undefined) | ||
| ?.walletAddress || | ||
| (session?.user as { walletAddress?: string; address?: string } | undefined) | ||
| ?.address || | ||
| null; | ||
|
|
||
| const isCreator = Boolean( | ||
| currentUserId && currentUserId === bounty.createdBy, | ||
| ); | ||
| const isFcfs = bounty.type === "FIXED_PRICE"; | ||
| const isReviewState = | ||
| bounty.status === "IN_REVIEW" || bounty.status === "UNDER_REVIEW"; | ||
|
|
||
| if (!isFcfs || !isCreator || !isReviewState) return null; | ||
|
|
||
| const targetSubmission = bounty.submissions?.[0]; | ||
|
|
||
| const handleApprove = async () => { | ||
| if (!walletAddress) { | ||
| toast.error("Connect your wallet to approve this FCFS bounty."); | ||
| return; | ||
| } | ||
| if (!Number.isFinite(points) || points < 0) { | ||
| toast.error("Points must be a valid non-negative number."); | ||
|
Comment on lines
+55
to
+56
There was a problem hiding this comment. Enforce integer points to avoid unintended approvals. Line 55-Line 56 allows decimal values because only finite/non-negative is checked, and Line 109-Line 115 parses raw numeric input directly. If points are discrete reputation units, fractional values should be blocked at input + validation layers. Suggested fix- if (!Number.isFinite(points) || points < 0) {
+ if (!Number.isFinite(points) || points < 0 || !Number.isInteger(points)) {
toast.error("Points must be a valid non-negative number.");
return;
}
@@
<Input
id="fcfs-approval-points"
type="number"
min={0}
+ step={1}
value={points}
onChange={(e) => setPoints(Number(e.target.value))}
/>Also applies to: 109-115 🤖 Prompt for AI Agents |
||
| return; | ||
| } | ||
| try { | ||
| await approveMutation.mutateAsync({ | ||
| bountyId: bounty.id, | ||
| creatorAddress: walletAddress, | ||
| points, | ||
| }); | ||
| toast.success("Approved and released payment."); | ||
| } catch (error) { | ||
| toast.error(error instanceof Error ? error.message : "Approval failed."); | ||
| } | ||
| }; | ||
|
|
||
| return ( | ||
| <div className="p-5 rounded-xl border border-gray-800 bg-background-card space-y-4"> | ||
| <h3 className="text-sm font-semibold text-gray-200"> | ||
| FCFS Approval & Release | ||
| </h3> | ||
|
|
||
| {targetSubmission ? ( | ||
| <div className="rounded-lg border border-gray-700 bg-gray-900/40 p-3 text-xs space-y-1"> | ||
| <p className="text-gray-300"> | ||
| Contributor:{" "} | ||
| {targetSubmission.submittedByUser?.name || | ||
| targetSubmission.submittedBy} | ||
| </p> | ||
| {targetSubmission.githubPullRequestUrl && | ||
| targetSubmission.githubPullRequestUrl.startsWith("https://") ? ( | ||
| <Link | ||
| href={targetSubmission.githubPullRequestUrl} | ||
| target="_blank" | ||
| rel="noopener noreferrer" | ||
| className="text-primary hover:underline break-all" | ||
| > | ||
| {targetSubmission.githubPullRequestUrl} | ||
| </Link> | ||
| ) : targetSubmission.githubPullRequestUrl ? ( | ||
| <span className="text-xs text-gray-400 break-all"> | ||
| {targetSubmission.githubPullRequestUrl} | ||
| </span> | ||
| ) : null} | ||
| </div> | ||
| ) : ( | ||
| <p className="text-xs text-gray-400"> | ||
| No submission metadata is available yet. You can still approve using | ||
| on-chain state. | ||
| </p> | ||
| )} | ||
|
|
||
| <div className="space-y-2"> | ||
| <Label htmlFor="fcfs-approval-points">Reputation points</Label> | ||
| <Input | ||
| id="fcfs-approval-points" | ||
| type="number" | ||
| min={0} | ||
| value={points} | ||
| onChange={(e) => setPoints(Number(e.target.value))} | ||
| /> | ||
| </div> | ||
|
|
||
| {!walletAddress && ( | ||
| <p className="text-sm text-amber-400 text-center py-2"> | ||
| Connect your wallet to approve this bounty. | ||
| </p> | ||
| )} | ||
|
|
||
| <Button | ||
| className="w-full" | ||
| onClick={() => void handleApprove()} | ||
| disabled={approveMutation.isPending || !walletAddress} | ||
| > | ||
| {approveMutation.isPending && ( | ||
| <Loader2 className="mr-2 size-4 animate-spin" /> | ||
| )} | ||
| Approve & Release Payment | ||
| </Button> | ||
| </div> | ||
| ); | ||
| } | ||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Add
aria-labelto the icon-only cancel button.The cancel button only contains an icon with no accessible name. Screen reader users cannot determine its purpose.
Proposed fix
<Button variant="outline" size="lg" className="h-11 border-red-500/30 text-red-400 hover:bg-red-500/10 shrink-0" onClick={() => setCancelDialogOpen(true)} + aria-label="Cancel bounty" > <XCircle className="size-4" /> </Button>📝 Committable suggestion
🤖 Prompt for AI Agents