@trustless-work/blocks 1.0.6 → 1.0.7

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

@@ -40,12 +40,6 @@ export const useUpdateEscrowSchema = () => {
           .refine((value) => isValidWallet(value), {
             message: "Dispute resolver must be a valid wallet.",
           }),
-        receiver: z
-          .string()
-          .min(1, { message: "Receiver address is required." })
-          .refine((value) => isValidWallet(value), {
-            message: "Receiver address must be a valid wallet.",
-          }),
       }),
       engagementId: z.string().min(1, { message: "Engagement is required." }),
       title: z.string().min(1, { message: "Title is required." }),
@@ -79,16 +73,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).",
-        }),
     });
   };
 
@@ -99,6 +83,14 @@ export const useUpdateEscrowSchema = () => {
       milestones: z
         .array(
           z.object({
+            receiver: z
+              .string()
+              .min(1, {
+                message: "Receiver address is required.",
+              })
+              .refine((value) => isValidWallet(value), {
+                message: "Receiver address must be a valid wallet.",
+              }),
             description: z.string().min(1, {
               message: "Milestone description is required.",
             }),

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

@@ -28,6 +28,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: {
@@ -38,9 +43,6 @@ export function useUpdateEscrow() {
         | number
         | string
         | undefined,
-      receiverMemo: selectedEscrow?.receiverMemo
-        ? String(selectedEscrow.receiverMemo)
-        : "",
       trustline: {
         address: selectedEscrow?.trustline?.address || "",
       },
@@ -48,17 +50,19 @@ export function useUpdateEscrow() {
         approver: selectedEscrow?.roles?.approver || "",
         serviceProvider: selectedEscrow?.roles?.serviceProvider || "",
         platformAddress: selectedEscrow?.roles?.platformAddress || "",
-        receiver: selectedEscrow?.roles?.receiver || "",
         releaseSigner: selectedEscrow?.roles?.releaseSigner || "",
         disputeResolver: selectedEscrow?.roles?.disputeResolver || "",
       },
       milestones: (
         (selectedEscrow?.milestones as MultiReleaseMilestone[]) ?? []
       ).map((m) => ({
+        receiver:
+          (m as MultiReleaseMilestone & { receiver?: string })?.receiver || "",
         description: m?.description || "",
         amount: m?.amount ?? 0,
       })) || [
         {
+          receiver: "",
           description: "",
           amount: 0,
         },
@@ -78,9 +82,6 @@ export function useUpdateEscrow() {
           | number
           | string
           | undefined) || "",
-      receiverMemo: selectedEscrow?.receiverMemo
-        ? String(selectedEscrow.receiverMemo)
-        : "",
       trustline: {
         address: selectedEscrow?.trustline?.address || "",
       },
@@ -88,34 +89,51 @@ export function useUpdateEscrow() {
         approver: selectedEscrow?.roles?.approver || "",
         serviceProvider: selectedEscrow?.roles?.serviceProvider || "",
         platformAddress: selectedEscrow?.roles?.platformAddress || "",
-        receiver: selectedEscrow?.roles?.receiver || "",
         releaseSigner: selectedEscrow?.roles?.releaseSigner || "",
         disputeResolver: selectedEscrow?.roles?.disputeResolver || "",
       },
       milestones: (
         (selectedEscrow?.milestones as MultiReleaseMilestone[]) ?? []
       ).map((m) => ({
+        receiver:
+          (m as MultiReleaseMilestone & { receiver?: string })?.receiver || "",
         description: m?.description || "",
         amount: m?.amount ?? "",
       })) || [
         {
+          receiver: "",
           description: "",
           amount: "",
         },
       ],
     });
+    initialMilestonesCountRef.current = (
+      (selectedEscrow?.milestones as MultiReleaseMilestone[]) || []
+    ).length;
   }, [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 === "" ||
+      (m as { receiver?: string }).receiver === "" ||
+      m.amount === ""
+    );
+  });
 
   const handleAddMilestone = () => {
     const current = form.getValues("milestones");
-    const updated = [...current, { description: "", amount: "" }];
+    const updated = [...current, { receiver: "", description: "", amount: "" }];
     form.setValue("milestones", updated);
   };
 
   const handleRemoveMilestone = (index: number) => {
+    if (isEscrowLocked && index < initialMilestonesCountRef.current) {
+      return; // cannot remove existing milestones when escrow has balance
+    }
     const current = form.getValues("milestones");
     const updated = current.filter((_, i) => i !== index);
     form.setValue("milestones", updated);
@@ -183,19 +201,18 @@ export function useUpdateEscrow() {
             typeof payload.platformFee === "string"
               ? Number(payload.platformFee)
               : payload.platformFee,
-          receiverMemo: payload.receiverMemo
-            ? Number(payload.receiverMemo)
-            : undefined,
           trustline: {
             address: payload.trustline.address,
           },
           roles: payload.roles,
-          milestones: payload.milestones.map((milestone) => ({
+          milestones: payload.milestones.map((milestone, index) => ({
             ...milestone,
             amount:
               typeof milestone.amount === "string"
                 ? Number(milestone.amount)
                 : milestone.amount,
+            evidence: selectedEscrow?.milestones?.[index]?.evidence || "",
+            status: selectedEscrow?.milestones?.[index]?.status || "",
           })),
         },
       };
@@ -246,5 +263,7 @@ export function useUpdateEscrow() {
     handleRemoveMilestone,
     handleMilestoneAmountChange,
     handlePlatformFeeChange,
+    isEscrowLocked,
+    initialMilestonesCount: initialMilestonesCountRef.current,
   };
 }

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

@@ -45,7 +45,6 @@ export const WithdrawRemainingFundsButton = ({
 
       await withdrawRemainingFunds.mutateAsync({
         payload,
-        type: "multi-release",
         address: walletAddress || "",
       });
 

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

@@ -119,7 +119,6 @@ export function useWithdrawRemainingFunds() {
 
       await withdrawRemainingFunds.mutateAsync({
         payload: finalPayload,
-        type: "multi-release",
         address: walletAddress || "",
       });
 

package/templates/escrows/single-release/initialize-escrow/dialog/InitializeEscrow.tsx

@@ -320,7 +320,7 @@ export const InitializeEscrowDialog = () => {
                   <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>
@@ -364,7 +364,7 @@ export const InitializeEscrowDialog = () => {
               />
             </div>
 
-            <div className="grid grid-cols-1 lg:grid-cols-3 gap-4">
+            <div className="grid grid-cols-1 lg:grid-cols-2 gap-4">
               <FormField
                 control={form.control}
                 name="platformFee"
@@ -419,29 +419,6 @@ export const InitializeEscrowDialog = () => {
                   </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

package/templates/escrows/single-release/initialize-escrow/form/InitializeEscrow.tsx

@@ -78,7 +78,7 @@ export const InitializeEscrowForm = () => {
   return (
     <Form {...form}>
       <form onSubmit={handleSubmit} className="flex flex-col space-y-6">
-        <Card className="flex flex-col sm:flex-row justify-between items-start sm:items-center gap-4 p-4">
+        <Card className="flex w-full max-w-3xl flex-col sm:flex-row justify-between items-start sm:items-center gap-4 p-4">
           <Link
             className="flex-1"
             href="https://docs.trustlesswork.com/trustless-work/technology-overview/escrow-types"
@@ -301,7 +301,7 @@ export const InitializeEscrowForm = () => {
               <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>
@@ -345,7 +345,7 @@ export const InitializeEscrowForm = () => {
           />
         </div>
 
-        <div className="grid grid-cols-1 lg:grid-cols-3 gap-4">
+        <div className="grid grid-cols-1 lg:grid-cols-2 gap-4">
           <FormField
             control={form.control}
             name="platformFee"
@@ -399,29 +399,6 @@ export const InitializeEscrowForm = () => {
               </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

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

@@ -104,16 +104,6 @@ export const useInitializeEscrowSchema = () => {
             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/initialize-escrow/shared/useInitializeEscrow.ts

@@ -35,7 +35,6 @@ export function useInitializeEscrow() {
       description: "",
       platformFee: undefined,
       amount: undefined,
-      receiverMemo: "",
       trustline: {
         address: "",
       },
@@ -78,7 +77,6 @@ export function useInitializeEscrow() {
       description: "Landing for the new product of the company.",
       platformFee: 5,
       amount: 5,
-      receiverMemo: "123",
       trustline: {
         address: usdc?.value || "",
       },
@@ -104,7 +102,6 @@ export function useInitializeEscrow() {
 
     // Explicitly set the trustline field
     form.setValue("trustline.address", usdc?.value || "");
-    form.setValue("trustline.decimals", 10000000);
   };
 
   const handleSubmit = form.handleSubmit(async (payload) => {
@@ -127,7 +124,6 @@ export function useInitializeEscrow() {
           typeof payload.platformFee === "string"
             ? Number(payload.platformFee)
             : payload.platformFee,
-        receiverMemo: Number(payload.receiverMemo) ?? 0,
         signer: walletAddress || "",
         milestones: payload.milestones,
       };

package/templates/escrows/single-release/release-escrow/button/ReleaseEscrow.tsx

@@ -17,7 +17,8 @@ export const ReleaseEscrowButton = () => {
   const { releaseFunds } = useEscrowsMutations();
   const { selectedEscrow, updateEscrow } = useEscrowContext();
   const dialogStates = useEscrowDialogs();
-  const { setAmounts } = useEscrowAmountContext();
+  const { setAmounts, setLastReleasedMilestoneIndex } =
+    useEscrowAmountContext();
   const { walletAddress } = useWalletContext();
   const [isSubmitting, setIsSubmitting] = React.useState(false);
 
@@ -63,6 +64,9 @@ export const ReleaseEscrowButton = () => {
         balance: (selectedEscrow?.balance || 0) - (selectedEscrow?.amount || 0),
       });
 
+      // Clear milestone index context (single-release)
+      setLastReleasedMilestoneIndex(null);
+
       // Open success dialog
       dialogStates.successRelease.setIsOpen(true);
     } catch (error) {

package/templates/escrows/single-release/update-escrow/dialog/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";
 import {
@@ -41,6 +41,8 @@ export const UpdateEscrowDialog = () => {
     handleRemoveMilestone,
     handleAmountChange,
     handlePlatformFeeChange,
+    isEscrowLocked,
+    initialMilestonesCount,
   } = useUpdateEscrow();
 
   return (
@@ -71,6 +73,22 @@ export const UpdateEscrowDialog = () => {
                 <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">
@@ -85,6 +103,7 @@ export const UpdateEscrowDialog = () => {
                     <FormControl>
                       <Input
                         placeholder="Escrow title"
+                        disabled={isEscrowLocked}
                         {...field}
                         onChange={(e) => {
                           field.onChange(e);
@@ -107,6 +126,7 @@ export const UpdateEscrowDialog = () => {
                     <FormControl>
                       <Input
                         placeholder="Enter identifier"
+                        disabled={isEscrowLocked}
                         {...field}
                         onChange={(e) => {
                           field.onChange(e);
@@ -129,6 +149,7 @@ export const UpdateEscrowDialog = () => {
                     <FormControl>
                       <Select
                         value={field.value}
+                        disabled={isEscrowLocked}
                         onValueChange={(e) => {
                           field.onChange(e);
                         }}
@@ -172,6 +193,7 @@ export const UpdateEscrowDialog = () => {
                       <Input
                         placeholder="Enter approver address"
                         {...field}
+                        disabled={isEscrowLocked}
                         onChange={(e) => {
                           field.onChange(e);
                         }}
@@ -198,6 +220,7 @@ export const UpdateEscrowDialog = () => {
                       <Input
                         placeholder="Enter service provider address"
                         {...field}
+                        disabled={isEscrowLocked}
                         onChange={(e) => {
                           field.onChange(e);
                         }}
@@ -226,6 +249,7 @@ export const UpdateEscrowDialog = () => {
                       <Input
                         placeholder="Enter release signer address"
                         {...field}
+                        disabled={isEscrowLocked}
                         onChange={(e) => {
                           field.onChange(e);
                         }}
@@ -252,6 +276,7 @@ export const UpdateEscrowDialog = () => {
                       <Input
                         placeholder="Enter dispute resolver address"
                         {...field}
+                        disabled={isEscrowLocked}
                         onChange={(e) => {
                           field.onChange(e);
                         }}
@@ -271,7 +296,7 @@ export const UpdateEscrowDialog = () => {
                   <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>
@@ -280,6 +305,7 @@ export const UpdateEscrowDialog = () => {
                       <Input
                         placeholder="Enter platform address"
                         {...field}
+                        disabled={isEscrowLocked}
                         onChange={(e) => {
                           field.onChange(e);
                         }}
@@ -304,6 +330,7 @@ export const UpdateEscrowDialog = () => {
                       <Input
                         placeholder="Enter receiver address"
                         {...field}
+                        disabled={isEscrowLocked}
                         onChange={(e) => {
                           field.onChange(e);
                         }}
@@ -315,7 +342,7 @@ export const UpdateEscrowDialog = () => {
               />
             </div>
 
-            <div className="grid grid-cols-1 lg:grid-cols-3 gap-4">
+            <div className="grid grid-cols-1 lg:grid-cols-2 gap-4">
               <FormField
                 control={form.control}
                 name="platformFee"
@@ -334,6 +361,7 @@ export const UpdateEscrowDialog = () => {
                         <Input
                           placeholder="Enter platform fee"
                           className="pl-10"
+                          disabled={isEscrowLocked}
                           value={form.watch("platformFee")?.toString() || ""}
                           onChange={handlePlatformFeeChange}
                         />
@@ -363,6 +391,7 @@ export const UpdateEscrowDialog = () => {
                           className="pl-10"
                           value={form.watch("amount")?.toString() || ""}
                           onChange={handleAmountChange}
+                          disabled={isEscrowLocked}
                         />
                       </div>
                     </FormControl>
@@ -370,29 +399,6 @@ export const UpdateEscrowDialog = () => {
                   </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
@@ -405,6 +411,7 @@ export const UpdateEscrowDialog = () => {
                   </FormLabel>
                   <FormControl>
                     <Textarea
+                      disabled={isEscrowLocked}
                       placeholder="Escrow description"
                       {...field}
                       onChange={(e) => {
@@ -428,6 +435,9 @@ export const UpdateEscrowDialog = () => {
                       placeholder="Milestone Description"
                       value={milestone.description}
                       className="w-full sm:flex-1"
+                      disabled={
+                        isEscrowLocked && index < initialMilestonesCount
+                      }
                       onChange={(e) => {
                         const updatedMilestones = [...milestones];
                         updatedMilestones[index].description = e.target.value;
@@ -438,7 +448,11 @@ export const UpdateEscrowDialog = () => {
                     <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>