diff --git a/apps/remix/app/routes/_recipient+/sign.$token+/_index.tsx b/apps/remix/app/routes/_recipient+/sign.$token+/_index.tsx index 204abfbb9..2fc9d6159 100644 --- a/apps/remix/app/routes/_recipient+/sign.$token+/_index.tsx +++ b/apps/remix/app/routes/_recipient+/sign.$token+/_index.tsx @@ -152,9 +152,12 @@ const handleV1Loader = async ({ params, request }: Route.LoaderArgs) => { throw redirect(documentMeta?.redirectUrl || `/sign/${token}/complete`); } - const [recipientSignature] = await getRecipientSignatures({ recipientId: recipient.id }); + const [recipientSignatures, settings] = await Promise.all([ + getRecipientSignatures({ recipientId: recipient.id }), + getTeamSettings({ teamId: document.teamId }), + ]); - const settings = await getTeamSettings({ teamId: document.teamId }); + const [recipientSignature] = recipientSignatures; return { isDocumentAccessValid: true, diff --git a/apps/remix/app/routes/embed+/v2+/authoring+/envelope.edit.$id.tsx b/apps/remix/app/routes/embed+/v2+/authoring+/envelope.edit.$id.tsx index 0a6b758a7..006a02a35 100644 --- a/apps/remix/app/routes/embed+/v2+/authoring+/envelope.edit.$id.tsx +++ b/apps/remix/app/routes/embed+/v2+/authoring+/envelope.edit.$id.tsx @@ -59,20 +59,21 @@ export const loader = async ({ request, params }: Route.LoaderArgs) => { throw new Error('Invalid token'); } - const settings = await getTeamSettings({ - userId: result.userId, - teamId: result.teamId, - }); - - const envelope = await getEditorEnvelopeById({ - id: { - type: 'envelopeId', - id, - }, - type: null, - userId: result.userId, - teamId: result.teamId, - }).catch(() => null); + const [settings, envelope] = await Promise.all([ + getTeamSettings({ + userId: result.userId, + teamId: result.teamId, + }), + getEditorEnvelopeById({ + id: { + type: 'envelopeId', + id, + }, + type: null, + userId: result.userId, + teamId: result.teamId, + }).catch(() => null), + ]); if (!envelope) { throw redirect(`/embed/v2/authoring/error/not-found`);