Merge branch 'feat/rr7' into feat/limit-free-teams-platform-plan

2025-03-04 09:43:44 +02:00
parent 2d4b18b1e8 083a706373
commit fabb2fc3d2
86 changed files with 14983 additions and 15058 deletions
--- a/apps/documentation/pages/developers/public-api/index.mdx
+++ b/apps/documentation/pages/developers/public-api/index.mdx
@@ -31,6 +31,11 @@ Our new API V2 supports the following typed SDKs:
 - [Python](https://github.com/documenso/sdk-python)
 - [Go](https://github.com/documenso/sdk-go)

+<Callout type="info">
+  For the staging API, please use the following base URL:
+  `https://stg-app.documenso.dev/api/v2-beta/`
+</Callout>
+
 🚀 [V2 Announcement](https://documen.so/sdk-blog)

 📖 [Documentation](https://documen.so/api-v2-docs)
--- a/apps/openpage-api/lib/growth/get-monthly-completed-document.ts
+++ b/apps/openpage-api/lib/growth/get-monthly-completed-document.ts
@@ -1,7 +1,7 @@
+import { DocumentStatus } from '@prisma/client';
 import { DateTime } from 'luxon';

 import { kyselyPrisma, sql } from '@documenso/prisma';
-import { DocumentStatus } from '@documenso/prisma/client';

 export const getCompletedDocumentsMonthly = async (type: 'count' | 'cumulative' = 'count') => {
  const qb = kyselyPrisma.$kysely
--- a/apps/remix/app/components/dialogs/document-duplicate-dialog.tsx
+++ b/apps/remix/app/components/dialogs/document-duplicate-dialog.tsx
@@ -13,7 +13,7 @@ import {
  DialogHeader,
  DialogTitle,
 } from '@documenso/ui/primitives/dialog';
-import { LazyPDFViewer } from '@documenso/ui/primitives/lazy-pdf-viewer';
+import { PDFViewer } from '@documenso/ui/primitives/pdf-viewer';
 import { useToast } from '@documenso/ui/primitives/use-toast';

 import { useOptionalCurrentTeam } from '~/providers/team';
@@ -97,7 +97,7 @@ export const DocumentDuplicateDialog = ({
          </div>
        ) : (
          <div className="p-2 [&>div]:h-[50vh] [&>div]:overflow-y-scroll">
-            <LazyPDFViewer key={document?.id} documentData={documentData} />
+            <PDFViewer key={document?.id} documentData={documentData} />
          </div>
        )}

--- a/apps/remix/app/components/embed/embed-authentication-required.tsx
+++ b/apps/remix/app/components/embed/embed-authentication-required.tsx
@@ -16,9 +16,9 @@ export type EmbedAuthenticationRequiredProps = {
 export const EmbedAuthenticationRequired = ({
  email,
  returnTo,
-  isGoogleSSOEnabled,
-  isOIDCSSOEnabled,
-  oidcProviderLabel,
+  // isGoogleSSOEnabled,
+  // isOIDCSSOEnabled,
+  // oidcProviderLabel,
 }: EmbedAuthenticationRequiredProps) => {
  return (
    <div className="flex min-h-[100dvh] w-full items-center justify-center">
@@ -35,9 +35,10 @@ export const EmbedAuthenticationRequired = ({
        </Alert>

        <SignInForm
-          isGoogleSSOEnabled={isGoogleSSOEnabled}
-          isOIDCSSOEnabled={isOIDCSSOEnabled}
-          oidcProviderLabel={oidcProviderLabel}
+          // Embed currently not supported.
+          // isGoogleSSOEnabled={isGoogleSSOEnabled}
+          // isOIDCSSOEnabled={isOIDCSSOEnabled}
+          // oidcProviderLabel={oidcProviderLabel}
          className="mt-4"
          initialEmail={email}
          returnTo={returnTo}
--- a/apps/remix/app/components/embed/embed-direct-template-client-page.tsx
+++ b/apps/remix/app/components/embed/embed-direct-template-client-page.tsx
@@ -25,7 +25,7 @@ import { Card, CardContent } from '@documenso/ui/primitives/card';
 import { ElementVisible } from '@documenso/ui/primitives/element-visible';
 import { Input } from '@documenso/ui/primitives/input';
 import { Label } from '@documenso/ui/primitives/label';
-import { LazyPDFViewer } from '@documenso/ui/primitives/lazy-pdf-viewer';
+import { PDFViewer } from '@documenso/ui/primitives/pdf-viewer';
 import { SignaturePad } from '@documenso/ui/primitives/signature-pad';
 import { useToast } from '@documenso/ui/primitives/use-toast';

@@ -338,7 +338,7 @@ export const EmbedDirectTemplateClientPage = ({
      <div className="relative flex w-full flex-col gap-x-6 gap-y-12 md:flex-row">
        {/* Viewer */}
        <div className="flex-1">
-          <LazyPDFViewer
+          <PDFViewer
            documentData={documentData}
            onDocumentLoad={() => setHasDocumentLoaded(true)}
          />
@@ -347,7 +347,7 @@ export const EmbedDirectTemplateClientPage = ({
        {/* Widget */}
        <div
          key={isExpanded ? 'expanded' : 'collapsed'}
-          className="group/document-widget fixed bottom-8 left-0 z-50 h-fit w-full flex-shrink-0 px-6 md:sticky md:top-4 md:z-auto md:w-[350px] md:px-0"
+          className="group/document-widget fixed bottom-8 left-0 z-50 h-fit max-h-[calc(100dvh-2rem)] w-full flex-shrink-0 px-6 md:sticky md:top-4 md:z-auto md:w-[350px] md:px-0"
          data-expanded={isExpanded || undefined}
        >
          <div className="border-border bg-widget flex h-fit w-full flex-col rounded-xl border px-4 py-4 md:min-h-[min(calc(100dvh-2rem),48rem)] md:py-6">
--- a/apps/remix/app/components/embed/embed-document-signing-page.tsx
+++ b/apps/remix/app/components/embed/embed-document-signing-page.tsx
@@ -24,7 +24,7 @@ import { Card, CardContent } from '@documenso/ui/primitives/card';
 import { ElementVisible } from '@documenso/ui/primitives/element-visible';
 import { Input } from '@documenso/ui/primitives/input';
 import { Label } from '@documenso/ui/primitives/label';
-import { LazyPDFViewer } from '@documenso/ui/primitives/lazy-pdf-viewer';
+import { PDFViewer } from '@documenso/ui/primitives/pdf-viewer';
 import { RadioGroup, RadioGroupItem } from '@documenso/ui/primitives/radio-group';
 import { SignaturePad } from '@documenso/ui/primitives/signature-pad';
 import { useToast } from '@documenso/ui/primitives/use-toast';
@@ -278,7 +278,7 @@ export const EmbedSignDocumentClientPage = ({
        <div className="embed--DocumentContainer relative flex w-full flex-col gap-x-6 gap-y-12 md:flex-row">
          {/* Viewer */}
          <div className="embed--DocumentViewer flex-1">
-            <LazyPDFViewer
+            <PDFViewer
              documentData={documentData}
              onDocumentLoad={() => setHasDocumentLoaded(true)}
            />
@@ -287,7 +287,7 @@ export const EmbedSignDocumentClientPage = ({
          {/* Widget */}
          <div
            key={isExpanded ? 'expanded' : 'collapsed'}
-            className="embed--DocumentWidgetContainer group/document-widget fixed bottom-8 left-0 z-50 h-fit w-full flex-shrink-0 px-6 md:sticky md:top-4 md:z-auto md:w-[350px] md:px-0"
+            className="embed--DocumentWidgetContainer group/document-widget fixed bottom-8 left-0 z-50 h-fit max-h-[calc(100dvh-2rem)] w-full flex-shrink-0 px-6 md:sticky md:top-4 md:z-auto md:w-[350px] md:px-0"
            data-expanded={isExpanded || undefined}
          >
            <div className="embed--DocumentWidget border-border bg-widget flex w-full flex-col rounded-xl border px-4 py-4 md:py-6">
--- a/apps/remix/app/components/forms/2fa/disable-authenticator-app-dialog.tsx
+++ b/apps/remix/app/components/forms/2fa/disable-authenticator-app-dialog.tsx
@@ -6,10 +6,10 @@ import { useLingui } from '@lingui/react';
 import { Trans } from '@lingui/react/macro';
 import { flushSync } from 'react-dom';
 import { useForm } from 'react-hook-form';
-import { useRevalidator } from 'react-router';
 import { z } from 'zod';

 import { authClient } from '@documenso/auth/client';
+import { useSession } from '@documenso/lib/client-only/providers/session';
 import { Button } from '@documenso/ui/primitives/button';
 import {
  Dialog,
@@ -42,7 +42,7 @@ export type TDisable2FAForm = z.infer<typeof ZDisable2FAForm>;
 export const DisableAuthenticatorAppDialog = () => {
  const { _ } = useLingui();
  const { toast } = useToast();
-  const { revalidate } = useRevalidator();
+  const { refreshSession } = useSession();

  const [isOpen, setIsOpen] = useState(false);
  const [twoFactorDisableMethod, setTwoFactorDisableMethod] = useState<'totp' | 'backup'>('totp');
@@ -92,7 +92,7 @@ export const DisableAuthenticatorAppDialog = () => {
        onCloseTwoFactorDisableDialog();
      });

-      await revalidate();
+      await refreshSession();
    } catch (_err) {
      toast({
        title: _(msg`Unable to disable two-factor authentication`),
--- a/apps/remix/app/components/forms/2fa/enable-authenticator-app-dialog.tsx
+++ b/apps/remix/app/components/forms/2fa/enable-authenticator-app-dialog.tsx
@@ -5,12 +5,12 @@ import { msg } from '@lingui/core/macro';
 import { useLingui } from '@lingui/react';
 import { Trans } from '@lingui/react/macro';
 import { useForm } from 'react-hook-form';
-import { useRevalidator } from 'react-router';
 import { renderSVG } from 'uqr';
 import { z } from 'zod';

 import { authClient } from '@documenso/auth/client';
 import { downloadFile } from '@documenso/lib/client-only/download-file';
+import { useSession } from '@documenso/lib/client-only/providers/session';
 import { Button } from '@documenso/ui/primitives/button';
 import {
  Dialog,
@@ -48,7 +48,7 @@ export type EnableAuthenticatorAppDialogProps = {
 export const EnableAuthenticatorAppDialog = ({ onSuccess }: EnableAuthenticatorAppDialogProps) => {
  const { _ } = useLingui();
  const { toast } = useToast();
-  const { revalidate } = useRevalidator();
+  const { refreshSession } = useSession();

  const [isOpen, setIsOpen] = useState(false);
  const [recoveryCodes, setRecoveryCodes] = useState<string[] | null>(null);
@@ -74,6 +74,7 @@ export const EnableAuthenticatorAppDialog = ({ onSuccess }: EnableAuthenticatorA

    try {
      const data = await authClient.twoFactor.setup();
+      await refreshSession();

      setSetup2FAData(data);
    } catch (err) {
@@ -92,6 +93,7 @@ export const EnableAuthenticatorAppDialog = ({ onSuccess }: EnableAuthenticatorA
  const onEnable2FAFormSubmit = async ({ token }: TEnable2FAForm) => {
    try {
      const data = await authClient.twoFactor.enable({ code: token });
+      await refreshSession();

      setRecoveryCodes(data.recoveryCodes);
      onSuccess?.();
@@ -139,7 +141,6 @@ export const EnableAuthenticatorAppDialog = ({ onSuccess }: EnableAuthenticatorA

    if (!isOpen && recoveryCodes && recoveryCodes.length > 0) {
      setRecoveryCodes(null);
-      void revalidate();
    }

    // eslint-disable-next-line react-hooks/exhaustive-deps
--- a/apps/remix/app/components/general/direct-template/direct-template-page.tsx
+++ b/apps/remix/app/components/general/direct-template/direct-template-page.tsx
@@ -12,7 +12,7 @@ import { trpc } from '@documenso/trpc/react';
 import { Card, CardContent } from '@documenso/ui/primitives/card';
 import { DocumentFlowFormContainer } from '@documenso/ui/primitives/document-flow/document-flow-root';
 import type { DocumentFlowStep } from '@documenso/ui/primitives/document-flow/types';
-import { LazyPDFViewer } from '@documenso/ui/primitives/lazy-pdf-viewer';
+import { PDFViewer } from '@documenso/ui/primitives/pdf-viewer';
 import { Stepper } from '@documenso/ui/primitives/stepper';
 import { useToast } from '@documenso/ui/primitives/use-toast';

@@ -136,7 +136,7 @@ export const DirectTemplatePageView = ({
        gradient
      >
        <CardContent className="p-2">
-          <LazyPDFViewer
+          <PDFViewer
            key={template.id}
            documentData={template.templateDocumentData}
            onDocumentLoad={() => setIsDocumentPdfLoaded(true)}
--- a/apps/remix/app/components/general/document-signing/document-signing-checkbox-field.tsx
+++ b/apps/remix/app/components/general/document-signing/document-signing-checkbox-field.tsx
@@ -45,7 +45,12 @@ export const DocumentSigningCheckboxField = ({

  const { executeActionAuthProcedure } = useRequiredDocumentSigningAuthContext();

-  const parsedFieldMeta = ZCheckboxFieldMeta.parse(field.fieldMeta);
+  const parsedFieldMeta = ZCheckboxFieldMeta.parse(
+    field.fieldMeta ?? {
+      type: 'checkbox',
+      values: [{ id: 1, checked: false, value: '' }],
+    },
+  );

  const values = parsedFieldMeta.values?.map((item) => ({
    ...item,
--- a/apps/remix/app/components/general/document-signing/document-signing-field-container.tsx
+++ b/apps/remix/app/components/general/document-signing/document-signing-field-container.tsx
@@ -181,6 +181,23 @@ export const DocumentSigningFieldContainer = ({
          </button>
        )}

+        {(field.type === FieldType.RADIO || field.type === FieldType.CHECKBOX) &&
+          field.fieldMeta?.label && (
+            <div
+              className={cn(
+                'absolute -top-16 left-0 right-0 rounded-md p-2 text-center text-xs text-gray-700',
+                {
+                  'bg-foreground/5 border-border border': !field.inserted,
+                },
+                {
+                  'bg-documenso-200 border-primary border': field.inserted,
+                },
+              )}
+            >
+              {field.fieldMeta.label}
+            </div>
+          )}
+
        {children}
      </FieldRootContainer>
    </div>
--- a/apps/remix/app/components/general/document-signing/document-signing-page-view.tsx
+++ b/apps/remix/app/components/general/document-signing/document-signing-page-view.tsx
@@ -21,7 +21,7 @@ import type { FieldWithSignatureAndFieldMeta } from '@documenso/prisma/types/fie
 import type { RecipientWithFields } from '@documenso/prisma/types/recipient-with-fields';
 import { Card, CardContent } from '@documenso/ui/primitives/card';
 import { ElementVisible } from '@documenso/ui/primitives/element-visible';
-import { LazyPDFViewer } from '@documenso/ui/primitives/lazy-pdf-viewer';
+import { PDFViewer } from '@documenso/ui/primitives/pdf-viewer';

 import { DocumentSigningAutoSign } from '~/components/general/document-signing/document-signing-auto-sign';
 import { DocumentSigningCheckboxField } from '~/components/general/document-signing/document-signing-checkbox-field';
@@ -140,12 +140,7 @@ export const DocumentSigningPageView = ({
            gradient
          >
            <CardContent className="p-2">
-              <LazyPDFViewer
-                key={documentData.id}
-                documentData={documentData}
-                document={document}
-                password={documentMeta?.password}
-              />
+              <PDFViewer key={documentData.id} documentData={documentData} document={document} />
            </CardContent>
          </Card>

--- a/apps/remix/app/components/general/document/document-edit-form.tsx
+++ b/apps/remix/app/components/general/document/document-edit-form.tsx
@@ -24,7 +24,7 @@ import { AddSubjectFormPartial } from '@documenso/ui/primitives/document-flow/ad
 import type { TAddSubjectFormSchema } from '@documenso/ui/primitives/document-flow/add-subject.types';
 import { DocumentFlowFormContainer } from '@documenso/ui/primitives/document-flow/document-flow-root';
 import type { DocumentFlowStep } from '@documenso/ui/primitives/document-flow/types';
-import { LazyPDFViewer } from '@documenso/ui/primitives/lazy-pdf-viewer';
+import { PDFViewer } from '@documenso/ui/primitives/pdf-viewer';
 import { Stepper } from '@documenso/ui/primitives/stepper';
 import { useToast } from '@documenso/ui/primitives/use-toast';

@@ -132,9 +132,6 @@ export const DocumentEditForm = ({
    },
  });

-  const { mutateAsync: setPasswordForDocument } =
-    trpc.document.setPasswordForDocument.useMutation();
-
  const documentFlow: Record<EditDocumentStep, DocumentFlowStep> = {
    settings: {
      title: msg`General`,
@@ -315,13 +312,6 @@ export const DocumentEditForm = ({
    }
  };

-  const onPasswordSubmit = async (password: string) => {
-    await setPasswordForDocument({
-      documentId: document.id,
-      password,
-    });
-  };
-
  const currentDocumentFlow = documentFlow[step];

  /**
@@ -340,12 +330,10 @@ export const DocumentEditForm = ({
        gradient
      >
        <CardContent className="p-2">
-          <LazyPDFViewer
+          <PDFViewer
            key={document.documentData.id}
            documentData={document.documentData}
            document={document}
-            password={document.documentMeta?.password}
-            onPasswordSubmit={onPasswordSubmit}
            onDocumentLoad={() => setIsDocumentPdfLoaded(true)}
          />
        </CardContent>
--- a/apps/remix/app/components/general/generic-error-layout.tsx
+++ b/apps/remix/app/components/general/generic-error-layout.tsx
@@ -62,7 +62,7 @@ export const GenericErrorLayout = ({
  const team = useOptionalCurrentTeam();

  const { subHeading, heading, message } =
-    errorCodeMap[errorCode || 404] ?? defaultErrorCodeMap[500];
+    errorCodeMap[errorCode || 500] ?? defaultErrorCodeMap[500];

  return (
    <div className="fixed inset-0 z-0 flex h-screen w-screen items-center justify-center">
--- a/apps/remix/app/components/general/template/template-edit-form.tsx
+++ b/apps/remix/app/components/general/template/template-edit-form.tsx
@@ -15,7 +15,7 @@ import { cn } from '@documenso/ui/lib/utils';
 import { Card, CardContent } from '@documenso/ui/primitives/card';
 import { DocumentFlowFormContainer } from '@documenso/ui/primitives/document-flow/document-flow-root';
 import type { DocumentFlowStep } from '@documenso/ui/primitives/document-flow/types';
-import { LazyPDFViewer } from '@documenso/ui/primitives/lazy-pdf-viewer';
+import { PDFViewer } from '@documenso/ui/primitives/pdf-viewer';
 import { Stepper } from '@documenso/ui/primitives/stepper';
 import { AddTemplateFieldsFormPartial } from '@documenso/ui/primitives/template-flow/add-template-fields';
 import type { TAddTemplateFieldsFormSchema } from '@documenso/ui/primitives/template-flow/add-template-fields.types';
@@ -236,7 +236,7 @@ export const TemplateEditForm = ({
        gradient
      >
        <CardContent className="p-2">
-          <LazyPDFViewer
+          <PDFViewer
            key={templateDocumentData.id}
            documentData={templateDocumentData}
            onDocumentLoad={() => setIsDocumentPdfLoaded(true)}
--- a/apps/remix/app/entry.client.tsx
+++ b/apps/remix/app/entry.client.tsx
@@ -17,6 +17,7 @@ function PosthogInit() {
    if (postHogConfig) {
      posthog.init(postHogConfig.key, {
        api_host: postHogConfig.host,
+        capture_exceptions: true,
      });
    }
  }, []);
--- a/apps/remix/app/routes/_authenticated+/_layout.tsx
+++ b/apps/remix/app/routes/_authenticated+/_layout.tsx
@@ -20,7 +20,7 @@ import type { Route } from './+types/_layout';
 */
 export const shouldRevalidate = () => false;

-export const loader = async ({ request }: Route.LoaderArgs) => {
+export async function loader({ request }: Route.LoaderArgs) {
  const requestHeaders = Object.fromEntries(request.headers.entries());

  const session = await getOptionalSession(request);
@@ -40,7 +40,7 @@ export const loader = async ({ request }: Route.LoaderArgs) => {
    banner,
    limits,
  };
-};
+}

 export default function Layout({ loaderData }: Route.ComponentProps) {
  const { user, teams } = useSession();
--- a/apps/remix/app/routes/_authenticated+/documents.$id._index.tsx
+++ b/apps/remix/app/routes/_authenticated+/documents.$id._index.tsx
@@ -16,7 +16,7 @@ import { formatDocumentsPath } from '@documenso/lib/utils/teams';
 import { Badge } from '@documenso/ui/primitives/badge';
 import { Button } from '@documenso/ui/primitives/button';
 import { Card, CardContent } from '@documenso/ui/primitives/card';
-import { LazyPDFViewer } from '@documenso/ui/primitives/lazy-pdf-viewer';
+import { PDFViewer } from '@documenso/ui/primitives/pdf-viewer';

 import { DocumentHistorySheet } from '~/components/general/document/document-history-sheet';
 import { DocumentPageViewButton } from '~/components/general/document/document-page-view-button';
@@ -196,7 +196,7 @@ export default function DocumentPage() {
          gradient
        >
          <CardContent className="p-2">
-            <LazyPDFViewer document={document} key={documentData.id} documentData={documentData} />
+            <PDFViewer document={document} key={documentData.id} documentData={documentData} />
          </CardContent>
        </Card>

--- a/apps/remix/app/routes/_authenticated+/settings+/billing.tsx
+++ b/apps/remix/app/routes/_authenticated+/settings+/billing.tsx
@@ -16,6 +16,7 @@ import { getSubscriptionsByUserId } from '@documenso/lib/server-only/subscriptio
 import { BillingPlans } from '~/components/general/billing-plans';
 import { BillingPortalButton } from '~/components/general/billing-portal-button';
 import { appMetaTags } from '~/utils/meta';
+import { superLoaderJson, useSuperLoaderData } from '~/utils/super-json-loader';

 import type { Route } from './+types/billing';

@@ -62,17 +63,17 @@ export async function loader({ request }: Route.LoaderArgs) {
  const isMissingOrInactiveOrFreePlan =
    !subscription || subscription.status === SubscriptionStatus.INACTIVE;

-  return {
+  return superLoaderJson({
    prices,
    subscription,
    subscriptionProductName: subscriptionProduct?.name,
    isMissingOrInactiveOrFreePlan,
-  };
+  });
 }

-export default function TeamsSettingBillingPage({ loaderData }: Route.ComponentProps) {
+export default function TeamsSettingBillingPage() {
  const { prices, subscription, subscriptionProductName, isMissingOrInactiveOrFreePlan } =
-    loaderData;
+    useSuperLoaderData<typeof loader>();

  const { i18n } = useLingui();

--- a/apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.billing.tsx
+++ b/apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings.billing.tsx
@@ -14,6 +14,7 @@ import { Card, CardContent } from '@documenso/ui/primitives/card';
 import { SettingsHeader } from '~/components/general/settings-header';
 import { TeamBillingPortalButton } from '~/components/general/teams/team-billing-portal-button';
 import { TeamSettingsBillingInvoicesTable } from '~/components/tables/team-settings-billing-invoices-table';
+import { superLoaderJson, useSuperLoaderData } from '~/utils/super-json-loader';

 import type { Route } from './+types/settings.billing';

@@ -31,16 +32,16 @@ export async function loader({ request, params }: Route.LoaderArgs) {
    teamSubscription = await stripe.subscriptions.retrieve(team.subscription.planId);
  }

-  return {
+  return superLoaderJson({
    team,
    teamSubscription,
-  };
+  });
 }

-export default function TeamsSettingBillingPage({ loaderData }: Route.ComponentProps) {
+export default function TeamsSettingBillingPage() {
  const { _ } = useLingui();

-  const { team, teamSubscription } = loaderData;
+  const { team, teamSubscription } = useSuperLoaderData<typeof loader>();

  const canManageBilling = canExecuteTeamAction('MANAGE_BILLING', team.currentTeamMember.role);

--- a/apps/remix/app/routes/_authenticated+/templates.$id._index.tsx
+++ b/apps/remix/app/routes/_authenticated+/templates.$id._index.tsx
@@ -9,7 +9,7 @@ import { getTemplateById } from '@documenso/lib/server-only/template/get-templat
 import { formatDocumentsPath, formatTemplatesPath } from '@documenso/lib/utils/teams';
 import { Button } from '@documenso/ui/primitives/button';
 import { Card, CardContent } from '@documenso/ui/primitives/card';
-import { LazyPDFViewer } from '@documenso/ui/primitives/lazy-pdf-viewer';
+import { PDFViewer } from '@documenso/ui/primitives/pdf-viewer';

 import { TemplateBulkSendDialog } from '~/components/dialogs/template-bulk-send-dialog';
 import { TemplateDirectLinkDialogWrapper } from '~/components/dialogs/template-direct-link-dialog-wrapper';
@@ -144,11 +144,7 @@ export default function TemplatePage() {
          gradient
        >
          <CardContent className="p-2">
-            <LazyPDFViewer
-              document={template}
-              key={template.id}
-              documentData={templateDocumentData}
-            />
+            <PDFViewer document={template} key={template.id} documentData={templateDocumentData} />
          </CardContent>
        </Card>

--- a/apps/remix/app/routes/_index.tsx
+++ b/apps/remix/app/routes/_index.tsx
@@ -1,15 +1,48 @@
 import { redirect } from 'react-router';

+import { extractCookieFromHeaders } from '@documenso/auth/server/lib/utils/cookies';
 import { getOptionalSession } from '@documenso/auth/server/lib/utils/get-session';
+import { getTeams } from '@documenso/lib/server-only/team/get-teams';
+import { formatDocumentsPath } from '@documenso/lib/utils/teams';
+import { ZTeamUrlSchema } from '@documenso/trpc/server/team-router/schema';

 import type { Route } from './+types/_index';

 export async function loader({ request }: Route.LoaderArgs) {
-  const { isAuthenticated } = await getOptionalSession(request);
+  const session = await getOptionalSession(request);

-  if (isAuthenticated) {
+  if (session.isAuthenticated) {
+    const teamUrlCookie = extractCookieFromHeaders('preferred-team-url', request.headers);
+
+    const referrer = request.headers.get('referer');
+    let isReferrerFromTeamUrl = false;
+
+    if (referrer) {
+      const referrerUrl = new URL(referrer);
+
+      if (referrerUrl.pathname.startsWith('/t/')) {
+        isReferrerFromTeamUrl = true;
+      }
+    }
+
+    const preferredTeamUrl =
+      teamUrlCookie && ZTeamUrlSchema.safeParse(teamUrlCookie).success ? teamUrlCookie : undefined;
+
+    // Early return for no preferred team.
+    if (!preferredTeamUrl || isReferrerFromTeamUrl) {
      throw redirect('/documents');
    }

+    const teams = await getTeams({ userId: session.user.id });
+
+    const currentTeam = teams.find((team) => team.url === preferredTeamUrl);
+
+    if (!currentTeam) {
+      throw redirect('/documents');
+    }
+
+    throw redirect(formatDocumentsPath(currentTeam.url));
+  }
+
  throw redirect('/signin');
 }
--- a/apps/remix/app/routes/_redirects+/ingest.$.tsx
+++ b/apps/remix/app/routes/_redirects+/ingest.$.tsx
@@ -19,18 +19,30 @@ const posthogProxy = async (request: Request) => {
  const headers = new Headers(request.headers);
  headers.set('host', hostname);

-  const response = await fetch(newUrl, {
+  const fetchOptions: RequestInit = {
    method: request.method,
    headers,
-    body: request.body,
-    // @ts-expect-error - Not really sure about this
-    duplex: 'half',
-  });
+    redirect: 'follow',
+  };
+
+  if (!['GET', 'HEAD'].includes(request.method)) {
+    fetchOptions.body = request.body;
+    // @ts-expect-error - It should exist
+    fetchOptions.duplex = 'half';
+  }
+
+  const response = await fetch(newUrl, fetchOptions);
+
+  const responseHeaders = new Headers(response.headers);
+  responseHeaders.delete('content-encoding');
+  responseHeaders.delete('content-length');
+  responseHeaders.delete('transfer-encoding');
+  responseHeaders.delete('cookie');

  return new Response(response.body, {
    status: response.status,
    statusText: response.statusText,
-    headers: response.headers,
+    headers: responseHeaders,
  });
 };

--- a/apps/remix/app/routes/embed+/direct.$url.tsx
+++ b/apps/remix/app/routes/embed+/direct.$url.tsx
@@ -145,7 +145,9 @@ export default function EmbedDirectTemplatePage() {
            recipient={recipient}
            fields={fields}
            metadata={template.templateMeta}
-            hidePoweredBy={isPlatformDocument || isEnterpriseDocument || hidePoweredBy}
+            hidePoweredBy={
+              isCommunityPlan || isPlatformDocument || isEnterpriseDocument || hidePoweredBy
+            }
            allowWhiteLabelling={isCommunityPlan || isPlatformDocument || isEnterpriseDocument}
          />
        </DocumentSigningRecipientProvider>
--- a/apps/remix/app/routes/embed+/sign.$url.tsx
+++ b/apps/remix/app/routes/embed+/sign.$url.tsx
@@ -169,7 +169,9 @@ export default function EmbedSignDocumentPage() {
          fields={fields}
          metadata={document.documentMeta}
          isCompleted={document.status === DocumentStatus.COMPLETED}
-          hidePoweredBy={isPlatformDocument || isEnterpriseDocument || hidePoweredBy}
+          hidePoweredBy={
+            isCommunityPlan || isPlatformDocument || isEnterpriseDocument || hidePoweredBy
+          }
          allowWhitelabelling={isCommunityPlan || isPlatformDocument || isEnterpriseDocument}
          allRecipients={allRecipients}
        />
--- a/apps/remix/app/types/empty-module.ts
+++ b/apps/remix/app/types/empty-module.ts
@@ -0,0 +1 @@
+export default {};
--- a/apps/remix/package.json
+++ b/apps/remix/package.json
@@ -49,8 +49,8 @@
    "luxon": "^3.4.0",
    "papaparse": "^5.4.1",
    "plausible-tracker": "^0.3.9",
-    "posthog-js": "^1.223.3",
-    "posthog-node": "^4.7.0",
+    "posthog-js": "^1.224.0",
+    "posthog-node": "^4.8.1",
    "react": "^18",
    "react-call": "^1.3.0",
    "react-dom": "^18",
@@ -76,7 +76,7 @@
    "@babel/preset-typescript": "^7.26.0",
    "@lingui/babel-plugin-lingui-macro": "^5.2.0",
    "@lingui/vite-plugin": "^5.2.0",
-    "@react-router/dev": "^7.1.1",
+    "@react-router/dev": "^7.1.5",
    "@react-router/remix-routes-option-adapter": "^7.1.5",
    "@rollup/plugin-babel": "^6.0.4",
    "@rollup/plugin-commonjs": "^28.0.2",
--- a/apps/remix/server/middleware.ts
+++ b/apps/remix/server/middleware.ts
@@ -0,0 +1,75 @@
+import type { Context, Next } from 'hono';
+import { deleteCookie, setCookie } from 'hono/cookie';
+
+import { AppDebugger } from '@documenso/lib/utils/debugger';
+
+const debug = new AppDebugger('Middleware');
+
+/**
+ * Middleware for initial page loads.
+ *
+ * You won't be able to easily handle sequential page loads because they will be
+ * called under `path.data`
+ *
+ * Example an initial page load would be `/documents` then if the user click templates
+ * the path here would be `/templates.data`.
+ */
+export const appMiddleware = async (c: Context, next: Next) => {
+  const { req } = c;
+  const { path } = req;
+
+  // Paths to ignore.
+  if (nonPagePathRegex.test(path)) {
+    return next();
+  }
+
+  // PRE-HANDLER CODE: Place code here to execute BEFORE the route handler runs.
+
+  await next();
+
+  // POST-HANDLER CODE: Place code here to execute AFTER the route handler completes.
+  // This is useful for:
+  // - Setting cookies
+  // - Any operations that should happen after all route handlers but before sending the response
+
+  debug.log('Path', path);
+
+  const pathname = path.replace('.data', '');
+  const referrer = c.req.header('referer');
+  const referrerUrl = referrer ? new URL(referrer) : null;
+  const referrerPathname = referrerUrl ? referrerUrl.pathname : null;
+
+  // Whether to reset the preferred team url cookie if the user accesses a non team page from a team page.
+  const resetPreferredTeamUrl =
+    referrerPathname &&
+    referrerPathname.startsWith('/t/') &&
+    (!pathname.startsWith('/t/') || pathname === '/');
+
+  // Set the preferred team url cookie if user accesses a team page.
+  if (pathname.startsWith('/t/')) {
+    debug.log('Setting preferred team url cookie');
+
+    setCookie(c, 'preferred-team-url', pathname.split('/')[2], {
+      sameSite: 'lax',
+    });
+
+    return;
+  }
+
+  // Clear preferred team url cookie if user accesses a non team page from a team page.
+  if (resetPreferredTeamUrl || pathname === '/documents') {
+    debug.log('Deleting preferred team url cookie');
+
+    deleteCookie(c, 'preferred-team-url');
+
+    return;
+  }
+};
+
+// This regex matches any path that:
+// 1. Starts with /api/, /ingest/, /__manifest/, or /assets/
+// 2. Starts with /apple- (like /apple-touch-icon.png)
+// 3. Starts with /favicon (like /favicon.ico)
+// The ^ ensures matching from the beginning of the string
+// The | acts as OR operator between different patterns
+const nonPagePathRegex = /^(\/api\/|\/ingest\/|\/__manifest|\/assets\/|\/apple-.*|\/favicon.*)/;
--- a/apps/remix/server/router.ts
+++ b/apps/remix/server/router.ts
@@ -9,6 +9,7 @@ import { openApiDocument } from '@documenso/trpc/server/open-api';

 import { filesRoute } from './api/files';
 import { type AppContext, appContext } from './context';
+import { appMiddleware } from './middleware';
 import { openApiTrpcServerHandler } from './trpc/hono-trpc-open-api';
 import { reactRouterTrpcServer } from './trpc/hono-trpc-remix';

@@ -26,6 +27,11 @@ const app = new Hono<HonoEnv>();
 app.use(contextStorage());
 app.use(appContext);

+/**
+ * RR7 app middleware.
+ */
+app.use('*', appMiddleware);
+
 // Auth server.
 app.route('/api/auth', auth);

--- a/apps/remix/vite.config.ts
+++ b/apps/remix/vite.config.ts
@@ -46,6 +46,7 @@ export default defineConfig({
      https: 'node:https',
      '.prisma/client/default': '../../node_modules/.prisma/client/default.js',
      '.prisma/client/index-browser': '../../node_modules/.prisma/client/index-browser.js',
+      canvas: './app/types/empty-module.ts',
    },
  },
  /**
--- a/lingui.config.ts
+++ b/lingui.config.ts
@@ -1,4 +1,6 @@
+import { defineConfig } from '@lingui/cli';
 import type { LinguiConfig } from '@lingui/conf';
+import { formatter } from '@lingui/format-po';

 import { APP_I18N_OPTIONS } from '@documenso/lib/constants/i18n';

@@ -14,6 +16,7 @@ const config: LinguiConfig = {
    },
  ],
  compileNamespace: 'es',
+  format: formatter({ lineNumbers: false }),
 };

 export default config;
--- a/package-lock.json
+++ b/package-lock.json
@@ -131,8 +131,8 @@
        "luxon": "^3.4.0",
        "papaparse": "^5.4.1",
        "plausible-tracker": "^0.3.9",
-        "posthog-js": "^1.223.3",
-        "posthog-node": "^4.7.0",
+        "posthog-js": "^1.224.0",
+        "posthog-node": "^4.8.1",
        "react": "^18",
        "react-call": "^1.3.0",
        "react-dom": "^18",
@@ -158,7 +158,7 @@
        "@babel/preset-typescript": "^7.26.0",
        "@lingui/babel-plugin-lingui-macro": "^5.2.0",
        "@lingui/vite-plugin": "^5.2.0",
-        "@react-router/dev": "^7.1.1",
+        "@react-router/dev": "^7.1.5",
        "@react-router/remix-routes-option-adapter": "^7.1.5",
        "@rollup/plugin-babel": "^6.0.4",
        "@rollup/plugin-commonjs": "^28.0.2",
@@ -902,9 +902,9 @@
      }
    },
    "apps/remix/node_modules/posthog-node": {
-      "version": "4.7.0",
-      "resolved": "https://registry.npmjs.org/posthog-node/-/posthog-node-4.7.0.tgz",
-      "integrity": "sha512-RgdUKSW8MfMOkjUa8cYVqWndNjPePNuuxlGbrZC6z1WRBsVc6TdGl8caidmC10RW8mu/BOfmrGbP4cRTo2jARg==",
+      "version": "4.8.1",
+      "resolved": "https://registry.npmjs.org/posthog-node/-/posthog-node-4.8.1.tgz",
+      "integrity": "sha512-ApMEC1+DbctP/88+VhaCl8SRKpIoReibMf7Mb3rxw3yMthr1rKaM4opbHdZJ0buLhwS5zX8B2ckqLjpwpSjRPg==",
      "license": "MIT",
      "dependencies": {
        "axios": "^1.7.4"
@@ -31060,9 +31060,9 @@
      "license": "MIT"
    },
    "node_modules/posthog-js": {
-      "version": "1.223.3",
-      "resolved": "https://registry.npmjs.org/posthog-js/-/posthog-js-1.223.3.tgz",
-      "integrity": "sha512-ZQTc17M21IzkQmECJa2Xjont4tZrvIn252uGT3sTfmahTqZoW4j+kBj4eOJt9SNR6hOheFNkg7MSiI/rA6FaDA==",
+      "version": "1.224.0",
+      "resolved": "https://registry.npmjs.org/posthog-js/-/posthog-js-1.224.0.tgz",
+      "integrity": "sha512-JT1XQQeYs0CKb4lU2vujmeLTDLWc61I5lT7d6oG/H/cnCpXAqBi5rMuCFFeotHeMy3hqJ/Tpu3eAPFE2p5ErHA==",
      "license": "MIT",
      "dependencies": {
        "core-js": "^3.38.1",
@@ -41567,6 +41567,7 @@
        "pdf-lib": "^1.17.1",
        "pg": "^8.11.3",
        "playwright": "1.43.0",
+        "posthog-js": "^1.224.0",
        "react": "^18",
        "remeda": "^2.17.3",
        "sharp": "0.32.6",
--- a/packages/api/hono.ts
+++ b/packages/api/hono.ts
@@ -1,4 +1,4 @@
-import { fetchRequestHandler } from '@ts-rest/serverless/fetch';
+import { TsRestHttpError, fetchRequestHandler } from '@ts-rest/serverless/fetch';
 import { Hono } from 'hono';

 import { ApiContractV1 } from '@documenso/api/v1/contract';
@@ -29,6 +29,12 @@ tsRestHonoApp.mount('/', async (request) => {
    request,
    contract: ApiContractV1,
    router: ApiContractV1Implementation,
-    options: {},
+    options: {
+      errorHandler: (err) => {
+        if (err instanceof TsRestHttpError && err.statusCode === 500) {
+          console.error(err);
+        }
+      },
+    },
  });
 });
--- a/packages/api/v1/implementation.ts
+++ b/packages/api/v1/implementation.ts
@@ -1,3 +1,5 @@
+import type { Prisma } from '@prisma/client';
+import { DocumentDataType, DocumentStatus, SigningStatus, TeamMemberRole } from '@prisma/client';
 import { tsr } from '@ts-rest/serverless/fetch';
 import { match } from 'ts-pattern';

@@ -50,13 +52,6 @@ import {
 } from '@documenso/lib/universal/upload/server-actions';
 import { createDocumentAuditLogData } from '@documenso/lib/utils/document-audit-logs';
 import { prisma } from '@documenso/prisma';
-import type { Prisma } from '@documenso/prisma/client';
-import {
-  DocumentDataType,
-  DocumentStatus,
-  SigningStatus,
-  TeamMemberRole,
-} from '@documenso/prisma/client';

 import { ApiContractV1 } from './contract';
 import { authenticatedMiddleware } from './middleware/authenticated';
--- a/packages/api/v1/middleware/authenticated.ts
+++ b/packages/api/v1/middleware/authenticated.ts
@@ -1,10 +1,10 @@
+import type { Team, User } from '@prisma/client';
 import type { TsRestRequest } from '@ts-rest/serverless';

 import { AppError, AppErrorCode } from '@documenso/lib/errors/app-error';
 import { getApiTokenByToken } from '@documenso/lib/server-only/public-api/get-api-token-by-token';
 import type { ApiRequestMetadata } from '@documenso/lib/universal/extract-request-metadata';
 import { extractRequestMetadata } from '@documenso/lib/universal/extract-request-metadata';
-import type { Team, User } from '@documenso/prisma/client';

 type B = {
  // appRoute: any;
--- a/packages/api/v1/schema.ts
+++ b/packages/api/v1/schema.ts
@@ -1,4 +1,16 @@
 import { extendZodWithOpenApi } from '@anatine/zod-openapi';
+import {
+  DocumentDataType,
+  DocumentDistributionMethod,
+  DocumentSigningOrder,
+  FieldType,
+  ReadStatus,
+  RecipientRole,
+  SendStatus,
+  SigningStatus,
+  TeamMemberRole,
+  TemplateType,
+} from '@prisma/client';
 import { z } from 'zod';

 import { DATE_FORMATS, DEFAULT_DOCUMENT_DATE_FORMAT } from '@documenso/lib/constants/date-formats';
@@ -12,18 +24,6 @@ import {
 } from '@documenso/lib/types/document-auth';
 import { ZDocumentEmailSettingsSchema } from '@documenso/lib/types/document-email';
 import { ZFieldMetaSchema } from '@documenso/lib/types/field-meta';
-import {
-  DocumentDataType,
-  DocumentDistributionMethod,
-  DocumentSigningOrder,
-  FieldType,
-  ReadStatus,
-  RecipientRole,
-  SendStatus,
-  SigningStatus,
-  TeamMemberRole,
-  TemplateType,
-} from '@documenso/prisma/client';

 extendZodWithOpenApi(z);

--- a/packages/app-tests/e2e/api/v1/team-user-management.spec.ts
+++ b/packages/app-tests/e2e/api/v1/team-user-management.spec.ts
@@ -1,4 +1,5 @@
 import { expect, test } from '@playwright/test';
+import { TeamMemberRole } from '@prisma/client';

 import {
  ZFindTeamMembersResponseSchema,
@@ -10,7 +11,6 @@ import {
 import { NEXT_PUBLIC_WEBAPP_URL } from '@documenso/lib/constants/app';
 import { createApiToken } from '@documenso/lib/server-only/public-api/create-api-token';
 import { prisma } from '@documenso/prisma';
-import { TeamMemberRole } from '@documenso/prisma/client';
 import { seedTeam } from '@documenso/prisma/seed/teams';
 import { seedUser } from '@documenso/prisma/seed/users';

--- a/packages/app-tests/e2e/document-auth/action-auth.spec.ts
+++ b/packages/app-tests/e2e/document-auth/action-auth.spec.ts
@@ -1,11 +1,11 @@
 import { expect, test } from '@playwright/test';
+import { FieldType } from '@prisma/client';

 import { ZRecipientAuthOptionsSchema } from '@documenso/lib/types/document-auth';
 import {
  createDocumentAuthOptions,
  createRecipientAuthOptions,
 } from '@documenso/lib/utils/document-auth';
-import { FieldType } from '@documenso/prisma/client';
 import {
  seedPendingDocumentNoFields,
  seedPendingDocumentWithFullFields,
--- a/packages/app-tests/e2e/document-flow/stepper-component.spec.ts
+++ b/packages/app-tests/e2e/document-flow/stepper-component.spec.ts
@@ -1,16 +1,16 @@
 import { expect, test } from '@playwright/test';
-import { DateTime } from 'luxon';
-import path from 'node:path';
-
-import { getRecipientByEmail } from '@documenso/lib/server-only/recipient/get-recipient-by-email';
-import { prisma } from '@documenso/prisma';
 import {
  DocumentSigningOrder,
  DocumentStatus,
  FieldType,
  RecipientRole,
  SigningStatus,
-} from '@documenso/prisma/client';
+} from '@prisma/client';
+import { DateTime } from 'luxon';
+import path from 'node:path';
+
+import { getRecipientByEmail } from '@documenso/lib/server-only/recipient/get-recipient-by-email';
+import { prisma } from '@documenso/prisma';
 import {
  seedBlankDocument,
  seedPendingDocumentWithFullFields,
--- a/packages/app-tests/e2e/features/include-document-certificate.spec.ts
+++ b/packages/app-tests/e2e/features/include-document-certificate.spec.ts
@@ -1,10 +1,10 @@
 import { expect, test } from '@playwright/test';
+import { DocumentStatus, FieldType } from '@prisma/client';
 import { PDFDocument } from 'pdf-lib';

 import { getDocumentByToken } from '@documenso/lib/server-only/document/get-document-by-token';
 import { getFile } from '@documenso/lib/universal/upload/get-file';
 import { prisma } from '@documenso/prisma';
-import { DocumentStatus, FieldType } from '@documenso/prisma/client';
 import { seedPendingDocumentWithFullFields } from '@documenso/prisma/seed/documents';
 import { seedTeam } from '@documenso/prisma/seed/teams';
 import { seedUser } from '@documenso/prisma/seed/users';
--- a/packages/app-tests/e2e/teams/search-documents.spec.ts
+++ b/packages/app-tests/e2e/teams/search-documents.spec.ts
@@ -1,6 +1,6 @@
 import { expect, test } from '@playwright/test';
+import { DocumentStatus, TeamMemberRole } from '@prisma/client';

-import { DocumentStatus, TeamMemberRole } from '@documenso/prisma/client';
 import { seedDocuments, seedTeamDocuments } from '@documenso/prisma/seed/documents';
 import { seedTeam, seedTeamMember } from '@documenso/prisma/seed/teams';
 import { seedUser } from '@documenso/prisma/seed/users';
--- a/packages/app-tests/e2e/teams/team-documents.spec.ts
+++ b/packages/app-tests/e2e/teams/team-documents.spec.ts
@@ -1,6 +1,6 @@
 import { expect, test } from '@playwright/test';
+import { DocumentStatus, DocumentVisibility, TeamMemberRole } from '@prisma/client';

-import { DocumentStatus, DocumentVisibility, TeamMemberRole } from '@documenso/prisma/client';
 import { seedBlankDocument } from '@documenso/prisma/seed/documents';
 import { seedDocuments, seedTeamDocuments } from '@documenso/prisma/seed/documents';
 import { seedTeam, seedTeamEmail, seedTeamMember } from '@documenso/prisma/seed/teams';
--- a/packages/app-tests/e2e/templates-flow/template-settings-step.spec.ts
+++ b/packages/app-tests/e2e/templates-flow/template-settings-step.spec.ts
@@ -1,7 +1,7 @@
 import { expect, test } from '@playwright/test';
+import { TeamMemberRole } from '@prisma/client';

 import { prisma } from '@documenso/prisma';
-import { TeamMemberRole } from '@documenso/prisma/client';
 import { seedUserSubscription } from '@documenso/prisma/seed/subscriptions';
 import { seedTeam } from '@documenso/prisma/seed/teams';
 import { seedBlankTemplate } from '@documenso/prisma/seed/templates';
@@ -12,7 +12,7 @@ import { apiSignin } from '../fixtures/authentication';
 test.describe.configure({ mode: 'parallel' });

 test.describe('[EE_ONLY]', () => {
-  const enterprisePriceId = process.env.NEXT_PUBLIC_STRIPE_ENTERPRISE_PLAN_MONTHLY_PRICE_ID || '';
+  const enterprisePriceId = '';

  test.beforeEach(() => {
    test.skip(
--- a/packages/app-tests/e2e/templates/create-document-from-template.spec.ts
+++ b/packages/app-tests/e2e/templates/create-document-from-template.spec.ts
@@ -1,11 +1,11 @@
 import { expect, test } from '@playwright/test';
+import { DocumentDataType, TeamMemberRole } from '@prisma/client';
 import fs from 'fs';
 import os from 'os';
 import path from 'path';

 import { extractDocumentAuthMethods } from '@documenso/lib/utils/document-auth';
 import { prisma } from '@documenso/prisma';
-import { DocumentDataType, TeamMemberRole } from '@documenso/prisma/client';
 import { seedUserSubscription } from '@documenso/prisma/seed/subscriptions';
 import { seedTeam } from '@documenso/prisma/seed/teams';
 import { seedBlankTemplate } from '@documenso/prisma/seed/templates';
@@ -15,7 +15,7 @@ import { apiSignin } from '../fixtures/authentication';

 test.describe.configure({ mode: 'parallel' });

-const enterprisePriceId = process.env.NEXT_PUBLIC_STRIPE_ENTERPRISE_PLAN_MONTHLY_PRICE_ID || '';
+const enterprisePriceId = '';

 // Create a temporary PDF file for testing
 function createTempPdfFile() {
--- a/packages/auth/server/lib/session/session-cookies.ts
+++ b/packages/auth/server/lib/session/session-cookies.ts
@@ -10,6 +10,7 @@ import { appLog } from '@documenso/lib/utils/debugger';
 import { env } from '@documenso/lib/utils/env';

 import { AUTH_SESSION_LIFETIME } from '../../config';
+import { extractCookieFromHeaders } from '../utils/cookies';
 import { generateSessionToken } from './session';

 export const sessionCookieName = formatSecureCookieName('sessionId');
@@ -38,15 +39,7 @@ export const sessionCookieOptions = {
 } as const;

 export const extractSessionCookieFromHeaders = (headers: Headers): string | null => {
-  const cookieHeader = headers.get('cookie') || '';
-  const cookiePairs = cookieHeader.split(';');
-  const sessionCookie = cookiePairs.find((pair) => pair.trim().startsWith(sessionCookieName));
-
-  if (!sessionCookie) {
-    return null;
-  }
-
-  return sessionCookie.split('=')[1].trim();
+  return extractCookieFromHeaders(sessionCookieName, headers);
 };

 /**
--- a/packages/auth/server/lib/utils/cookies.ts
+++ b/packages/auth/server/lib/utils/cookies.ts
@@ -0,0 +1,14 @@
+/**
+ * Todo: Use library for cookies instead.
+ */
+export const extractCookieFromHeaders = (cookieName: string, headers: Headers): string | null => {
+  const cookieHeader = headers.get('cookie') || '';
+  const cookiePairs = cookieHeader.split(';');
+  const cookie = cookiePairs.find((pair) => pair.trim().startsWith(cookieName));
+
+  if (!cookie) {
+    return null;
+  }
+
+  return cookie.split('=')[1].trim();
+};
--- a/packages/auth/server/lib/utils/handle-oauth-callback-url.ts
+++ b/packages/auth/server/lib/utils/handle-oauth-callback-url.ts
@@ -1,3 +1,4 @@
+import { UserSecurityAuditLogType } from '@prisma/client';
 import { OAuth2Client, decodeIdToken } from 'arctic';
 import type { Context } from 'hono';
 import { deleteCookie } from 'hono/cookie';
@@ -6,7 +7,6 @@ import { nanoid } from 'nanoid';
 import { AppError, AppErrorCode } from '@documenso/lib/errors/app-error';
 import { onCreateUserHook } from '@documenso/lib/server-only/user/create-user';
 import { prisma } from '@documenso/prisma';
-import { UserSecurityAuditLogType } from '@documenso/prisma/client';

 import type { OAuthClientOptions } from '../../config';
 import { AuthenticationErrorCode } from '../errors/error-codes';
--- a/packages/auth/server/routes/email-password.ts
+++ b/packages/auth/server/routes/email-password.ts
@@ -1,5 +1,6 @@
 import { sValidator } from '@hono/standard-validator';
 import { compare } from '@node-rs/bcrypt';
+import { UserSecurityAuditLogType } from '@prisma/client';
 import { Hono } from 'hono';
 import { DateTime } from 'luxon';
 import { z } from 'zod';
@@ -22,7 +23,6 @@ import { updatePassword } from '@documenso/lib/server-only/user/update-password'
 import { verifyEmail } from '@documenso/lib/server-only/user/verify-email';
 import { env } from '@documenso/lib/utils/env';
 import { prisma } from '@documenso/prisma';
-import { UserSecurityAuditLogType } from '@documenso/prisma/client';

 import { AuthenticationErrorCode } from '../lib/errors/error-codes';
 import { getCsrfCookie } from '../lib/session/session-cookies';
--- a/packages/ee/server-only/limits/server.ts
+++ b/packages/ee/server-only/limits/server.ts
@@ -1,8 +1,8 @@
+import { DocumentSource, SubscriptionStatus } from '@prisma/client';
 import { DateTime } from 'luxon';

 import { IS_BILLING_ENABLED } from '@documenso/lib/constants/app';
 import { prisma } from '@documenso/prisma';
-import { DocumentSource, SubscriptionStatus } from '@documenso/prisma/client';

 import { getDocumentRelatedPrices } from '../stripe/get-document-related-prices.ts';
 import { FREE_PLAN_LIMITS, SELFHOSTED_PLAN_LIMITS, TEAM_PLAN_LIMITS } from './constants';
--- a/packages/ee/server-only/stripe/get-customer.ts
+++ b/packages/ee/server-only/stripe/get-customer.ts
@@ -1,7 +1,8 @@
+import type { User } from '@prisma/client';
+
 import { STRIPE_CUSTOMER_TYPE } from '@documenso/lib/constants/billing';
 import { stripe } from '@documenso/lib/server-only/stripe';
 import { prisma } from '@documenso/prisma';
-import type { User } from '@documenso/prisma/client';

 import { onSubscriptionUpdated } from './webhook/on-subscription-updated';

--- a/packages/ee/server-only/stripe/get-prices-by-plan.ts
+++ b/packages/ee/server-only/stripe/get-prices-by-plan.ts
@@ -4,15 +4,14 @@ import { stripe } from '@documenso/lib/server-only/stripe';
 type PlanType = (typeof STRIPE_PLAN_TYPE)[keyof typeof STRIPE_PLAN_TYPE];

 export const getPricesByPlan = async (plan: PlanType | PlanType[]) => {
-  const planTypes = typeof plan === 'string' ? [plan] : plan;
+  const planTypes: string[] = typeof plan === 'string' ? [plan] : plan;

-  const query = planTypes.map((planType) => `metadata['plan']:'${planType}'`).join(' OR ');
-
-  const { data: prices } = await stripe.prices.search({
-    query,
+  const prices = await stripe.prices.list({
    expand: ['data.product'],
    limit: 100,
  });

-  return prices.filter((price) => price.type === 'recurring');
+  return prices.data.filter(
+    (price) => price.type === 'recurring' && planTypes.includes(price.metadata.plan),
+  );
 };
--- a/packages/ee/server-only/stripe/transfer-team-subscription.ts
+++ b/packages/ee/server-only/stripe/transfer-team-subscription.ts
@@ -1,10 +1,10 @@
+import { type Subscription, type Team, type User } from '@prisma/client';
 import type Stripe from 'stripe';

 import { AppError, AppErrorCode } from '@documenso/lib/errors/app-error';
 import { stripe } from '@documenso/lib/server-only/stripe';
 import { subscriptionsContainsActivePlan } from '@documenso/lib/utils/billing';
 import { prisma } from '@documenso/prisma';
-import { type Subscription, type Team, type User } from '@documenso/prisma/client';

 import { deleteCustomerPaymentMethods } from './delete-customer-payment-methods';
 import { getTeamPrices } from './get-team-prices';
--- a/packages/ee/server-only/stripe/webhook/on-subscription-deleted.ts
+++ b/packages/ee/server-only/stripe/webhook/on-subscription-deleted.ts
@@ -1,6 +1,7 @@
+import { SubscriptionStatus } from '@prisma/client';
+
 import type { Stripe } from '@documenso/lib/server-only/stripe';
 import { prisma } from '@documenso/prisma';
-import { SubscriptionStatus } from '@documenso/prisma/client';

 export type OnSubscriptionDeletedOptions = {
  subscription: Stripe.Subscription;
--- a/packages/ee/server-only/stripe/webhook/on-subscription-updated.ts
+++ b/packages/ee/server-only/stripe/webhook/on-subscription-updated.ts
@@ -1,9 +1,9 @@
+import type { Prisma } from '@prisma/client';
+import { SubscriptionStatus } from '@prisma/client';
 import { match } from 'ts-pattern';

 import type { Stripe } from '@documenso/lib/server-only/stripe';
 import { prisma } from '@documenso/prisma';
-import type { Prisma } from '@documenso/prisma/client';
-import { SubscriptionStatus } from '@documenso/prisma/client';

 export type OnSubscriptionUpdatedOptions = {
  userId?: number;
--- a/packages/ee/server-only/util/is-community-plan.ts
+++ b/packages/ee/server-only/util/is-community-plan.ts
@@ -1,6 +1,7 @@
+import type { Subscription } from '@prisma/client';
+
 import { subscriptionsContainsActivePlan } from '@documenso/lib/utils/billing';
 import { prisma } from '@documenso/prisma';
-import type { Subscription } from '@documenso/prisma/client';

 import { getCommunityPlanPriceIds } from '../stripe/get-community-plan-prices';

--- a/packages/ee/server-only/util/is-document-enterprise.ts
+++ b/packages/ee/server-only/util/is-document-enterprise.ts
@@ -1,7 +1,8 @@
+import type { Subscription } from '@prisma/client';
+
 import { IS_BILLING_ENABLED } from '@documenso/lib/constants/app';
 import { subscriptionsContainsActivePlan } from '@documenso/lib/utils/billing';
 import { prisma } from '@documenso/prisma';
-import type { Subscription } from '@documenso/prisma/client';

 import { getEnterprisePlanPriceIds } from '../stripe/get-enterprise-plan-prices';

--- a/packages/ee/server-only/util/is-document-platform.ts
+++ b/packages/ee/server-only/util/is-document-platform.ts
@@ -1,7 +1,8 @@
+import type { Document, Subscription } from '@prisma/client';
+
 import { IS_BILLING_ENABLED } from '@documenso/lib/constants/app';
 import { subscriptionsContainsActivePlan } from '@documenso/lib/utils/billing';
 import { prisma } from '@documenso/prisma';
-import type { Document, Subscription } from '@documenso/prisma/client';

 import { getPlatformPlanPriceIds } from '../stripe/get-platform-plan-prices';

--- a/packages/email/template-components/template-document-invite.tsx
+++ b/packages/email/template-components/template-document-invite.tsx
@@ -2,10 +2,10 @@ import { useMemo } from 'react';

 import { useLingui } from '@lingui/react';
 import { Trans } from '@lingui/react/macro';
+import { RecipientRole } from '@prisma/client';
 import { P, match } from 'ts-pattern';

 import { RECIPIENT_ROLES_DESCRIPTION } from '@documenso/lib/constants/recipient-roles';
-import { RecipientRole } from '@documenso/prisma/client';

 import { Button, Section, Text } from '../components';
 import { TemplateDocumentImage } from './template-document-image';
--- a/packages/email/templates/document-created-from-direct-template.tsx
+++ b/packages/email/templates/document-created-from-direct-template.tsx
@@ -1,9 +1,9 @@
 import { msg } from '@lingui/core/macro';
 import { useLingui } from '@lingui/react';
 import { Trans } from '@lingui/react/macro';
+import { RecipientRole } from '@prisma/client';

 import { RECIPIENT_ROLES_DESCRIPTION } from '@documenso/lib/constants/recipient-roles';
-import { RecipientRole } from '@documenso/prisma/client';

 import { Body, Button, Container, Head, Html, Img, Preview, Section, Text } from '../components';
 import { useBranding } from '../providers/branding';
--- a/packages/email/templates/document-invite.tsx
+++ b/packages/email/templates/document-invite.tsx
@@ -1,9 +1,9 @@
 import { msg } from '@lingui/core/macro';
 import { useLingui } from '@lingui/react';
 import { Trans } from '@lingui/react/macro';
+import type { RecipientRole } from '@prisma/client';

 import { RECIPIENT_ROLES_DESCRIPTION } from '@documenso/lib/constants/recipient-roles';
-import type { RecipientRole } from '@documenso/prisma/client';

 import { Body, Container, Head, Hr, Html, Img, Link, Preview, Section, Text } from '../components';
 import { useBranding } from '../providers/branding';
--- a/packages/lib/client-only/providers/session.tsx
+++ b/packages/lib/client-only/providers/session.tsx
@@ -1,12 +1,12 @@
 import { createContext, useCallback, useContext, useEffect, useState } from 'react';
 import React from 'react';

+import type { Session } from '@prisma/client';
 import { useLocation } from 'react-router';

 import { authClient } from '@documenso/auth/client';
 import type { SessionUser } from '@documenso/auth/server/lib/session/session';
 import { type TGetTeamsResponse } from '@documenso/lib/server-only/team/get-teams';
-import type { Session } from '@documenso/prisma/client';
 import { trpc } from '@documenso/trpc/client';

 export type AppSession = {
--- a/packages/lib/jobs/definitions/internal/bulk-send-template.handler.ts
+++ b/packages/lib/jobs/definitions/internal/bulk-send-template.handler.ts
@@ -1,6 +1,7 @@
 import { createElement } from 'react';

 import { msg } from '@lingui/macro';
+import type { TeamGlobalSettings } from '@prisma/client';
 import { parse } from 'csv-parse/sync';
 import { z } from 'zod';

@@ -10,7 +11,6 @@ import { sendDocument } from '@documenso/lib/server-only/document/send-document'
 import { createDocumentFromTemplate } from '@documenso/lib/server-only/template/create-document-from-template';
 import { getTemplateById } from '@documenso/lib/server-only/template/get-template-by-id';
 import { prisma } from '@documenso/prisma';
-import type { TeamGlobalSettings } from '@documenso/prisma/client';

 import { getI18nInstance } from '../../../client-only/providers/i18n-server';
 import { NEXT_PUBLIC_WEBAPP_URL } from '../../../constants/app';
--- a/packages/lib/package.json
+++ b/packages/lib/package.json
@@ -45,6 +45,7 @@
    "pdf-lib": "^1.17.1",
    "pg": "^8.11.3",
    "playwright": "1.43.0",
+    "posthog-js": "^1.224.0",
    "react": "^18",
    "remeda": "^2.17.3",
    "sharp": "0.32.6",
--- a/packages/lib/server-only/field/get-fields-for-token.ts
+++ b/packages/lib/server-only/field/get-fields-for-token.ts
@@ -1,5 +1,6 @@
+import { FieldType, RecipientRole, SigningStatus } from '@prisma/client';
+
 import { prisma } from '@documenso/prisma';
-import { FieldType, RecipientRole, SigningStatus } from '@documenso/prisma/client';

 export type GetFieldsForTokenOptions = {
  token: string;
--- a/packages/lib/server-only/public-api/get-api-tokens.ts
+++ b/packages/lib/server-only/public-api/get-api-tokens.ts
@@ -1,5 +1,6 @@
+import { TeamMemberRole } from '@prisma/client';
+
 import { prisma } from '@documenso/prisma';
-import { TeamMemberRole } from '@documenso/prisma/client';

 export type GetApiTokensOptions = {
  userId: number;
--- a/packages/lib/server-only/recipient/get-recipients-for-assistant.ts
+++ b/packages/lib/server-only/recipient/get-recipients-for-assistant.ts
@@ -1,5 +1,6 @@
+import { FieldType } from '@prisma/client';
+
 import { prisma } from '@documenso/prisma';
-import { FieldType } from '@documenso/prisma/client';

 import { AppError, AppErrorCode } from '../../errors/app-error';

--- a/packages/lib/translations/de/web.po
+++ b/packages/lib/translations/de/web.po
--- a/packages/lib/translations/en/web.po
+++ b/packages/lib/translations/en/web.po
--- a/packages/lib/translations/es/web.po
+++ b/packages/lib/translations/es/web.po
--- a/packages/lib/translations/fr/web.po
+++ b/packages/lib/translations/fr/web.po
--- a/packages/lib/translations/it/web.po
+++ b/packages/lib/translations/it/web.po
--- a/packages/lib/translations/pl/web.po
+++ b/packages/lib/translations/pl/web.po
--- a/packages/prisma/schema.prisma
+++ b/packages/prisma/schema.prisma
@@ -15,6 +15,7 @@ generator zod {
  createInputTypes     = false
  writeBarrelFiles     = false
  useMultipleFiles     = true
+  useDefaultValidators = false
 }

 datasource db {
--- a/packages/prisma/types/document-with-recipient.ts
+++ b/packages/prisma/types/document-with-recipient.ts
@@ -1,4 +1,4 @@
-import type { Document, DocumentData, Recipient } from '@documenso/prisma/client';
+import type { Document, DocumentData, Recipient } from '@prisma/client';

 export type DocumentWithRecipients = Document & {
  recipients: Recipient[];
--- a/packages/prisma/types/field-with-signature-and-fieldmeta.ts
+++ b/packages/prisma/types/field-with-signature-and-fieldmeta.ts
@@ -1,5 +1,6 @@
+import type { Field, Signature } from '@prisma/client';
+
 import { type TFieldMetaSchema as FieldMeta } from '@documenso/lib/types/field-meta';
-import type { Field, Signature } from '@documenso/prisma/client';

 export type FieldWithSignatureAndFieldMeta = Field & {
  signature?: Signature | null;
--- a/packages/prisma/types/field-with-signature.ts
+++ b/packages/prisma/types/field-with-signature.ts
@@ -1,4 +1,4 @@
-import type { Field, Signature } from '@documenso/prisma/client';
+import type { Field, Signature } from '@prisma/client';

 export type FieldWithSignature = Field & {
  signature?: Signature | null;
--- a/packages/prisma/types/recipient-with-fields.ts
+++ b/packages/prisma/types/recipient-with-fields.ts
@@ -1,4 +1,4 @@
-import type { Field, Recipient } from '@documenso/prisma/client';
+import type { Field, Recipient } from '@prisma/client';

 export type RecipientWithFields = Recipient & {
  fields: Field[];
--- a/packages/trpc/server/context.ts
+++ b/packages/trpc/server/context.ts
@@ -1,3 +1,4 @@
+import type { Session } from '@prisma/client';
 import type { Context } from 'hono';
 import { z } from 'zod';

@@ -5,7 +6,6 @@ import type { SessionUser } from '@documenso/auth/server/lib/session/session';
 import { getOptionalSession } from '@documenso/auth/server/lib/utils/get-session';
 import type { ApiRequestMetadata } from '@documenso/lib/universal/extract-request-metadata';
 import { extractRequestMetadata } from '@documenso/lib/universal/extract-request-metadata';
-import type { Session } from '@documenso/prisma/client';

 type CreateTrpcContextOptions = {
  c: Context;
--- a/packages/trpc/server/document-router/router.ts
+++ b/packages/trpc/server/document-router/router.ts
@@ -4,7 +4,6 @@ import { DateTime } from 'luxon';

 import { getServerLimits } from '@documenso/ee/server-only/limits/server';
 import { NEXT_PUBLIC_WEBAPP_URL } from '@documenso/lib/constants/app';
-import { DOCUMENSO_ENCRYPTION_KEY } from '@documenso/lib/constants/crypto';
 import { AppError, AppErrorCode } from '@documenso/lib/errors/app-error';
 import { encryptSecondaryData } from '@documenso/lib/server-only/crypto/encrypt';
 import { createDocumentData } from '@documenso/lib/server-only/document-data/create-document-data';
@@ -26,7 +25,6 @@ import { searchDocumentsWithKeyword } from '@documenso/lib/server-only/document/
 import { sendDocument } from '@documenso/lib/server-only/document/send-document';
 import { updateDocument } from '@documenso/lib/server-only/document/update-document';
 import { getTeamById } from '@documenso/lib/server-only/team/get-team';
-import { symmetricEncrypt } from '@documenso/lib/universal/crypto';
 import { getPresignPostUrl } from '@documenso/lib/universal/upload/server-actions';

 import { authenticatedProcedure, procedure, router } from '../trpc';
@@ -55,7 +53,6 @@ import {
  ZMoveDocumentToTeamSchema,
  ZResendDocumentMutationSchema,
  ZSearchDocumentsMutationSchema,
-  ZSetPasswordForDocumentMutationSchema,
  ZSetSigningOrderForDocumentMutationSchema,
  ZSuccessResponseSchema,
  ZUpdateDocumentRequestSchema,
@@ -444,35 +441,6 @@ export const documentRouter = router({
      });
    }),

-  /**
-   * @private
-   */
-  setPasswordForDocument: authenticatedProcedure
-    .input(ZSetPasswordForDocumentMutationSchema)
-    .mutation(async ({ input, ctx }) => {
-      const { teamId } = ctx;
-      const { documentId, password } = input;
-
-      const key = DOCUMENSO_ENCRYPTION_KEY;
-
-      if (!key) {
-        throw new Error('Missing encryption key');
-      }
-
-      const securePassword = symmetricEncrypt({
-        data: password,
-        key,
-      });
-
-      await upsertDocumentMeta({
-        userId: ctx.user.id,
-        teamId,
-        documentId,
-        password: securePassword,
-        requestMetadata: ctx.metadata,
-      });
-    }),
-
  /**
   * @private
   *
--- a/packages/ui/components/document/document-dialog.tsx
+++ b/packages/ui/components/document/document-dialog.tsx
@@ -6,7 +6,7 @@ import { X } from 'lucide-react';

 import { cn } from '../../lib/utils';
 import { Dialog, DialogOverlay, DialogPortal, DialogTrigger } from '../../primitives/dialog';
-import { LazyPDFViewerNoLoader } from '../../primitives/lazy-pdf-viewer';
+import PDFViewer from '../../primitives/pdf-viewer';

 export type DocumentDialogProps = {
  trigger?: React.ReactNode;
@@ -43,7 +43,7 @@ export default function DocumentDialog({ trigger, documentData, ...props }: Docu
          )}
          onClick={() => props.onOpenChange?.(false)}
        >
-          <LazyPDFViewerNoLoader
+          <PDFViewer
            className="mx-auto w-full max-w-3xl xl:max-w-5xl"
            documentData={documentData}
            onClick={(e) => e.stopPropagation()}
--- a/packages/ui/primitives/document-flow/field-item.tsx
+++ b/packages/ui/primitives/document-flow/field-item.tsx
@@ -1,5 +1,6 @@
 import { useCallback, useEffect, useMemo, useRef, useState } from 'react';

+import { FieldType } from '@prisma/client';
 import { CopyPlus, Settings2, Trash } from 'lucide-react';
 import { createPortal } from 'react-dom';
 import { Rnd } from 'react-rnd';
@@ -174,11 +175,35 @@ export const FieldItem = ({
    () => hasFieldMetaValues('CHECKBOX', field.fieldMeta, ZCheckboxFieldMeta),
    [field.fieldMeta],
  );
+
  const radioHasValues = useMemo(
    () => hasFieldMetaValues('RADIO', field.fieldMeta, ZRadioFieldMeta),
    [field.fieldMeta],
  );

+  const hasCheckedValues = (fieldMeta: TFieldMetaSchema, type: FieldType) => {
+    if (!fieldMeta || (type !== FieldType.RADIO && type !== FieldType.CHECKBOX)) {
+      return false;
+    }
+
+    if (type === FieldType.RADIO) {
+      const parsed = ZRadioFieldMeta.parse(fieldMeta);
+      return parsed.values?.some((value) => value.checked) ?? false;
+    }
+
+    if (type === FieldType.CHECKBOX) {
+      const parsed = ZCheckboxFieldMeta.parse(fieldMeta);
+      return parsed.values?.some((value) => value.checked) ?? false;
+    }
+
+    return false;
+  };
+
+  const fieldHasCheckedValues = useMemo(
+    () => hasCheckedValues(field.fieldMeta, field.type),
+    [field.fieldMeta, field.type],
+  );
+
  const fixedSize = checkBoxHasValues || radioHasValues;

  return createPortal(
@@ -218,6 +243,21 @@ export const FieldItem = ({
        onMove?.(d.node);
      }}
    >
+      {(field.type === FieldType.RADIO || field.type === FieldType.CHECKBOX) &&
+        field.fieldMeta?.label && (
+          <div
+            className={cn(
+              'absolute -top-16 left-0 right-0 rounded-md p-2 text-center text-xs text-gray-700',
+              {
+                'bg-foreground/5 border-primary border': !fieldHasCheckedValues,
+                'bg-documenso-200 border-primary border': fieldHasCheckedValues,
+              },
+            )}
+          >
+            {field.fieldMeta.label}
+          </div>
+        )}
+
      <div
        className={cn(
          'relative flex h-full w-full items-center justify-center bg-white',
--- a/packages/ui/primitives/document-flow/field-items-advanced-settings/checkbox-field.tsx
+++ b/packages/ui/primitives/document-flow/field-items-advanced-settings/checkbox-field.tsx
@@ -125,6 +125,18 @@ export const CheckboxFieldAdvancedSettings = ({

  return (
    <div className="flex flex-col gap-4">
+      <div className="mb-2">
+        <Label>
+          <Trans>Label</Trans>
+        </Label>
+        <Input
+          id="label"
+          className="bg-background mt-2"
+          placeholder={_(msg`Field label`)}
+          value={fieldState.label}
+          onChange={(e) => handleFieldChange('label', e.target.value)}
+        />
+      </div>
      <div className="flex flex-row items-center gap-x-4">
        <div className="flex w-2/3 flex-col">
          <Label>
--- a/packages/ui/primitives/document-flow/field-items-advanced-settings/radio-field.tsx
+++ b/packages/ui/primitives/document-flow/field-items-advanced-settings/radio-field.tsx
@@ -1,5 +1,7 @@
 import { useEffect, useState } from 'react';

+import { msg } from '@lingui/core/macro';
+import { useLingui } from '@lingui/react';
 import { Trans } from '@lingui/react/macro';
 import { ChevronDown, ChevronUp, Trash } from 'lucide-react';

@@ -25,6 +27,8 @@ export const RadioFieldAdvancedSettings = ({
  handleFieldChange,
  handleErrors,
 }: RadioFieldAdvancedSettingsProps) => {
+  const { _ } = useLingui();
+
  const [showValidation, setShowValidation] = useState(false);
  const [values, setValues] = useState(
    fieldState.values ?? [{ id: 1, checked: false, value: 'Default value' }],
@@ -100,6 +104,18 @@ export const RadioFieldAdvancedSettings = ({
  return (
    <div className="flex flex-col gap-4">
      <div className="flex flex-col gap-4">
+        <div>
+          <Label>
+            <Trans>Label</Trans>
+          </Label>
+          <Input
+            id="label"
+            className="bg-background mt-2"
+            placeholder={_(msg`Field label`)}
+            value={fieldState.label}
+            onChange={(e) => handleFieldChange('label', e.target.value)}
+          />
+        </div>
        <div className="flex flex-row items-center gap-2">
          <Switch
            className="bg-background"
--- a/packages/ui/primitives/document-password-dialog.tsx
+++ b/packages/ui/primitives/document-password-dialog.tsx
@@ -1,107 +0,0 @@
-import { useEffect } from 'react';
-
-import { zodResolver } from '@hookform/resolvers/zod';
-import { msg } from '@lingui/core/macro';
-import { useLingui } from '@lingui/react';
-import { Trans } from '@lingui/react/macro';
-import { useForm } from 'react-hook-form';
-import { z } from 'zod';
-
-import { Button } from './button';
-import { Dialog, DialogContent, DialogDescription, DialogHeader, DialogTitle } from './dialog';
-import { Form, FormControl, FormField, FormItem, FormMessage } from './form/form';
-import { Input } from './input';
-
-const ZPasswordDialogFormSchema = z.object({
-  password: z.string(),
-});
-
-type TPasswordDialogFormSchema = z.infer<typeof ZPasswordDialogFormSchema>;
-
-type PasswordDialogProps = {
-  open: boolean;
-  onOpenChange: (_open: boolean) => void;
-  defaultPassword?: string;
-  onPasswordSubmit?: (password: string) => void;
-  isError?: boolean;
-};
-
-export const PasswordDialog = ({
-  open,
-  onOpenChange,
-  defaultPassword,
-  onPasswordSubmit,
-  isError,
-}: PasswordDialogProps) => {
-  const { _ } = useLingui();
-
-  const form = useForm<TPasswordDialogFormSchema>({
-    defaultValues: {
-      password: defaultPassword ?? '',
-    },
-    resolver: zodResolver(ZPasswordDialogFormSchema),
-  });
-
-  const onFormSubmit = ({ password }: TPasswordDialogFormSchema) => {
-    onPasswordSubmit?.(password);
-  };
-
-  useEffect(() => {
-    if (isError) {
-      form.setError('password', {
-        type: 'manual',
-        message: _(msg`The password you have entered is incorrect. Please try again.`),
-      });
-    }
-  }, [form, isError]);
-
-  return (
-    <Dialog open={open}>
-      <DialogContent className="w-full max-w-md">
-        <DialogHeader>
-          <DialogTitle>
-            <Trans>Password Required</Trans>
-          </DialogTitle>
-
-          <DialogDescription className="text-muted-foreground">
-            <Trans>
-              This document is password protected. Please enter the password to view the document.
-            </Trans>
-          </DialogDescription>
-        </DialogHeader>
-
-        <Form {...form}>
-          <form onSubmit={form.handleSubmit(onFormSubmit)}>
-            <fieldset className="flex flex-wrap items-start justify-between gap-4">
-              <FormField
-                name="password"
-                control={form.control}
-                render={({ field }) => (
-                  <FormItem className="relative flex-1">
-                    <FormControl>
-                      <Input
-                        type="password"
-                        className="bg-background"
-                        placeholder={_(msg`Enter password`)}
-                        autoComplete="off"
-                        {...field}
-                      />
-                    </FormControl>
-
-                    <FormMessage />
-                  </FormItem>
-                )}
-              />
-
-              <div>
-                <Button>
-                  <Trans>Submit</Trans>
-                </Button>
-              </div>
-            </fieldset>
-          </form>
-        </Form>
-      </DialogContent>
-    </Dialog>
-  );
-};
--- a/packages/ui/primitives/lazy-pdf-viewer.tsx
+++ b/packages/ui/primitives/lazy-pdf-viewer.tsx
@@ -1,31 +0,0 @@
-// Todo: (RR7) Not sure if this actually makes it client-only.
-import { Suspense, lazy } from 'react';
-
-import { Trans } from '@lingui/react/macro';
-import { Loader } from 'lucide-react';
-import { Await } from 'react-router';
-
-const LoadingComponent = () => (
-  <div className="dark:bg-background flex h-[80vh] max-h-[60rem] flex-col items-center justify-center bg-white/50">
-    <Loader className="text-documenso h-12 w-12 animate-spin" />
-    <p className="text-muted-foreground mt-4">
-      <Trans>Loading document...</Trans>
-    </p>
-  </div>
-);
-
-export const LazyPDFViewerImport = lazy(async () => import('./pdf-viewer'));
-
-export const LazyPDFViewer = (props: React.ComponentProps<typeof LazyPDFViewerImport>) => (
-  <Suspense fallback={<LoadingComponent />}>
-    <Await resolve={LazyPDFViewerImport}>
-      <LazyPDFViewerImport {...props} />
-    </Await>
-  </Suspense>
-);
-
-export const LazyPDFViewerNoLoader = (props: React.ComponentProps<typeof LazyPDFViewer>) => (
-  <Suspense fallback={null}>
-    <LazyPDFViewerImport {...props} />
-  </Suspense>
-);
--- a/packages/ui/primitives/pdf-viewer.tsx
+++ b/packages/ui/primitives/pdf-viewer.tsx
@@ -5,18 +5,15 @@ import { useLingui } from '@lingui/react';
 import { Trans } from '@lingui/react/macro';
 import type { DocumentData } from '@prisma/client';
 import { Loader } from 'lucide-react';
-import { type PDFDocumentProxy, PasswordResponses } from 'pdfjs-dist';
-import pdfWorker from 'pdfjs-dist/build/pdf.worker.min?url';
+import { type PDFDocumentProxy } from 'pdfjs-dist';
 import { Document as PDFDocument, Page as PDFPage, pdfjs } from 'react-pdf';
 import 'react-pdf/dist/esm/Page/AnnotationLayer.css';
 import 'react-pdf/dist/esm/Page/TextLayer.css';
-import { match } from 'ts-pattern';

 import { PDF_VIEWER_PAGE_SELECTOR } from '@documenso/lib/constants/pdf-viewer';
 import { getFile } from '@documenso/lib/universal/upload/get-file';

 import { cn } from '../lib/utils';
-import { PasswordDialog } from './document-password-dialog';
 import { useToast } from './use-toast';

 export type LoadedPDFDocument = PDFDocumentProxy;
@@ -24,7 +21,10 @@ export type LoadedPDFDocument = PDFDocumentProxy;
 /**
 * This imports the worker from the `pdfjs-dist` package.
 */
-pdfjs.GlobalWorkerOptions.workerSrc = pdfWorker;
+pdfjs.GlobalWorkerOptions.workerSrc = new URL(
+  'pdfjs-dist/build/pdf.worker.min.js',
+  import.meta.url,
+).toString();

 export type OnPDFViewerPageClick = (_event: {
  pageNumber: number;
@@ -49,8 +49,6 @@ const PDFLoader = () => (
 export type PDFViewerProps = {
  className?: string;
  documentData: DocumentData;
-  password?: string | null;
-  onPasswordSubmit?: (password: string) => void | Promise<void>;
  onDocumentLoad?: (_doc: LoadedPDFDocument) => void;
  onPageClick?: OnPDFViewerPageClick;
  [key: string]: unknown;
@@ -59,8 +57,6 @@ export type PDFViewerProps = {
 export const PDFViewer = ({
  className,
  documentData,
-  password: defaultPassword,
-  onPasswordSubmit,
  onDocumentLoad,
  onPageClick,
  ...props
@@ -70,11 +66,7 @@ export const PDFViewer = ({

  const $el = useRef<HTMLDivElement>(null);

-  const passwordCallbackRef = useRef<((password: string | null) => void) | null>(null);
-
  const [isDocumentBytesLoading, setIsDocumentBytesLoading] = useState(false);
-  const [isPasswordModalOpen, setIsPasswordModalOpen] = useState(false);
-  const [isPasswordError, setIsPasswordError] = useState(false);
  const [documentBytes, setDocumentBytes] = useState<Uint8Array | null>(null);

  const [width, setWidth] = useState(0);
@@ -190,21 +182,6 @@ export const PDFViewer = ({
            className={cn('w-full overflow-hidden rounded', {
              'h-[80vh] max-h-[60rem]': numPages === 0,
            })}
-            onPassword={(callback, reason) => {
-              // If the document already has a password, we don't need to ask for it again.
-              if (defaultPassword && reason !== PasswordResponses.INCORRECT_PASSWORD) {
-                callback(defaultPassword);
-                return;
-              }
-
-              setIsPasswordModalOpen(true);
-
-              passwordCallbackRef.current = callback;
-
-              match(reason)
-                .with(PasswordResponses.NEED_PASSWORD, () => setIsPasswordError(false))
-                .with(PasswordResponses.INCORRECT_PASSWORD, () => setIsPasswordError(true));
-            }}
            onLoadSuccess={(d) => onDocumentLoaded(d)}
            // Uploading a invalid document causes an error which doesn't appear to be handled by the `error` prop.
            // Therefore we add some additional custom error handling.
@@ -263,19 +240,6 @@ export const PDFViewer = ({
                </div>
              ))}
          </PDFDocument>
-
-          <PasswordDialog
-            open={isPasswordModalOpen}
-            onOpenChange={setIsPasswordModalOpen}
-            onPasswordSubmit={(password) => {
-              passwordCallbackRef.current?.(password);
-
-              setIsPasswordModalOpen(false);
-
-              void onPasswordSubmit?.(password);
-            }}
-            isError={isPasswordError}
-          />
        </>
      )}
    </div>