Merge branch 'main' into feat/document-qrcode

apps/web/lingui.config.ts

@@ -1,22 +0,0 @@
-import type { LinguiConfig } from '@lingui/conf';
-
-import { APP_I18N_OPTIONS } from '@documenso/lib/constants/i18n';
-
-// Extends root lingui.config.cjs.
-const config: LinguiConfig = {
-  // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
-  locales: APP_I18N_OPTIONS.supportedLangs as unknown as string[],
-  catalogs: [
-    {
-      path: '<rootDir>/../../packages/lib/translations/{locale}/web',
-      include: ['<rootDir>/apps/web/src'],
-    },
-    {
-      path: '<rootDir>/../../packages/lib/translations/{locale}/common',
-      include: ['<rootDir>/packages/ui', '<rootDir>/packages/lib'],
-    },
-  ],
-  catalogsMergePath: '<rootDir>/../../packages/lib/translations/{locale}/web',
-};
-
-export default config;

apps/web/package.json

@@ -5,14 +5,13 @@
   "license": "AGPL-3.0",
   "scripts": {
     "dev": "next dev -p 3000",
-    "build": "npm run translate:extract --prefix ../../ && turbo run translate:compile && next build",
+    "build": "npm run translate --prefix ../../ && next build",
     "start": "next start",
     "lint": "next lint",
     "e2e:prepare": "next build && next start",
     "lint:fix": "next lint --fix",
     "clean": "rimraf .next && rimraf node_modules",
-    "copy:pdfjs": "node ../../scripts/copy-pdfjs.cjs",
-    "translate:compile": "lingui compile --typescript"
+    "copy:pdfjs": "node ../../scripts/copy-pdfjs.cjs"
   },
   "dependencies": {
     "@documenso/api": "*",

apps/web/src/app/(dashboard)/documents/_action-items/resend-document.tsx

@@ -155,8 +155,7 @@ export const ResendDocumentActionItem = ({
 
                       <FormControl>
                         <Checkbox
-                          className="h-5 w-5 rounded-full data-[state=checked]:border-black data-[state=checked]:bg-black"
-                          checkClassName="text-white"
+                          className="h-5 w-5 rounded-full"
                           value={recipient.id}
                           checked={value.includes(recipient.id)}
                           onCheckedChange={(checked: boolean) =>
@@ -179,7 +178,7 @@ export const ResendDocumentActionItem = ({
             <DialogClose asChild>
               <Button
                 type="button"
-                className="dark:bg-muted dark:hover:bg-muted/80 flex-1  bg-black/5 hover:bg-black/10"
+                className="dark:bg-muted dark:hover:bg-muted/80 flex-1 bg-black/5 hover:bg-black/10"
                 variant="secondary"
                 disabled={isSubmitting}
               >

apps/web/src/app/(dashboard)/documents/upload-document.tsx

@@ -12,6 +12,7 @@ import { useSession } from 'next-auth/react';
 import { useLimits } from '@documenso/ee/server-only/limits/provider/client';
 import { useAnalytics } from '@documenso/lib/client-only/hooks/use-analytics';
 import { APP_DOCUMENT_UPLOAD_SIZE_LIMIT } from '@documenso/lib/constants/app';
+import { DEFAULT_DOCUMENT_TIME_ZONE, TIME_ZONES } from '@documenso/lib/constants/time-zones';
 import { AppError } from '@documenso/lib/errors/app-error';
 import { createDocumentData } from '@documenso/lib/server-only/document-data/create-document-data';
 import { putPdfFile } from '@documenso/lib/universal/upload/put-file';
@@ -33,6 +34,9 @@ export type UploadDocumentProps = {
 export const UploadDocument = ({ className, team }: UploadDocumentProps) => {
   const router = useRouter();
   const analytics = useAnalytics();
+  const userTimezone =
+    TIME_ZONES.find((timezone) => timezone === Intl.DateTimeFormat().resolvedOptions().timeZone) ??
+    DEFAULT_DOCUMENT_TIME_ZONE;
 
   const { data: session } = useSession();
 
@@ -73,6 +77,7 @@ export const UploadDocument = ({ className, team }: UploadDocumentProps) => {
         title: file.name,
         documentDataId,
         teamId: team?.id,
+        timezone: userTimezone,
       });
 
       void refreshLimits();

apps/web/src/app/(dashboard)/templates/use-template-dialog.tsx

@@ -313,7 +313,6 @@ export function UseTemplateDialog({
                           <Checkbox
                             id="distributeDocument"
                             className="h-5 w-5"
-                            checkClassName="dark:text-white text-primary"
                             checked={field.value}
                             onCheckedChange={field.onChange}
                           />

apps/web/src/app/(signing)/sign/[token]/checkbox-field.tsx

@@ -258,7 +258,6 @@ export const CheckboxField = ({
                 <div key={index} className="flex items-center gap-x-1.5">
                   <Checkbox
                     className="h-4 w-4"
-                    checkClassName="text-white"
                     id={`checkbox-${index}`}
                     checked={checkedValues.includes(itemValue)}
                     onCheckedChange={() => handleCheckboxChange(item.value, item.id)}
@@ -282,7 +281,6 @@ export const CheckboxField = ({
               <div key={index} className="flex items-center gap-x-1.5">
                 <Checkbox
                   className="h-3 w-3"
-                  checkClassName="text-white"
                   id={`checkbox-${index}`}
                   checked={parsedCheckedValues.includes(itemValue)}
                   disabled={isLoading}

apps/web/src/components/(teams)/dialogs/transfer-team-dialog.tsx

@@ -217,45 +217,10 @@ export const TransferTeamDialog = ({
                   )}
                 />
 
-                {/* Temporary removed.  */}
-                {/* {IS_BILLING_ENABLED && (
-                  <FormField
-                    control={form.control}
-                    name="clearPaymentMethods"
-                    render={({ field }) => (
-                      <FormItem>
-                        <div className="flex flex-row items-center">
-                          <Checkbox
-                            id="clearPaymentMethods"
-                            className="h-5 w-5 rounded-full"
-                            checkClassName="dark:text-white text-primary"
-                            checked={field.value}
-                            onCheckedChange={field.onChange}
-                          />
-
-                          <label
-                            className="text-muted-foreground ml-2 text-sm"
-                            htmlFor="clearPaymentMethods"
-                          >
-                            Clear current payment methods
-                          </label>
-                        </div>
-                      </FormItem>
-                    )}
-                  />
-                )} */}
-
                 <Alert variant="neutral">
                   <AlertDescription>
                     <ul className="list-outside list-disc space-y-2 pl-4">
                       {IS_BILLING_ENABLED() && (
-                        // Temporary removed.
-                        // <li>
-                        //   {form.getValues('clearPaymentMethods')
-                        //     ? 'You will not be billed for any upcoming invoices'
-                        //     : 'We will continue to bill current payment methods if required'}
-                        // </li>
-
                         <li>
                           <Trans>
                             Any payment methods attached to this team will remain attached to this