+
{children}
); @@ -37,7 +37,7 @@ export const DocumentSigningFieldsInserted = ({ {
- const { subject, message, distributionMethod, emailSettings } = data.meta;
+ const { subject, message, distributionMethod, emailId, emailReplyTo, emailSettings } =
+ data.meta;
try {
await sendDocument({
@@ -287,7 +288,9 @@ export const DocumentEditForm = ({
subject,
message,
distributionMethod,
- emailSettings,
+ emailId,
+ emailReplyTo,
+ emailSettings: emailSettings,
},
});
diff --git a/apps/remix/app/components/general/document/document-upload.tsx b/apps/remix/app/components/general/document/document-upload.tsx
index c19929b66..c21fcc5f0 100644
--- a/apps/remix/app/components/general/document/document-upload.tsx
+++ b/apps/remix/app/components/general/document/document-upload.tsx
@@ -78,7 +78,7 @@ export const DocumentUploadDropzone = ({ className }: DocumentUploadDropzoneProp
const { id } = await createDocument({
title: file.name,
documentDataId: response.id,
- timezone: userTimezone,
+ timezone: userTimezone, // Note: When migrating to v2 document upload remember to pass this through as a 'userTimezone' field.
folderId: folderId ?? undefined,
});
diff --git a/apps/remix/app/components/general/organisations/organisation-billing-banner.tsx b/apps/remix/app/components/general/organisations/organisation-billing-banner.tsx
index 0a78faaf0..a533ad42e 100644
--- a/apps/remix/app/components/general/organisations/organisation-billing-banner.tsx
+++ b/apps/remix/app/components/general/organisations/organisation-billing-banner.tsx
@@ -35,7 +35,7 @@ export const OrganisationBillingBanner = () => {
const organisation = useOptionalCurrentOrganisation();
const { mutateAsync: manageSubscription, isPending } =
- trpc.billing.subscription.manage.useMutation();
+ trpc.enterprise.billing.subscription.manage.useMutation();
const handleCreatePortal = async (organisationId: string) => {
try {
diff --git a/apps/remix/app/components/general/organisations/organisation-billing-portal-button.tsx b/apps/remix/app/components/general/organisations/organisation-billing-portal-button.tsx
index cda0c4ab4..7e4e1cb53 100644
--- a/apps/remix/app/components/general/organisations/organisation-billing-portal-button.tsx
+++ b/apps/remix/app/components/general/organisations/organisation-billing-portal-button.tsx
@@ -21,7 +21,7 @@ export const OrganisationBillingPortalButton = ({
const { toast } = useToast();
const { mutateAsync: manageSubscription, isPending } =
- trpc.billing.subscription.manage.useMutation();
+ trpc.enterprise.billing.subscription.manage.useMutation();
const canManageBilling = canExecuteOrganisationAction(
'MANAGE_BILLING',
diff --git a/apps/remix/app/components/general/settings-nav-desktop.tsx b/apps/remix/app/components/general/settings-nav-desktop.tsx
index 7f4100f87..7be14fe23 100644
--- a/apps/remix/app/components/general/settings-nav-desktop.tsx
+++ b/apps/remix/app/components/general/settings-nav-desktop.tsx
@@ -46,16 +46,46 @@ export const SettingsDesktopNav = ({ className, ...props }: SettingsDesktopNavPr
{isPersonalLayoutMode && (
<>
-
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/apps/remix/app/components/general/settings-nav-mobile.tsx b/apps/remix/app/components/general/settings-nav-mobile.tsx
index 196b464ed..5278a6af9 100644
--- a/apps/remix/app/components/general/settings-nav-mobile.tsx
+++ b/apps/remix/app/components/general/settings-nav-mobile.tsx
@@ -6,6 +6,8 @@ import {
CreditCardIcon,
Globe2Icon,
Lock,
+ MailIcon,
+ PaletteIcon,
Settings2Icon,
User,
Users,
@@ -48,16 +50,42 @@ export const SettingsMobileNav = ({ className, ...props }: SettingsMobileNavProp
{isPersonalLayoutMode && (
<>
-
+
+
+
+
+
+
+
+
+
diff --git a/apps/remix/app/components/general/share-document-download-button.tsx b/apps/remix/app/components/general/share-document-download-button.tsx
index c79ac4f51..5ee7d0453 100644
--- a/apps/remix/app/components/general/share-document-download-button.tsx
+++ b/apps/remix/app/components/general/share-document-download-button.tsx
@@ -28,10 +28,6 @@ export const ShareDocumentDownloadButton = ({
try {
setIsDownloading(true);
- await new Promise((resolve) => {
- setTimeout(resolve, 4000);
- });
-
await downloadPDF({ documentData, fileName: title });
} catch (err) {
toast({
diff --git a/apps/remix/app/components/general/teams/team-settings-nav-desktop.tsx b/apps/remix/app/components/general/teams/team-settings-nav-desktop.tsx
deleted file mode 100644
index 0429b5db2..000000000
--- a/apps/remix/app/components/general/teams/team-settings-nav-desktop.tsx
+++ /dev/null
@@ -1,112 +0,0 @@
-import type { HTMLAttributes } from 'react';
-
-import { Trans } from '@lingui/react/macro';
-import { Braces, Globe2Icon, GroupIcon, Settings, Settings2, Users, Webhook } from 'lucide-react';
-import { Link, useLocation, useParams } from 'react-router';
-
-import { cn } from '@documenso/ui/lib/utils';
-import { Button } from '@documenso/ui/primitives/button';
-
-export type TeamSettingsNavDesktopProps = HTMLAttributes