fix: merge conflicts

2026-07-22 16:03:39 +10:00 · 2025-10-21 00:08:31 +00:00
parent 0942a9234d f15c0778b5
commit bdd4e5ae2e
6 changed files with 7 additions and 4 deletions
@@ -98,6 +98,7 @@ export const createDocumentTemporaryRoute = authenticatedProcedure
      },
      meta: {
        ...meta,
+        emailSettings: meta?.emailSettings ?? undefined,
        expiryAmount,
        expiryUnit,
      },
@@ -37,7 +37,7 @@ export const distributeDocumentRoute = authenticatedProcedure
        timezone: meta.timezone,
        redirectUrl: meta.redirectUrl,
        distributionMethod: meta.distributionMethod,
-        emailSettings: meta.emailSettings,
+        emailSettings: meta.emailSettings ?? undefined,
        language: meta.language,
        emailId: meta.emailId,
        emailReplyTo: meta.emailReplyTo,