@trustless-work/blocks 1.0.6 → 1.0.8

package/templates/escrows/single-release/update-escrow/form/UpdateEscrow.tsx

@@ -19,7 +19,7 @@ import {
 } from "__UI_BASE__/select";
 import { Textarea } from "__UI_BASE__/textarea";
 import { useUpdateEscrow } from "./useUpdateEscrow";
-import { Trash2, DollarSign, Percent, Loader2 } from "lucide-react";
+import { Trash2, DollarSign, Percent, Loader2, Lock } from "lucide-react";
 import Link from "next/link";
 import { trustlineOptions } from "@/components/tw-blocks/wallet-kit/trustlines";
 
@@ -34,6 +34,8 @@ export const UpdateEscrowForm = () => {
     handleRemoveMilestone,
     handleAmountChange,
     handlePlatformFeeChange,
+    isEscrowLocked,
+    initialMilestonesCount,
   } = useUpdateEscrow();
 
   return (
@@ -52,6 +54,22 @@ export const UpdateEscrowForm = () => {
             <p className="text-muted-foreground mt-1">
               Update escrow details and milestones
             </p>
+
+            {isEscrowLocked && (
+              <div className="flex flex-col gap-2 text-sm bg-yellow-50 dark:bg-yellow-900/20 p-2 rounded-md border border-yellow-200 dark:border-yellow-800 mt-3 px-4">
+                <div className="flex items-center gap-2">
+                  <Lock className="w-4 h-4 text-yellow-600 dark:text-yellow-500 font-medium" />
+                  <span className="text-yellow-600 dark:text-yellow-500 font-medium">
+                    Escrow is locked
+                  </span>
+                </div>
+
+                <p className="text-muted-foreground font-medium">
+                  When the escrow has balance, it cannot be updated in all
+                  fields, just adding new milestones is allowed.
+                </p>
+              </div>
+            )}
           </Link>
         </Card>
         <div className="grid grid-cols-1 lg:grid-cols-3 gap-4">
@@ -67,6 +85,7 @@ export const UpdateEscrowForm = () => {
                   <Input
                     placeholder="Escrow title"
                     {...field}
+                    disabled={isEscrowLocked}
                     onChange={(e) => {
                       field.onChange(e);
                     }}
@@ -89,6 +108,7 @@ export const UpdateEscrowForm = () => {
                   <Input
                     placeholder="Enter identifier"
                     {...field}
+                    disabled={isEscrowLocked}
                     onChange={(e) => {
                       field.onChange(e);
                     }}
@@ -110,6 +130,7 @@ export const UpdateEscrowForm = () => {
                 <FormControl>
                   <Select
                     value={field.value}
+                    disabled={isEscrowLocked}
                     onValueChange={(e) => {
                       field.onChange(e);
                     }}
@@ -153,6 +174,7 @@ export const UpdateEscrowForm = () => {
                   <Input
                     placeholder="Enter approver address"
                     {...field}
+                    disabled={isEscrowLocked}
                     onChange={(e) => {
                       field.onChange(e);
                     }}
@@ -179,6 +201,7 @@ export const UpdateEscrowForm = () => {
                   <Input
                     placeholder="Enter service provider address"
                     {...field}
+                    disabled={isEscrowLocked}
                     onChange={(e) => {
                       field.onChange(e);
                     }}
@@ -207,6 +230,7 @@ export const UpdateEscrowForm = () => {
                   <Input
                     placeholder="Enter release signer address"
                     {...field}
+                    disabled={isEscrowLocked}
                     onChange={(e) => {
                       field.onChange(e);
                     }}
@@ -233,6 +257,7 @@ export const UpdateEscrowForm = () => {
                   <Input
                     placeholder="Enter dispute resolver address"
                     {...field}
+                    disabled={isEscrowLocked}
                     onChange={(e) => {
                       field.onChange(e);
                     }}
@@ -252,7 +277,7 @@ export const UpdateEscrowForm = () => {
               <FormItem>
                 <FormLabel className="flex items-center justify-between">
                   <span className="flex items-center">
-                    Platform Address
+                    Platform
                     <span className="text-destructive ml-1">*</span>
                   </span>
                 </FormLabel>
@@ -285,6 +310,7 @@ export const UpdateEscrowForm = () => {
                   <Input
                     placeholder="Enter receiver address"
                     {...field}
+                    disabled={isEscrowLocked}
                     onChange={(e) => {
                       field.onChange(e);
                     }}
@@ -296,7 +322,7 @@ export const UpdateEscrowForm = () => {
           />
         </div>
 
-        <div className="grid grid-cols-1 lg:grid-cols-3 gap-4">
+        <div className="grid grid-cols-1 md:grid-cols-2 gap-4">
           <FormField
             control={form.control}
             name="platformFee"
@@ -316,6 +342,7 @@ export const UpdateEscrowForm = () => {
                       className="pl-10"
                       value={form.watch("platformFee")?.toString() || ""}
                       onChange={handlePlatformFeeChange}
+                      disabled={isEscrowLocked}
                     />
                   </div>
                 </FormControl>
@@ -343,6 +370,7 @@ export const UpdateEscrowForm = () => {
                       className="pl-10"
                       value={form.watch("amount")?.toString() || ""}
                       onChange={handleAmountChange}
+                      disabled={isEscrowLocked}
                     />
                   </div>
                 </FormControl>
@@ -350,29 +378,6 @@ export const UpdateEscrowForm = () => {
               </FormItem>
             )}
           />
-
-          <FormField
-            control={form.control}
-            name="receiverMemo"
-            render={({ field }) => (
-              <FormItem>
-                <FormLabel className="flex items-center">
-                  Receiver Memo (opcional)
-                </FormLabel>
-                <FormControl>
-                  <Input
-                    type="text"
-                    placeholder="Enter the escrow receiver Memo"
-                    {...field}
-                    onChange={(e) => {
-                      field.onChange(e);
-                    }}
-                  />
-                </FormControl>
-                <FormMessage />
-              </FormItem>
-            )}
-          />
         </div>
 
         <FormField
@@ -387,6 +392,7 @@ export const UpdateEscrowForm = () => {
                 <Textarea
                   placeholder="Escrow description"
                   {...field}
+                  disabled={isEscrowLocked}
                   onChange={(e) => {
                     field.onChange(e);
                   }}
@@ -407,6 +413,7 @@ export const UpdateEscrowForm = () => {
                 <Input
                   placeholder="Milestone Description"
                   value={milestone.description}
+                  disabled={isEscrowLocked && index < initialMilestonesCount}
                   className="w-full sm:flex-1"
                   onChange={(e) => {
                     const updatedMilestones = [...milestones];
@@ -418,7 +425,11 @@ export const UpdateEscrowForm = () => {
                 <Button
                   onClick={() => handleRemoveMilestone(index)}
                   className="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 self-start sm:self-center cursor-pointer"
-                  disabled={milestones.length === 1}
+                  type="button"
+                  disabled={
+                    (isEscrowLocked && index < initialMilestonesCount) ||
+                    milestones.length === 1
+                  }
                 >
                   <Trash2 className="h-5 w-5" />
                 </Button>

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

@@ -79,16 +79,6 @@ export const useUpdateEscrowSchema = () => {
           },
           { message: "Platform fee can have a maximum of 2 decimal places." }
         ),
-      receiverMemo: z
-        .string()
-        .optional()
-        .refine((val) => !val || val.length >= 1, {
-          message: "Receiver Memo must be at least 1.",
-        })
-        .refine((val) => !val || /^[1-9][0-9]*$/.test(val), {
-          message:
-            "Receiver Memo must be a whole number greater than 0 (no decimals).",
-        }),
     });
   };
 

package/templates/escrows/single-release/update-escrow/shared/useUpdateEscrow.ts

@@ -7,6 +7,9 @@ import {
   UpdateSingleReleaseEscrowPayload,
   UpdateSingleReleaseEscrowResponse,
   SingleReleaseMilestone,
+  Roles,
+  GetEscrowsFromIndexerResponse,
+  MultiReleaseMilestone,
 } from "@trustless-work/escrow/types";
 import { toast } from "sonner";
 import { useEscrowContext } from "@/components/tw-blocks/providers/EscrowProvider";
@@ -16,7 +19,6 @@ import {
   ErrorResponse,
   handleError,
 } from "@/components/tw-blocks/handle-errors/handle";
-import { GetEscrowsFromIndexerResponse } from "@trustless-work/escrow/types";
 
 export function useUpdateEscrow() {
   const [isSubmitting, setIsSubmitting] = React.useState(false);
@@ -28,6 +30,11 @@ export function useUpdateEscrow() {
   const { selectedEscrow, setSelectedEscrow } = useEscrowContext();
   const { updateEscrow } = useEscrowsMutations();
 
+  const isEscrowLocked = Number(selectedEscrow?.balance || 0) > 0;
+  const initialMilestonesCountRef = React.useRef<number>(
+    ((selectedEscrow?.milestones as MultiReleaseMilestone[]) || []).length
+  );
+
   const form = useForm<z.infer<typeof formSchema>>({
     resolver: zodResolver(formSchema),
     defaultValues: {
@@ -39,9 +46,6 @@ export function useUpdateEscrow() {
         | string
         | undefined,
       amount: selectedEscrow?.amount as unknown as number | string | undefined,
-      receiverMemo: selectedEscrow?.receiverMemo
-        ? String(selectedEscrow.receiverMemo)
-        : "",
       trustline: {
         address: selectedEscrow?.trustline?.address || "",
       },
@@ -49,7 +53,9 @@ export function useUpdateEscrow() {
         approver: selectedEscrow?.roles?.approver || "",
         serviceProvider: selectedEscrow?.roles?.serviceProvider || "",
         platformAddress: selectedEscrow?.roles?.platformAddress || "",
-        receiver: selectedEscrow?.roles?.receiver || "",
+        receiver:
+          (selectedEscrow?.roles as Roles & { receiver?: string })?.receiver ||
+          "",
         releaseSigner: selectedEscrow?.roles?.releaseSigner || "",
         disputeResolver: selectedEscrow?.roles?.disputeResolver || "",
       },
@@ -76,9 +82,6 @@ export function useUpdateEscrow() {
       amount:
         (selectedEscrow?.amount as unknown as number | string | undefined) ||
         "",
-      receiverMemo: selectedEscrow?.receiverMemo
-        ? String(selectedEscrow.receiverMemo)
-        : "",
       trustline: {
         address: selectedEscrow?.trustline?.address || "",
       },
@@ -86,7 +89,9 @@ export function useUpdateEscrow() {
         approver: selectedEscrow?.roles?.approver || "",
         serviceProvider: selectedEscrow?.roles?.serviceProvider || "",
         platformAddress: selectedEscrow?.roles?.platformAddress || "",
-        receiver: selectedEscrow?.roles?.receiver || "",
+        receiver:
+          (selectedEscrow?.roles as Roles & { receiver?: string })?.receiver ||
+          "",
         releaseSigner: selectedEscrow?.roles?.releaseSigner || "",
         disputeResolver: selectedEscrow?.roles?.disputeResolver || "",
       },
@@ -99,7 +104,13 @@ export function useUpdateEscrow() {
   }, [selectedEscrow, form]);
 
   const milestones = form.watch("milestones");
-  const isAnyMilestoneEmpty = milestones.some((m) => m.description === "");
+  const isAnyMilestoneEmpty = milestones.some((m, index) => {
+    const shouldValidate =
+      !isEscrowLocked || index >= initialMilestonesCountRef.current;
+    if (!shouldValidate) return false;
+
+    return m.description === "";
+  });
 
   const handleAddMilestone = () => {
     const current = form.getValues("milestones");
@@ -164,14 +175,15 @@ export function useUpdateEscrow() {
             typeof payload.amount === "string"
               ? Number(payload.amount)
               : payload.amount,
-          receiverMemo: payload.receiverMemo
-            ? Number(payload.receiverMemo)
-            : undefined,
           trustline: {
             address: payload.trustline.address,
           },
           roles: payload.roles,
-          milestones: payload.milestones,
+          milestones: payload.milestones.map((milestone, index) => ({
+            ...milestone,
+            evidence: selectedEscrow?.milestones?.[index]?.evidence || "",
+            status: selectedEscrow?.milestones?.[index]?.status || "",
+          })),
         },
       };
 
@@ -221,5 +233,7 @@ export function useUpdateEscrow() {
     handleRemoveMilestone,
     handleAmountChange,
     handlePlatformFeeChange,
+    isEscrowLocked,
+    initialMilestonesCount: initialMilestonesCountRef.current,
   };
 }

package/templates/providers/EscrowAmountProvider.tsx

@@ -21,6 +21,8 @@ export type AmountEscrowStore = {
   setReceiverResolve: (value: number) => void;
   setApproverResolve: (value: number) => void;
   setAmountMoonpay: (value: number) => void;
+  lastReleasedMilestoneIndex: number | null;
+  setLastReleasedMilestoneIndex: (index: number | null) => void;
 };
 
 const EscrowAmountContext = createContext<AmountEscrowStore | undefined>(
@@ -34,6 +36,9 @@ export const EscrowAmountProvider = ({ children }: { children: ReactNode }) => {
   const [receiverResolve, setReceiverResolve] = useState(0);
   const [approverResolve, setApproverResolve] = useState(0);
   const [amountMoonpay, setAmountMoonpay] = useState(0);
+  const [lastReleasedMilestoneIndex, setLastReleasedMilestoneIndex] = useState<
+    number | null
+  >(null);
 
   const setAmounts: AmountEscrowStore["setAmounts"] = useCallback(
     (totalAmount, platformFee) => {
@@ -62,6 +67,8 @@ export const EscrowAmountProvider = ({ children }: { children: ReactNode }) => {
       setReceiverResolve,
       setApproverResolve,
       setAmountMoonpay,
+      lastReleasedMilestoneIndex,
+      setLastReleasedMilestoneIndex,
     }),
     [
       receiverAmount,
@@ -70,6 +77,7 @@ export const EscrowAmountProvider = ({ children }: { children: ReactNode }) => {
       receiverResolve,
       approverResolve,
       amountMoonpay,
+      lastReleasedMilestoneIndex,
     ]
   );
 

package/templates/tanstack/useEscrowsMutations.ts

@@ -443,17 +443,12 @@ export const useEscrowsMutations = () => {
   const withdrawRemainingFundsMutation = useMutation({
     mutationFn: async ({
       payload,
-      type,
       address,
     }: {
       payload: WithdrawRemainingFundsPayload;
-      type: EscrowType;
       address: string;
     }) => {
-      const { unsignedTransaction } = await withdrawRemainingFunds(
-        payload,
-        type
-      );
+      const { unsignedTransaction } = await withdrawRemainingFunds(payload);
 
       if (!unsignedTransaction) {
         throw new Error(

package/templates/wallet-kit/WalletButtons.tsx

@@ -29,7 +29,7 @@ export const WalletButton = () => {
       setCopied(true);
       setTimeout(() => setCopied(false), 1500);
     } catch (_) {
-      // noop
+      console.error("Error copying address to clipboard", _);
     }
   };
 
@@ -39,7 +39,7 @@ export const WalletButton = () => {
         <PopoverTrigger asChild>
           <Button
             variant="outline"
-            className="h-10 px-4 gap-2 font-medium bg-transparent"
+            className="h-10 px-4 gap-2 font-medium bg-transparent cursor-pointer"
           >
             <Wallet className="h-4 w-4" />
             <span className="hidden sm:inline">{walletName}</span>

package/templates/wallet-kit/WalletProvider.tsx

@@ -1,6 +1,5 @@
 "use client";
 
-import * as React from "react";
 import {
   createContext,
   useContext,