@trustless-work/blocks 1.0.0 → 1.0.1

package/templates/escrows/multi-release/withdraw-remaining-funds/form/WithdrawRemainingFunds.tsx

@@ -0,0 +1,153 @@
+import * as React from "react";
+import {
+  Form,
+  FormField,
+  FormItem,
+  FormLabel,
+  FormControl,
+  FormMessage,
+} from "__UI_BASE__/form";
+import { Input } from "__UI_BASE__/input";
+import { Button } from "__UI_BASE__/button";
+import { useWithdrawRemainingFunds } from "./useWithdrawRemainingFunds";
+import { useEscrowContext } from "@/components/tw-blocks/providers/EscrowProvider";
+import { Loader2, Trash2 } from "lucide-react";
+import { formatCurrency } from "../../../../helpers/format.helper";
+
+export const WithdrawRemainingFundsForm = () => {
+  const {
+    form,
+    handleSubmit,
+    isSubmitting,
+    distributions,
+    handleAddDistribution,
+    handleRemoveDistribution,
+    handleDistributionAddressChange,
+    handleDistributionAmountChange,
+    isAnyDistributionEmpty,
+    allowedAmount,
+    distributedSum,
+    isExactMatch,
+    difference,
+  } = useWithdrawRemainingFunds();
+  const { selectedEscrow } = useEscrowContext();
+
+  return (
+    <Form {...form}>
+      <form onSubmit={handleSubmit} className="flex flex-col space-y-6 w-full">
+        <FormLabel className="flex items-center my-4">
+          Distributions<span className="text-destructive ml-1">*</span>
+        </FormLabel>
+
+        {distributions.map((d, idx) => (
+          <div
+            key={`dist-${idx}`}
+            className="grid grid-cols-1 sm:grid-cols-2 lg:grid-cols-[1fr_minmax(140px,220px)_auto] gap-3 sm:gap-4 items-end mb-2"
+          >
+            <FormField
+              control={form.control}
+              name={`distributions.${idx}.address` as const}
+              render={() => (
+                <FormItem className="sm:col-span-2 lg:col-span-1">
+                  <FormLabel>Address</FormLabel>
+                  <FormControl>
+                    <Input
+                      type="text"
+                      placeholder="Receiver address"
+                      value={d.address}
+                      onChange={(e) =>
+                        handleDistributionAddressChange(idx, e.target.value)
+                      }
+                    />
+                  </FormControl>
+                  <FormMessage />
+                </FormItem>
+              )}
+            />
+
+            <FormField
+              control={form.control}
+              name={`distributions.${idx}.amount` as const}
+              render={() => (
+                <FormItem>
+                  <FormLabel>Amount</FormLabel>
+                  <FormControl>
+                    <Input
+                      type="text"
+                      inputMode="decimal"
+                      placeholder="0.00"
+                      value={(d.amount as string) ?? ""}
+                      onChange={(e) => handleDistributionAmountChange(idx, e)}
+                    />
+                  </FormControl>
+                  <FormMessage />
+                </FormItem>
+              )}
+            />
+
+            <Button
+              type="button"
+              onClick={() => handleRemoveDistribution(idx)}
+              className="justify-self-end self-end p-2 bg-transparent text-destructive rounded-md border-none shadow-none hover:bg-transparent hover:shadow-none hover:text-destructive focus:ring-0 active:ring-0"
+              disabled={distributions.length <= 2}
+            >
+              <Trash2 className="h-5 w-5" />
+            </Button>
+          </div>
+        ))}
+
+        <div className="flex justify-between items-center">
+          <Button
+            type="button"
+            variant="outline"
+            onClick={handleAddDistribution}
+            disabled={isAnyDistributionEmpty}
+            className="cursor-pointer"
+          >
+            Add Item
+          </Button>
+
+          <div className="flex items-center gap-4">
+            <div className="text-xs text-muted-foreground">
+              <p>
+                <span className="font-bold">Total Amount: </span>
+                {distributedSum.toFixed(2)} / {allowedAmount.toFixed(2)}
+              </p>
+              {!isExactMatch && (
+                <p className="text-destructive">
+                  <span className="font-bold">Difference: </span>
+                  {difference.toFixed(2)}
+                </p>
+              )}
+            </div>
+
+            <p className="text-xs text-muted-foreground">
+              <span className="font-bold">Total Balance: </span>
+              {formatCurrency(
+                selectedEscrow?.balance || 0,
+                selectedEscrow?.trustline.name || ""
+              )}
+            </p>
+          </div>
+        </div>
+
+        <div className="mt-4">
+          <Button
+            type="submit"
+            disabled={isSubmitting || isAnyDistributionEmpty || !isExactMatch}
+            className="cursor-pointer"
+          >
+            {isSubmitting ? (
+              <div className="flex items-center">
+                <Loader2 className="h-5 w-5 animate-spin" />
+                <span className="ml-2">Withdrawing...</span>
+              </div>
+            ) : (
+              "Withdraw"
+            )}
+          </Button>
+        </div>
+      </form>
+    </Form>
+  );
+};

