diff --git a/src/components/invoices/generate-invoice-dialog.tsx b/src/components/invoices/generate-invoice-dialog.tsx index 1dff29a..e4ad656 100644 --- a/src/components/invoices/generate-invoice-dialog.tsx +++ b/src/components/invoices/generate-invoice-dialog.tsx @@ -177,39 +177,27 @@ export function GenerateInvoiceDialog({ open, onOpenChange, clientId, clientName Generate invoice — {clientName} - {loading ? ( -
Loading unbilled work…
- ) : cases.length === 0 ? ( -
- No unbilled time or expenses across this client's cases. -
- ) : ( -
-
- -
- {cases.map((c) => ( - - ))} +
+ + {isRetainer ? (
+
+ + +
setTaxPct(e.target.value)} /> @@ -218,27 +206,73 @@ export function GenerateInvoiceDialog({ open, onOpenChange, clientId, clientName setDueDays(e.target.value)} />
-
-
-
Estimated total
-
{formatCurrency(total)}
- {tax > 0 &&
{formatCurrency(subtotal)} + {formatCurrency(tax)} tax
} +
+ ) : loading ? ( +
Loading unbilled work…
+ ) : cases.length === 0 ? ( +
+ No unbilled time or expenses across this client's cases. +
+ ) : ( + <> +
+ +
+ {cases.map((c) => ( + + ))}
-
-
- -