From 61e48c766872701d2c05a39fc55f26d0ef54053c Mon Sep 17 00:00:00 2001
From: "gpt-engineer-app[bot]"
 <159125892+gpt-engineer-app[bot]@users.noreply.github.com>
Date: Sat, 18 Apr 2026 23:26:39 +0000
Subject: [PATCH] Changes

Co-authored-by: renee-png <262607627+renee-png@users.noreply.github.com>
---
 src/components/forms/custom-form-builder.tsx | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/src/components/forms/custom-form-builder.tsx b/src/components/forms/custom-form-builder.tsx
index e53229a..103bc2c 100644
--- a/src/components/forms/custom-form-builder.tsx
+++ b/src/components/forms/custom-form-builder.tsx
@@ -54,7 +54,7 @@ import {
   Square,
   ImagePlus,
 } from "lucide-react";
-import { ClientHomeownerPicker } from "./form-pickers";
+import { ClientCasePicker } from "./client-case-picker";
 import { FormFieldDefsDialog } from "./form-field-defs-dialog";
 import { FormFieldsFillPanel } from "./form-fields-fill-panel";
 import {
@@ -1417,18 +1417,23 @@ export function CustomFormBuilder() {
               </Button>
             </div>
           </div>
-          <ClientHomeownerPicker
+          <ClientCasePicker
             clientId={clientId}
-            homeownerId={homeownerId}
+            caseId={selectedCaseId}
             onClientChange={(id, c) => {
               setClientId(id);
               setClient(c);
+              setSelectedCaseId("");
+              setHomeownerId("");
+              setHomeowner(null);
             }}
-            onHomeownerChange={(id, h) => {
-              setHomeownerId(id);
-              setHomeowner(h);
+            onCaseChange={(id) => {
+              setSelectedCaseId(id);
             }}
           />
+          {cases.length === 0 && clientId && (
+            <p className="text-[11px] text-muted-foreground -mt-2">Loading cases…</p>
+          )}
           <div className="grid grid-cols-1 md:grid-cols-[1fr_auto_auto_auto_auto] gap-3 items-end">
             <div>
               <Label>Document title</Label>