Merge pull request #296 from midday-ai/feature/invoice-initial-data

Feature/invoice initial data
midday-ai · Nov 7, 2024 · 43d4fb5 · 43d4fb5
2 parents f3988ec + e693642
commit 43d4fb5
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 24 deletions.
diff --git a/apps/dashboard/src/components/invoice/note-details.tsx b/apps/dashboard/src/components/invoice/note-details.tsx
@@ -7,7 +7,8 @@ import { Controller, useFormContext } from "react-hook-form";
 import { LabelInput } from "./label-input";
 
 export function NoteDetails() {
-  const { control } = useFormContext();
+  const { control, watch } = useFormContext();
+  const id = watch("id");
 
   const updateInvoiceTemplate = useAction(updateInvoiceTemplateAction);
 
@@ -29,6 +30,8 @@ export function NoteDetails() {
         render={({ field }) => {
           return (
             <Editor
+              // NOTE: This is a workaround to get the new content to render
+              key={id}
               initialContent={field.value}
               onChange={field.onChange}
               className="h-[78px]"

diff --git a/apps/dashboard/src/components/invoice/payment-details.tsx b/apps/dashboard/src/components/invoice/payment-details.tsx
@@ -7,7 +7,8 @@ import { Controller, useFormContext } from "react-hook-form";
 import { LabelInput } from "./label-input";
 
 export function PaymentDetails() {
-  const { control } = useFormContext();
+  const { control, watch } = useFormContext();
+  const id = watch("id");
 
   const updateInvoiceTemplate = useAction(updateInvoiceTemplateAction);
 
@@ -28,6 +29,8 @@ export function PaymentDetails() {
         name="payment_details"
         render={({ field }) => (
           <Editor
+            // NOTE: This is a workaround to get the new content to render
+            key={id}
             initialContent={field.value}
             onChange={field.onChange}
             onBlur={(content) => {

diff --git a/packages/invoice/src/templates/pdf/index.tsx b/packages/invoice/src/templates/pdf/index.tsx
@@ -1,4 +1,3 @@
-// import { getCdnUrl } from "@midday/utils/envs";
 import { Document, Image, Page, Text, View } from "@react-pdf/renderer";
 import QRCodeUtil from "qrcode";
 import type { TemplateProps } from "../types";
@@ -10,20 +9,6 @@ import { PaymentDetails } from "./components/payment-details";
 import { QRCode } from "./components/qr-code";
 import { Summary } from "./components/summary";
 
-// Font.register({
-//   family: "GeistMono",
-//   fonts: [
-//     {
-//       src: `${getCdnUrl()}/fonts/GeistMono/ttf/GeistMono-Regular.ttf`,
-//       fontWeight: 400,
-//     },
-//     {
-//       src: `${getCdnUrl()}/fonts/GeistMono/ttf/GeistMono-Medium.ttf`,
-//       fontWeight: 500,
-//     },
-//   ],
-// });
-
 export async function PdfTemplate({
   invoice_number,
   issue_date,
@@ -59,7 +44,6 @@ export async function PdfTemplate({
         style={{
           padding: 20,
           backgroundColor: "#fff",
-          // fontFamily: "GeistMono",
           color: "#000",
         }}
       >

diff --git a/packages/ui/src/components/editor/index.tsx b/packages/ui/src/components/editor/index.tsx
@@ -40,12 +40,6 @@ export function Editor({
     },
   });
 
-  useEffect(() => {
-    if (initialContent) {
-      editor?.commands.setContent(initialContent);
-    }
-  }, []);
-
   if (!editor) return null;
 
   return (