package/templates/escrows/multi-release/withdraw-remaining-funds/shared/schema.ts

@@ -0,0 +1,81 @@
+import { z } from "zod";
+import { isValidWallet } from "../../../../wallet-kit/validators";
+
+export const getFormSchema = () => {
+  const amountSchema = z
+    .union([z.string(), z.number()])
+    .refine(
+      (val) => {
+        if (typeof val === "string") {
+          if (val === "" || val === "." || val.endsWith(".")) {
+            return true; // Allow partial input
+          }
+          const numVal = Number(val);
+          return !isNaN(numVal) && numVal >= 0;
+        }
+        return val >= 0;
+      },
+      { message: "Amount must be 0 or greater." }
+    )
+    .refine(
+      (val) => {
+        if (typeof val === "string") {
+          if (val === "" || val === "." || val.endsWith(".")) {
+            return true; // Allow partial input
+          }
+          const numVal = Number(val);
+          if (isNaN(numVal)) return false;
+          const decimalPlaces = (numVal.toString().split(".")[1] || "").length;
+          return decimalPlaces <= 2;
+        }
+        const decimalPlaces = (val.toString().split(".")[1] || "").length;
+        return decimalPlaces <= 2;
+      },
+      { message: "Amount can have a maximum of 2 decimal places." }
+    );
+
+  return z
+    .object({
+      distributions: z
+        .array(
+          z.object({
+            address: z
+              .string()
+              .min(1, { message: "Address is required." })
+              .refine((addr) => isValidWallet(addr), {
+                message: "Invalid Stellar address.",
+              }),
+            amount: amountSchema,
+          })
+        )
+        .min(2, { message: "At least two distributions are required." }),
+    })
+    .superRefine((data, ctx) => {
+      const seen = new Map<string, number>();
+      data.distributions.forEach((item, idx) => {
+        const key = (item.address || "").trim().toUpperCase();
+        if (!key) return;
+        if (seen.has(key)) {
+          const firstIdx = seen.get(key)!;
+          ctx.addIssue({
+            code: z.ZodIssueCode.custom,
+            path: ["distributions", idx, "address"],
+            message: "Duplicate address. Each recipient must be unique.",
+          });
+          ctx.addIssue({
+            code: z.ZodIssueCode.custom,
+            path: ["distributions", firstIdx, "address"],
+            message: "Duplicate address. Each recipient must be unique.",
+          });
+        } else {
+          seen.set(key, idx);
+        }
+      });
+    });
+};
+
+export const withdrawRemainingFundsSchema = getFormSchema();
+
+export type WithdrawRemainingFundsValues = z.infer<
+  typeof withdrawRemainingFundsSchema
+>;

package/templates/escrows/multi-release/withdraw-remaining-funds/shared/useWithdrawRemainingFunds.ts

