diff --git a/apps/remix/app/components/general/document/document-certificate-qr-view.tsx b/apps/remix/app/components/general/document/document-certificate-qr-view.tsx index a01e315cf..4f619cce7 100644 --- a/apps/remix/app/components/general/document/document-certificate-qr-view.tsx +++ b/apps/remix/app/components/general/document/document-certificate-qr-view.tsx @@ -9,6 +9,7 @@ import { EnvelopeRenderProvider, useCurrentEnvelopeRender, } from '@documenso/lib/client-only/providers/envelope-render-provider'; +import { useOptionalSession } from '@documenso/lib/client-only/providers/session'; import { formatDocumentsPath } from '@documenso/lib/utils/teams'; import { trpc } from '@documenso/trpc/react'; import PDFViewerKonvaLazy from '@documenso/ui/components/pdf-viewer/pdf-viewer-konva-lazy'; @@ -52,9 +53,12 @@ export const DocumentCertificateQRView = ({ completedDate, token, }: DocumentCertificateQRViewProps) => { - const { data: documentViaUser } = trpc.document.get.useQuery({ - documentId, - }); + const { sessionData } = useOptionalSession(); + + const { data: documentViaUser } = trpc.document.get.useQuery( + { documentId }, + { enabled: !!sessionData?.user }, + ); const [isDialogOpen, setIsDialogOpen] = useState(() => !!documentViaUser); diff --git a/apps/remix/app/routes/_recipient+/sign.$token+/complete.tsx b/apps/remix/app/routes/_recipient+/sign.$token+/complete.tsx index b51dc5906..f02392fe0 100644 --- a/apps/remix/app/routes/_recipient+/sign.$token+/complete.tsx +++ b/apps/remix/app/routes/_recipient+/sign.$token+/complete.tsx @@ -1,6 +1,5 @@ import { useCallback, useEffect, useState } from 'react'; -import { useLingui } from '@lingui/react'; import { Trans } from '@lingui/react/macro'; import { DocumentStatus, FieldType, RecipientRole } from '@prisma/client'; import { CheckCircle2, Clock8, DownloadIcon, EyeIcon, Loader2 } from 'lucide-react'; @@ -106,7 +105,6 @@ export async function loader({ params, request }: Route.LoaderArgs) { } export default function CompletedSigningPage({ loaderData }: Route.ComponentProps) { - const { _ } = useLingui(); const revalidator = useRevalidator(); const { sessionData } = useOptionalSession(); @@ -159,8 +157,12 @@ export default function CompletedSigningPage({ loaderData }: Route.ComponentProp }); setQrRetryCount(nextRetryCount); - await revalidator.revalidate(); - setIsRetryingQrLink(false); + + try { + await revalidator.revalidate(); + } finally { + setIsRetryingQrLink(false); + } }, [isDocumentAccessValid, qrRetryCount, revalidator]); const isFullyCompleted = isDocumentAccessValid && signingStatus === 'COMPLETED'; @@ -296,7 +298,7 @@ export default function CompletedSigningPage({ loaderData }: Route.ComponentProp
{isFullyCompleted && hasQrToken && (