Develop

app/hire/authctx.tsx

@@ -138,12 +138,7 @@ export const AuthContextProvider = ({
 
   const logout = async () => {
     await EmployerAuthService.logout();
-
-    await queryClient.invalidateQueries({ queryKey: ["my-employer-profile"] });
-    await queryClient.invalidateQueries({
-      queryKey: ["my-employer-conversations"],
-    });
-
+    queryClient.clear();
     router.push("/login");
     setUser(null);
     setGod(false);

app/student/forms/components/FormActionButtons.tsx

@@ -4,6 +4,7 @@ import { useFormRendererContext } from "@/components/features/student/forms/form
 import { Button } from "@/components/ui/button";
 import useModalRegistry from "@/components/modals/modal-registry";
 import { cn } from "@/lib/utils";
+import { resolveSignedUrl } from "@/lib/signed-url";
 
 export const FormActionButtons = ({
   handleSignViaBetterInternship,
@@ -30,11 +31,10 @@ export const FormActionButtons = ({
           size="lg"
           className="w-full text-lg sm:w-auto"
           variant="outline"
-          onClick={() => {
+          onClick={async () => {
             if (form.document.url) {
-              modalRegistry.previewFormPdf.open({
-                documentUrl: form.document.url,
-              });
+              const resolved = await resolveSignedUrl(form.document.url);
+              modalRegistry.previewFormPdf.open({ documentUrl: resolved });
             } else {
               alert("No document url provided for preview.");
             }

app/student/forms/components/FormSigningLayout.tsx

@@ -1,7 +1,8 @@
 "use client";
 
 import { ArrowLeft, LucideClipboardCheck, MailWarningIcon } from "lucide-react";
-import { FormPreviewPdfDisplay } from "@/components/features/student/forms/previewer";
+import { FormFillPdfViewer } from "@betterinternship/core/pdf-viewer";
+import { useSignedUrl } from "@/lib/signed-url";
 import { FormFillerRenderer } from "@/components/features/student/forms/FormFillerRenderer";
 import { Button } from "@/components/ui/button";
 import { Checkbox } from "@/components/ui/checkbox";
@@ -29,6 +30,7 @@ import { getRecipientEmailErrors } from "./recipient-email-validation";
 import { useSignContext } from "@/components/providers/sign.ctx";
 import { withSubmittedSignatureImages } from "@/lib/signature-image-submit";
 import { useProfileData } from "@/lib/api/student.data.api";
+import { useDbRefs } from "@/lib/db/use-refs";
 
 interface FlowTestSigningLayoutProps {
   formLabel?: string;
@@ -114,8 +116,10 @@ export function FormSigningLayout({
   noEsign,
   onBack,
 }: FlowTestSigningLayoutProps) {
+  const { url: resolvedDocumentUrl } = useSignedUrl(documentUrl ?? "");
   const form = useFormRendererContext();
   const profile = useProfileData();
+  const refs = useDbRefs();
   const modalRegistry = useModalRegistry();
   const formFiller = useFormFiller();
   const autofillValues = useMyAutofill();
@@ -326,10 +330,57 @@ export function FormSigningLayout({
     () => withDerivedFormValues(form.formMetadata, previewValues),
     [form.formMetadata, previewValues],
   );
+  const previewValuesResolved = useMemo(() => {
+    const resolved = { ...previewValuesWithDerived };
+    for (const [key, value] of Object.entries(previewValuesWithDerived)) {
+      if (!value) continue;
+      const trimmed = String(value).trim();
+      const keyLower = key.toLowerCase();
+      if (keyLower.includes("university") && refs.to_university_name) {
+        resolved[key] = refs.to_university_name(trimmed, trimmed) ?? trimmed;
+      } else if (keyLower.includes("college") && refs.to_college_name) {
+        resolved[key] = refs.to_college_name(trimmed, trimmed) ?? trimmed;
+      } else if (keyLower.includes("department") && refs.to_department_name) {
+        resolved[key] = refs.to_department_name(trimmed, trimmed) ?? trimmed;
+      }
+    }
+    return resolved;
+  }, [previewValuesWithDerived, refs]);
+  const previewValuesForViewer = useMemo(() => {
+    if (noEsign) return previewValuesResolved;
+    const filtered: Record<string, string> = {};
+    for (const key of Object.keys(previewValuesResolved)) {
+      const normalized = key.replace(/:default$/i, "").replace(/:auto$/i, "");
+      const owner =
+        fieldOwnerByName.get(normalized) ?? fieldOwnerByName.get(key);
+      if (owner !== undefined && owner !== "initiator") continue;
+      filtered[key] = previewValuesResolved[key];
+    }
+    return filtered;
+  }, [previewValuesResolved, fieldOwnerByName, noEsign]);
   const wetSignatureHiddenFieldNames = useMemo(
     () => (noEsign ? getSignatureDerivedFieldNames(form.formMetadata) : []),
     [form.formMetadata, noEsign],
   );
+  const previewBlocksForViewer = useMemo(() => {
+    const hiddenSet = new Set(
+      wetSignatureHiddenFieldNames.map(normalizeFieldName),
+    );
+    const raw = noEsign
+      ? previewKeyedFields.filter(
+          (field) =>
+            field.type !== "signature" &&
+            !hiddenSet.has(normalizeFieldName(field.field)),
+        )
+      : previewKeyedFields;
+    return raw.map((field) => ({
+      ...field,
+      id:
+        field.id ||
+        field._id ||
+        `${field.field}:${field.page}:${field.x}:${field.y}`,
+    }));
+  }, [previewKeyedFields, noEsign, wetSignatureHiddenFieldNames]);
 
   const computeRequiredFieldsComplete = useCallback(
     (nextValues: FormValues) =>
@@ -838,23 +889,26 @@ export function FormSigningLayout({
                   </div>
                 </div>
               )}
-              {documentUrl ? (
+              {resolvedDocumentUrl ? (
                 <>
-                  <FormPreviewPdfDisplay
+                  <FormFillPdfViewer
                     key={isMobileLayout ? "mobile-preview" : "desktop-preview"}
-                    documentUrl={documentUrl}
-                    blocks={previewKeyedFields}
-                    values={previewValuesWithDerived}
+                    documentUrl={resolvedDocumentUrl}
+                    blocks={previewBlocksForViewer}
+                    values={previewValuesForViewer}
                     fieldErrors={formFiller.errors}
                     selectionTick={selectionTick}
                     autoScrollToSelectedField={
                       !isMobileLayout && selectedFieldSource === "form"
                     }
                     signingParties={recipients}
-                    wetSignatureMode={!!noEsign}
-                    hiddenFieldNames={wetSignatureHiddenFieldNames}
                     onFieldClick={handlePdfFieldSelect}
                     selectedFieldId={form.selectedPreviewId ?? undefined}
+                    scale={isMobile ? 0.5 : 0.9}
+                    prefillUser={profile.data as Record<string, unknown> | null}
+                    showOwnership={!noEsign}
+                    fieldVisibility="all"
+                    currentSigningPartyId={!noEsign ? "initiator" : undefined}
                   />
                 </>
               ) : (

components/features/student/forms/SignatureFieldRenderer.tsx

@@ -330,15 +330,21 @@ export const SignatureFieldRenderer = <T extends any[]>({
       <div className="space-y-4 rounded-[0.33em] border border-gray-300 p-4 px-5">
         <div className="space-y-1.5">
           <p className="text-xs text-slate-500">
-            Enter your full legal name, then choose one signature method.
+            Full name auto-filled from your profile.
           </p>
-          <FormInput
-            value={typedName ?? ""}
-            setter={handleTypedNameChange}
-            className="w-full"
-            placeholder="Enter full legal name"
-            onBlur={() => onBlur?.(value)}
-          />
+          <div
+            title="Edit your name in your Profile settings"
+            className="relative"
+          >
+            <FormInput
+              value={typedName ?? ""}
+              setter={handleTypedNameChange}
+              className="w-full cursor-not-allowed opacity-80"
+              placeholder="Enter full legal name"
+              onBlur={() => onBlur?.(value)}
+              disabled
+            />
+          </div>
         </div>
         <div className="space-y-2">
           <LabelWithTooltip label="Signature method" />