@@ -0,0 +1,160 @@
+import * as React from "react";
+import { useForm } from "react-hook-form";
+import { zodResolver } from "@hookform/resolvers/zod";
+import {
+  withdrawRemainingFundsSchema,
+  type WithdrawRemainingFundsValues,
+} from "./schema";
+import { toast } from "sonner";
+import { WithdrawRemainingFundsPayload } from "@trustless-work/escrow";
+import { useEscrowContext } from "@/components/tw-blocks/providers/EscrowProvider";
+import { useEscrowsMutations } from "@/components/tw-blocks/tanstack/useEscrowsMutations";
+import {
+  ErrorResponse,
+  handleError,
+} from "@/components/tw-blocks/handle-errors/handle";
+import { useWalletContext } from "@/components/tw-blocks/wallet-kit/WalletProvider";
+
+type DistributionInput = { address: string; amount: string | number };
+
+export function useWithdrawRemainingFunds() {
+  const { withdrawRemainingFunds } = useEscrowsMutations();
+  const { selectedEscrow, updateEscrow } = useEscrowContext();
+  const { walletAddress } = useWalletContext();
+
+  const form = useForm<WithdrawRemainingFundsValues>({
+    resolver: zodResolver(withdrawRemainingFundsSchema),
+    defaultValues: {
+      distributions: [
+        { address: "", amount: "" },
+        { address: "", amount: "" },
+      ],
+    },
+    mode: "onChange",
+  });
+
+  const distributions = form.watch("distributions") as DistributionInput[];
+
+  const [isSubmitting, setIsSubmitting] = React.useState(false);
+
+  const allowedAmount = React.useMemo(() => {
+    return Number(selectedEscrow?.balance || 0);
+  }, [selectedEscrow]);
+
+  const distributedSum = React.useMemo(() => {
+    return (distributions || []).reduce((acc, d) => {
+      const n = Number(d?.amount ?? 0);
+      return acc + (isNaN(n) ? 0 : n);
+    }, 0);
+  }, [distributions]);
+
+  const isExactMatch = React.useMemo(() => {
+    return Number(allowedAmount) === Number(distributedSum);
+  }, [allowedAmount, distributedSum]);
+
+  const difference = React.useMemo(() => {
+    return Math.abs(Number(allowedAmount) - Number(distributedSum));
+  }, [allowedAmount, distributedSum]);
+
+  const handleDistributionAddressChange = (index: number, value: string) => {
+    const updated = [...distributions];
+    updated[index] = { ...updated[index], address: value };
+    form.setValue("distributions", updated);
+  };
+
+  const handleDistributionAmountChange = (
+    index: number,
+    e: React.ChangeEvent<HTMLInputElement>
+  ) => {
+    let rawValue = e.target.value;
+    rawValue = rawValue.replace(/[^0-9.]/g, "");
+    if (rawValue.split(".").length > 2) {
+      rawValue = rawValue.slice(0, -1);
+    }
+    if (rawValue.includes(".")) {
+      const parts = rawValue.split(".");
+      if (parts[1] && parts[1].length > 2) {
+        rawValue = parts[0] + "." + parts[1].slice(0, 2);
+      }
+    }
+    const updated = [...distributions];
+    updated[index] = { ...updated[index], amount: rawValue };
+    form.setValue("distributions", updated);
+  };
+
+  const handleAddDistribution = () => {
+    const updated = [...distributions, { address: "", amount: "" }];
+    form.setValue("distributions", updated);
+  };
+
+  const handleRemoveDistribution = (index: number) => {
+    if (distributions.length <= 2) return;
+    const updated = distributions.filter((_, i) => i !== index);
+    form.setValue("distributions", updated);
+  };
+
+  const isAnyDistributionEmpty = React.useMemo(() => {
+    if (!distributions.length) return true;
+    const last = distributions[distributions.length - 1];
+    return (last.address || "").trim() === "" || (last.amount ?? "") === "";
+  }, [distributions]);
+
+  const handleSubmit = form.handleSubmit(async (payload) => {
+    try {
+      setIsSubmitting(true);
+
+      if (!isExactMatch) {
+        toast.error("The total distributions must equal the remaining amount");
+        return;
+      }
+
+      const finalPayload: WithdrawRemainingFundsPayload = {
+        contractId: selectedEscrow?.contractId || "",
+        disputeResolver: walletAddress || "",
+        distributions: payload.distributions.map((d) => ({
+          address: d.address,
+          amount: Number(d.amount || 0),
+        })) as [{ address: string; amount: number }],
+      };
+
+      await withdrawRemainingFunds.mutateAsync({
+        payload: finalPayload,
+        type: "multi-release",
+        address: walletAddress || "",
+      });
+
+      toast.success("Withdraw successful");
+
+      const sumDistributed = payload.distributions.reduce((acc, d) => {
+        const n = Number(d.amount || 0);
+        return acc + (isNaN(n) ? 0 : n);
+      }, 0);
+
+      updateEscrow({
+        ...selectedEscrow,
+        balance: (selectedEscrow?.balance || 0) - sumDistributed || 0,
+      });
+    } catch (error) {
+      toast.error(handleError(error as ErrorResponse).message);
+    } finally {
+      setIsSubmitting(false);
+      form.reset();
+    }
+  });
+
+  return {
+    form,
+    handleSubmit,
+    isSubmitting,
+    distributions,
+    handleAddDistribution,
+    handleRemoveDistribution,
+    handleDistributionAddressChange,
+    handleDistributionAmountChange,
+    isAnyDistributionEmpty,
+    allowedAmount,
+    distributedSum,
+    isExactMatch,
+    difference,
+  };
+}

