fix(portal): show declaration, T1 and Djibouti clearance documents to the customer

apps/edr-freight-web/backoffice/src/components/contracts/ClearanceChargesTab.tsx

@@ -67,6 +67,8 @@ export function ClearanceChargesTab({
   onViewFile,
 }: ClearanceChargesTabProps) {
   const qc = useQueryClient();
+  // Bumped after each create so the form remounts empty for the next charge.
+  const [miscCreated, setMiscCreated] = useState(0);
   const { data: charges, isLoading } = useQuery({
     queryKey: ["clearance-charges", bookingId],
     queryFn: () => bookingsService.getClearanceCharges(bookingId),
@@ -109,6 +111,8 @@ export function ClearanceChargesTab({
       bookingsService.createMiscellaneousCharge(bookingId, p.file, p),
     onSuccess: (next) => {
       toast.success("Miscellaneous charge created");
+      // Remount the form so the next charge starts from an empty one.
+      setMiscCreated((n) => n + 1);
       refresh(next);
     },
     onError,
@@ -124,7 +128,9 @@ export function ClearanceChargesTab({
   }
 
   const port = (charges ?? []).find((c) => c.type === "PORT_CHARGES") ?? null;
-  const misc = (charges ?? []).find((c) => c.type === "MISCELLANEOUS") ?? null;
+  const miscCharges = (charges ?? []).filter(
+    (c) => c.type === "MISCELLANEOUS",
+  );
   const busy =
     uploadPort.isPending || bill.isPending || send.isPending || createMisc.isPending;
 
@@ -137,7 +143,7 @@ export function ClearanceChargesTab({
   return (
     <Stack gap="md" maw={860}>
       <ChargeCard
-        title="1 · Port charges"
+        title="Port charges"
         charge={port}
         roleMode={roleMode}
         busy={busy}
@@ -175,34 +181,48 @@ export function ClearanceChargesTab({
         }
       />
 
-      <ChargeCard
-        title="2 · Miscellaneous charges"
-        charge={misc}
-        roleMode={roleMode}
-        busy={busy}
-        emptyHint={
-          port?.status !== "PAID"
-            ? "Unlocks once the port charge is paid."
-            : roleMode === "ET"
-              ? "Create the miscellaneous charge with its document, amount and currency."
-              : "GL Ethiopia creates this charge once the port charge is paid."
-        }
-        onViewFile={onViewFile}
-        onBill={(amount, currency) =>
-          misc && bill.mutate({ chargeId: misc.id, amount, currency })
-        }
-        onSend={() => misc && send.mutate(misc.id)}
-        etCreate={
-          roleMode === "ET" && !misc && port?.status === "PAID" ? (
-            <MiscCreateForm
-              busy={createMisc.isPending}
-              onCreate={(file, amount, currency) =>
-                createMisc.mutate({ file, amount, currency })
-              }
-            />
-          ) : null
-        }
-      />
+      {/* Any number of miscellaneous charges, in any order relative to the
+          port charge — each is billed and paid on its own. */}
+      {miscCharges.map((c, i) => (
+        <ChargeCard
+          key={c.id}
+          title={
+            miscCharges.length > 1
+              ? `Miscellaneous charge ${i + 1}`
+              : "Miscellaneous charge"
+          }
+          charge={c}
+          roleMode={roleMode}
+          busy={busy}
+          emptyHint=""
+          onViewFile={onViewFile}
+          onBill={(amount, currency) =>
+            bill.mutate({ chargeId: c.id, amount, currency })
+          }
+          onSend={() => send.mutate(c.id)}
+        />
+      ))}
+
+      {roleMode === "ET" && (
+        <Paper withBorder radius="md" p="md">
+          <Text fz="14px" fw={700} c="edr-text" mb={4}>
+            {miscCharges.length > 0
+              ? "Add another miscellaneous charge"
+              : "Add a miscellaneous charge"}
+          </Text>
+          <Text fz="12px" c="dimmed" mb="sm">
+            Upload the supporting document and set the amount. You can raise as
+            many as the shipment needs, before or after the port charge.
+          </Text>
+          <MiscCreateForm
+            key={miscCreated}
+            busy={createMisc.isPending}
+            onCreate={(file, amount, currency) =>
+              createMisc.mutate({ file, amount, currency })
+            }
+          />
+        </Paper>
+      )}
 
       {totals.size > 0 && (
         <Paper withBorder radius="md" p="md">