package/templates/escrows/single-multi-release/approve-milestone/button/ApproveMilestone.tsx

@@ -40,7 +40,6 @@ export const ApproveMilestoneButton = ({
         contractId: selectedEscrow?.contractId || "",
         milestoneIndex: String(milestoneIndex),
         approver: walletAddress || "",
-        newFlag: true,
       };
 
       /**

package/templates/escrows/single-multi-release/approve-milestone/shared/useApproveMilestone.ts

@@ -38,7 +38,6 @@ export function useApproveMilestone() {
         contractId: selectedEscrow?.contractId || "",
         milestoneIndex: payload.milestoneIndex,
         approver: walletAddress || "",
-        newFlag: true,
       };
 
       await approveMilestone.mutateAsync({

package/templates/escrows/single-release/initialize-escrow/shared/schema.ts

@@ -8,7 +8,6 @@ export const useInitializeEscrowSchema = () => {
         address: z.string().min(1, {
           message: "Trustline address is required.",
         }),
-        decimals: z.number().default(10000000),
       }),
       roles: z.object({
         approver: z

package/templates/escrows/single-release/initialize-escrow/shared/useInitializeEscrow.ts

@@ -38,7 +38,6 @@ export function useInitializeEscrow() {
       receiverMemo: "",
       trustline: {
         address: "",
-        decimals: 10000000,
       },
       roles: {
         approver: "",
@@ -82,7 +81,6 @@ export function useInitializeEscrow() {
       receiverMemo: "123",
       trustline: {
         address: usdc?.value || "",
-        decimals: 10000000,
       },
       roles: {
         approver: walletAddress || "",

package/templates/escrows/single-release/resolve-dispute/button/ResolveDispute.tsx

@@ -11,14 +11,14 @@ import {
 import { useEscrowContext } from "@/components/tw-blocks/providers/EscrowProvider";
 import { Loader2 } from "lucide-react";
 
+type Distribution = { address: string; amount: number };
+
 type ResolveDisputeButtonProps = {
-  approverFunds: number;
-  receiverFunds: number;
+  distributions: Distribution[];
 };
 
 export const ResolveDisputeButton = ({
-  approverFunds,
-  receiverFunds,
+  distributions,
 }: ResolveDisputeButtonProps) => {
   const { resolveDispute } = useEscrowsMutations();
   const { selectedEscrow, updateEscrow } = useEscrowContext();
@@ -27,42 +27,22 @@ export const ResolveDisputeButton = ({
 
   async function handleClick() {
     try {
-      if (
-        approverFunds == null ||
-        Number.isNaN(approverFunds) ||
-        receiverFunds == null ||
-        Number.isNaN(receiverFunds)
-      ) {
-        toast.error("Both amounts are required");
-        return;
-      }
-
-      if (approverFunds < 0 || receiverFunds < 0) {
-        toast.error("Amounts must be >= 0");
+      const hasInvalid = distributions.some(
+        (d) => !d.address || Number.isNaN(d.amount) || d.amount < 0
+      );
+      if (hasInvalid) {
+        toast.error("Invalid distributions");
         return;
       }
 
       setIsSubmitting(true);
 
-      /**
-       * Create the payload for the resolve dispute mutation
-       *
-       * @returns The payload for the resolve dispute mutation
-       */
       const payload: SingleReleaseResolveDisputePayload = {
         contractId: selectedEscrow?.contractId || "",
         disputeResolver: walletAddress || "",
-        approverFunds: Number(approverFunds),
-        receiverFunds: Number(receiverFunds),
+        distributions: distributions as [Distribution],
       };
 
-      /**
-       * Call the resolve dispute mutation
-       *
-       * @param payload - The payload for the resolve dispute mutation
-       * @param type - The type of the escrow
-       * @param address - The address of the escrow
-       */
       await resolveDispute.mutateAsync({
         payload,
         type: "single-release",
@@ -70,6 +50,10 @@ export const ResolveDisputeButton = ({
       });
 
       toast.success("Dispute resolved successfully");
+      const sumDistributed = distributions.reduce(
+        (acc, d) => acc + Number(d.amount || 0),
+        0
+      );
       updateEscrow({
         ...selectedEscrow,
         flags: {
@@ -77,7 +61,7 @@ export const ResolveDisputeButton = ({
           disputed: false,
           resolved: true,
         },
-        balance: selectedEscrow?.balance || 0,
+        balance: (selectedEscrow?.balance || 0) - sumDistributed || 0,
       });
     } catch (error) {
       toast.error(handleError(error as ErrorResponse).message);